Commit a45a1e5a authored by huyuchen's avatar huyuchen

优化修改

parent 58ab5676
......@@ -287,6 +287,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
@Length(max = 100, message = "小合同名称不能超过100个字符")
@ExcelAttribute(name = "小合同名称", maxLength = 100)
private String contractMinorName;
/**
* 唯一号
*/
......@@ -602,4 +603,11 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
*/
@ExcelAttribute(name = "取消原因", maxLength = 255)
private String cancelRemark;
/**
* 0 是 1 否
*/
@ExcelAttribute(name = "是否同步终止合同、减项、减档", maxLength = 1)
@ExcelProperty("是否同步终止合同、减项、减档" )
private String changeContractAndEmployee;
}
......@@ -923,6 +923,11 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
List<TPreDispatchInfo> listInfo = new ArrayList<>();
if (Common.isNotNull(list)){
for (TPreDispatchInfo info:list){
if (Common.isNotNull(info.getChangeContractAndEmployee()) && "是".equals(info.getChangeContractAndEmployee())) {
info.setChangeContractAndEmployee(CommonConstants.ZERO_STRING);
} else {
info.setChangeContractAndEmployee(CommonConstants.ONE_STRING);
}
listInfo.add(info);
}
}
......
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