UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修复单据类型导入失败问题

Browse Source
master
x_z 2 years ago
parent 12a08b61d2
commit 9956473c31
2 changed files with 31 additions and 84 deletions
Show Stats Download Patch File Download Diff File

7
src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java
Unescape Escape View File

@ -51,13 +51,6 @@ public class CustomerInfoServiceImpl implements CustomerInfoService {
int offset = (customerInfoFilterRequest.getPage() - 1) * customerInfoFilterRequest.getLimit(); int offset = (customerInfoFilterRequest.getPage() - 1) * customerInfoFilterRequest.getLimit();
PageHelper.offsetPage(offset, customerInfoFilterRequest.getLimit()); PageHelper.offsetPage(offset, customerInfoFilterRequest.getLimit());
List<CustomerDetailEntity> customerDetailEntities = customerInfoDao.filterDetailCustomerInfo(customerInfoFilterRequest); List<CustomerDetailEntity> customerDetailEntities = customerInfoDao.filterDetailCustomerInfo(customerInfoFilterRequest);
for (int i = 0; i < customerDetailEntities.size(); i++) {
CustomerDetailEntity customerDetailEntity = customerDetailEntities.get(i);
if (!customerDetailEntity.getRoleId().equals("null") && !customerDetailEntity.getRoleId().equals("") && customerDetailEntity.getRoleId() != null) {
}
}
return customerDetailEntities; return customerDetailEntities;
} }

108
src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
Unescape Escape View File

@ -58,75 +58,31 @@
<insert id="insertIgnoreBussinessType" parameterType="com.glxp.api.entity.basic.BasicBussinessTypeEntity"> <insert id="insertIgnoreBussinessType" parameterType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
insert insert
ignore ignore
into basic_bussiness_type (mainAction, action, name, enable, remark, thirdSysFk, genUnit, into basic_bussiness_type (mainAction, action, name, enable, remark, thirdSysFk, genUnit, innerOrder,
innerOrder, secCheckEnable, checkEnable, checkUdims, checkPdaEd, secCheckEnable, checkEnable, checkUdims, checkPdaEd, checkPdaUn, checkPc,
checkPdaUn, checkPc, checkWebNew, checkSp, checkChange, secCheckUdims, checkWebNew, checkSp, checkChange, secCheckUdims, secCheckPdaEd, secCheckPdaUn,
secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew, secCheckPc, secCheckWebNew, secCheckChange, secCheckSp, corpType,
secCheckChange, secCheckSp, corpType, supplementOrderType, supplementOrderType, checkBalance, secCheckBalance, useDyCount, expireTip,
checkBalance, secCheckBalance, useDyCount, expireTip, updateTime, updateTime, defaultUnit, prefix, outToSpms, ullageFill, scanPreIn, vailInv,
defaultUnit, prefix, outToSpms, ullageFill, scanPreIn, vailInv,
entrutSpms, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, entrutSpms, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType,
checkCopy, secCheckCopy, originAction, changeEnable, preInBack, supplementAll, createUser, createTime, updateUser, vailDispatch,
spUse, preIn, supplementAll, createUser, createTime, preInBack, vailDispatch, vailGroupBuy, busType, inStock, actionType, thrCheckEnable, thrCheckWebNew,
vailGroupBuy, busType, inStock, actionType thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp,
, thrCheckEnable, thrCheckWebNew, thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate,
, thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate, checkCertExpire) checkExpire, checkCertExpire)
values (#{mainAction}, values (#{mainAction}, #{action}, #{name}, #{enable}, #{remark}, #{thirdSysFk}, #{genUnit}, #{innerOrder},
#{action}, #{secCheckEnable}, #{checkEnable}, #{checkUdims}, #{checkPdaEd}, #{checkPdaUn}, #{checkPc},
#{name}, #{checkWebNew}, #{checkSp}, #{checkChange}, #{secCheckUdims}, #{secCheckPdaEd}, #{secCheckPdaUn},
#{enable}, #{secCheckPc}, #{secCheckWebNew}, #{secCheckChange}, #{secCheckSp}, #{corpType},
#{remark}, #{supplementOrderType}, #{checkBalance}, #{secCheckBalance}, #{useDyCount}, #{expireTip},
#{thirdSysFk}, #{updateTime}, #{defaultUnit}, #{prefix}, #{outToSpms}, #{ullageFill}, #{scanPreIn}, #{vailInv},
#{genUnit}, #{entrutSpms}, #{codeFillCheck}, #{defaultSubInv}, #{defaultInv}, #{orderVisibleType},
#{innerOrder}, #{preInBack}, #{supplementAll}, #{createUser}, #{createTime}, #{updateUser}, #{vailDispatch},
#{secCheckEnable}, #{vailGroupBuy}, #{busType}, #{inStock}, #{actionType}, #{thrCheckEnable}, #{thrCheckWebNew},
#{checkEnable}, #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims}, #{thrCheckPc}, #{thrCheckSp},
#{checkUdims}, #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}, #{checkVailDate},
#{checkPdaEd}, #{checkExpire}, #{checkCertExpire})
#{checkPdaUn},
#{checkPc},
#{checkWebNew},
#{checkSp},
#{checkChange},
#{secCheckUdims},
#{secCheckPdaEd},
#{secCheckPdaUn},
#{secCheckPc},
#{secCheckWebNew},
#{secCheckChange},
#{secCheckSp},
#{corpType},
#{supplementOrderType},
#{checkBalance},
#{secCheckBalance},
#{useDyCount},
#{expireTip},
#{updateTime},
#{defaultUnit},
#{prefix},
#{outToSpms},
#{ullageFill},
#{scanPreIn},
#{vailInv},
#{entrutSpms},
#{codeFillCheck},
#{defaultSubInv},
#{defaultInv},
#{orderVisibleType},
#{checkCopy},
#{secCheckCopy},
#{originAction},
#{changeEnable},
#{spUse},
#{preIn},
#{supplementAll},
#{createUser},
#{createTime}, #{preInBack}, #{vailDispatch}, #{vailGroupBuy}, #{busType}, #{inStock}, #{actionType}
, #{thrCheckEnable}, #{thrCheckWebNew}, #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims},
#{thrCheckPc}
, #{thrCheckSp}, #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}
, #{checkVailDate}, #{checkExpire}, #{checkCertExpire})
</insert> </insert>
<select id="selectBusList" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity"> <select id="selectBusList" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
@ -182,9 +138,8 @@
<select id="selectForThirdSys" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity"> <select id="selectForThirdSys" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
select action, name select action, name
from basic_bussiness_type from basic_bussiness_type
where action not in ( where action not in (select code
select code from thr_system_bus_api)
from thr_system_bus_api)
</select> </select>
<select id="selectCandidateBusType" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity"> <select id="selectCandidateBusType" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
@ -193,13 +148,13 @@
where mainAction = #{mainAction} where mainAction = #{mainAction}
and corpType = 3 and corpType = 3
and (supplementOrderType is null and (supplementOrderType is null
or supplementOrderType = '') or supplementOrderType = '')
</select> </select>
<select id="selectByUser" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity"> <select id="selectByUser" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
select basic_bussiness_type.* select basic_bussiness_type.*
from basic_bussiness_type from basic_bussiness_type
inner join auth_user_bustype on basic_bussiness_type.action = auth_user_bustype.scAction inner join auth_user_bustype on basic_bussiness_type.action = auth_user_bustype.scAction
<where> <where>
<if test="name != null and name != ''"> <if test="name != null and name != ''">
AND basic_bussiness_type.name like concat('%', #{name}, '%') AND basic_bussiness_type.name like concat('%', #{name}, '%')
@ -230,7 +185,7 @@
resultType="com.glxp.api.res.basic.BasicBussinessTypeResponse"> resultType="com.glxp.api.res.basic.BasicBussinessTypeResponse">
SELECT basic_bussiness_type.* SELECT basic_bussiness_type.*
FROM basic_bussiness_type FROM basic_bussiness_type
left JOIN auth_user_bustype ON basic_bussiness_type.action = auth_user_bustype.scAction left JOIN auth_user_bustype ON basic_bussiness_type.action = auth_user_bustype.scAction
<where> <where>
<if test="name != ''and name != null"> <if test="name != ''and name != null">
AND basic_bussiness_type.name LIKE concat('%', #{name}, '%') AND basic_bussiness_type.name LIKE concat('%', #{name}, '%')
@ -268,7 +223,7 @@
resultType="com.glxp.api.res.basic.BasicBussinessTypeResponse"> resultType="com.glxp.api.res.basic.BasicBussinessTypeResponse">
SELECT basic_bussiness_type.* SELECT basic_bussiness_type.*
FROM basic_bussiness_type FROM basic_bussiness_type
left JOIN auth_warehouse_bustype ON basic_bussiness_type.action = auth_warehouse_bustype.action left JOIN auth_warehouse_bustype ON basic_bussiness_type.action = auth_warehouse_bustype.action
<where> <where>
<if test="name != ''and name != null"> <if test="name != ''and name != null">
AND basic_bussiness_type.name LIKE concat('%', #{name}, '%') AND basic_bussiness_type.name LIKE concat('%', #{name}, '%')
@ -310,7 +265,7 @@
select * select *
from basic_bussiness_type from basic_bussiness_type
<where> <where>
<if test="list != null and list.size()!=0"> <if test="list != null and list.size() != 0">
and action not in and action not in
<foreach collection="list" item="item" open="(" separator="," close=")"> <foreach collection="list" item="item" open="(" separator="," close=")">
#{item} #{item}
@ -318,5 +273,4 @@
</if> </if>
</where> </where>
</select> </select>
</mapper> </mapper>

Write Preview
Loading…
Cancel
Save