Commit 117f5a2a authored by huyuchen's avatar huyuchen

优化修改

parent 2d0526d0
...@@ -552,7 +552,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -552,7 +552,7 @@ public class TPreDispatchInfo extends BaseEntity {
/** /**
* 0 是 1 否 * 0 是 1 否
*/ */
@ExcelAttribute(name = "是否同步终止合同、减项、减档", maxLength = 1,readConverterExp = "是=0,否=1") @ExcelAttribute(name = "是否同步终止合同、减项、减档", maxLength = 1)
@Schema(description = "是否同步终止合同、减项、减档", name = "changeContractAndEmployee") @Schema(description = "是否同步终止合同、减项、减档", name = "changeContractAndEmployee")
@ExcelProperty("是否同步终止合同、减项、减档" ) @ExcelProperty("是否同步终止合同、减项、减档" )
private String changeContractAndEmployee; private String changeContractAndEmployee;
......
...@@ -701,7 +701,7 @@ public class TPreDispatchReduceVo { ...@@ -701,7 +701,7 @@ public class TPreDispatchReduceVo {
/** /**
* 0 是 1 否 * 0 是 1 否
*/ */
@ExcelAttribute(name = "是否同步终止合同、减项、减档", maxLength = 1,readConverterExp = "是=0,否=1") @ExcelAttribute(name = "是否同步终止合同、减项、减档", maxLength = 1)
@Schema(description = "是否同步终止合同、减项、减档", name = "changeContractAndEmployee") @Schema(description = "是否同步终止合同、减项、减档", name = "changeContractAndEmployee")
@ExcelProperty("是否同步终止合同、减项、减档" ) @ExcelProperty("是否同步终止合同、减项、减档" )
private String changeContractAndEmployee; private String changeContractAndEmployee;
......
...@@ -935,6 +935,11 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -935,6 +935,11 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
for (TPreDispatchReduceVo info:list){ for (TPreDispatchReduceVo info:list){
TPreDispatchInfo preInfo = new TPreDispatchInfo(); TPreDispatchInfo preInfo = new TPreDispatchInfo();
BeanUtils.copyProperties(info,preInfo); BeanUtils.copyProperties(info,preInfo);
if (Common.isNotNull(info.getChangeContractAndEmployee()) && "是".equals(info.getChangeContractAndEmployee())) {
preInfo.setChangeContractAndEmployee(CommonConstants.ZERO_STRING);
} else {
preInfo.setChangeContractAndEmployee(CommonConstants.ONE_STRING);
}
listInfo.add(preInfo); listInfo.add(preInfo);
} }
} }
......
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