Commit a6acd93a authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.10' into MVP1.7.10

parents 9f8318e2 e3b13b9c
...@@ -73,7 +73,7 @@ public class FundImportHandleVo extends RowIndex implements Serializable { ...@@ -73,7 +73,7 @@ public class FundImportHandleVo extends RowIndex implements Serializable {
/** /**
* 派单类型 0 派增 1 派减 * 派单类型 0 派增 1 派减
*/ */
@ExcelAttribute(name = "派单类型",isNotEmpty = true) @ExcelAttribute(name = "派单类型",isNotEmpty = true,isDataId = true,readConverterExp = "0=派增,1=派减",errorInfo = "派单类型不可为空")
@Schema(description = "派单类型 0 派增 1 派减" ) @Schema(description = "派单类型 0 派增 1 派减" )
@ExcelProperty("派单类型" ) @ExcelProperty("派单类型" )
private String type; private String type;
......
...@@ -117,7 +117,7 @@ public class SocialImportHandleVo extends RowIndex implements Serializable { ...@@ -117,7 +117,7 @@ public class SocialImportHandleVo extends RowIndex implements Serializable {
/** /**
* 派单类型 0 派增 1 派减 * 派单类型 0 派增 1 派减
*/ */
@ExcelAttribute(name = "派单类型",isNotEmpty = true) @ExcelAttribute(name = "派单类型",isNotEmpty = true,isDataId = true,readConverterExp = "0=派增,1=派减",errorInfo = "派单类型不可为空")
@Schema(description = "派单类型 0 派增 1 派减" ) @Schema(description = "派单类型 0 派增 1 派减" )
@ExcelProperty("派单类型" ) @ExcelProperty("派单类型" )
private String type; private String type;
......
...@@ -6203,7 +6203,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6203,7 +6203,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
dispatch = dispatchMap.get(excel.getEmpIdcard()); dispatch = dispatchMap.get(excel.getEmpIdcard());
//批量办理增加派单类型 fxj 2025-04-24 V1.7.10 //批量办理增加派单类型 fxj 2025-04-24 V1.7.10
if (Common.isEmpty(dispatch) || excel.getType().equals(dispatch.getType())) { if (Common.isEmpty(dispatch) || !excel.getType().equals(dispatch.getType())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.FUND_IMPORT_HANDLE_NOT_EXITS),excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.FUND_IMPORT_HANDLE_NOT_EXITS),excel));
continue; continue;
} }
...@@ -6370,7 +6370,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6370,7 +6370,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch = dispatchMap.get(excel.getEmpIdcard()); dispatch = dispatchMap.get(excel.getEmpIdcard());
//批量办理增加派单类型 fxj 2025-04-24 V1.7.10 //批量办理增加派单类型 fxj 2025-04-24 V1.7.10
if (Common.isEmpty(dispatch) || excel.getType().equals(dispatch.getType())) { if (Common.isEmpty(dispatch) || !excel.getType().equals(dispatch.getType())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.SOCIAL_IMPORT_HANDLE_NOT_EXITS), excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.SOCIAL_IMPORT_HANDLE_NOT_EXITS), excel));
continue; continue;
} }
......
...@@ -1951,6 +1951,9 @@ ...@@ -1951,6 +1951,9 @@
</foreach> </foreach>
</if> </if>
<if test="tDispatchInfo != null"> <if test="tDispatchInfo != null">
<if test="tDispatchInfo.trustRemark != null and tDispatchInfo.trustRemark.trim() != ''">
AND a.TRUST_REMARK = #{tDispatchInfo.trustRemark}
</if>
<if test="tDispatchInfo.empTypeList != null and tDispatchInfo.empTypeList.length>0"> <if test="tDispatchInfo.empTypeList != null and tDispatchInfo.empTypeList.length>0">
AND a.EMP_TYPE IN AND a.EMP_TYPE IN
<foreach collection="tDispatchInfo.empTypeList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="tDispatchInfo.empTypeList" item="item" index="index" open="(" separator="," close=")">
...@@ -2058,6 +2061,9 @@ ...@@ -2058,6 +2061,9 @@
</foreach> </foreach>
</if> </if>
<if test="tDispatchInfo != null"> <if test="tDispatchInfo != null">
<if test="tDispatchInfo.trustRemark != null and tDispatchInfo.trustRemark.trim() != ''">
AND a.TRUST_REMARK = #{tDispatchInfo.trustRemark}
</if>
<if test="tDispatchInfo.dispatchItems != null and tDispatchInfo.dispatchItems.size >0"> <if test="tDispatchInfo.dispatchItems != null and tDispatchInfo.dispatchItems.size >0">
AND AND
<foreach item="item" index="index" collection="tDispatchInfo.dispatchItems" open="(" separator="or" close=")"> <foreach item="item" index="index" collection="tDispatchInfo.dispatchItems" open="(" separator="or" close=")">
...@@ -2181,6 +2187,9 @@ ...@@ -2181,6 +2187,9 @@
<if test="tDispatchInfo != null"> <if test="tDispatchInfo != null">
<if test="tDispatchInfo.trustRemark != null and tDispatchInfo.trustRemark.trim() != ''">
AND a.TRUST_REMARK = #{tDispatchInfo.trustRemark}
</if>
<if test="tDispatchInfo.dispatchItems != null and tDispatchInfo.dispatchItems.size >0"> <if test="tDispatchInfo.dispatchItems != null and tDispatchInfo.dispatchItems.size >0">
AND AND
<foreach item="item" index="index" collection="tDispatchInfo.dispatchItems" open="(" separator="or" close=")"> <foreach item="item" index="index" collection="tDispatchInfo.dispatchItems" open="(" separator="or" close=")">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment