Commit b349c5f8 authored by fangxinjiang's avatar fangxinjiang

基础档案新增字段及必填调整

parent 941a6c87
...@@ -102,9 +102,6 @@ public class TEmpDisabilityInfoController { ...@@ -102,9 +102,6 @@ public class TEmpDisabilityInfoController {
public R<Boolean> save(@RequestBody TEmpDisabilityInfo tEmpDisabilityInfo) { public R<Boolean> save(@RequestBody TEmpDisabilityInfo tEmpDisabilityInfo) {
R<Boolean> failed = getCheckRes(tEmpDisabilityInfo); R<Boolean> failed = getCheckRes(tEmpDisabilityInfo);
if (failed != null) return failed; if (failed != null) return failed;
if (CommonConstants.ZERO_STRING.equals(tEmpDisabilityInfo.getOtherFlag())){
tEmpDisabilityInfo.setRemark("曾经或正在追究与承担过刑事责任");
}
return tEmpDisabilityInfoService.saveDiy(tEmpDisabilityInfo); return tEmpDisabilityInfoService.saveDiy(tEmpDisabilityInfo);
} }
...@@ -143,9 +140,6 @@ public class TEmpDisabilityInfoController { ...@@ -143,9 +140,6 @@ public class TEmpDisabilityInfoController {
public R<Boolean> updateById(@RequestBody TEmpDisabilityInfo tEmpDisabilityInfo) { public R<Boolean> updateById(@RequestBody TEmpDisabilityInfo tEmpDisabilityInfo) {
R<Boolean> failed = getCheckRes(tEmpDisabilityInfo); R<Boolean> failed = getCheckRes(tEmpDisabilityInfo);
if (failed != null) return failed; if (failed != null) return failed;
if (CommonConstants.ZERO_STRING.equals(tEmpDisabilityInfo.getOtherFlag())){
tEmpDisabilityInfo.setRemark("曾经或正在追究与承担过刑事责任");
}
return tEmpDisabilityInfoService.updateByIdDiy(tEmpDisabilityInfo); return tEmpDisabilityInfoService.updateByIdDiy(tEmpDisabilityInfo);
} }
......
...@@ -130,9 +130,6 @@ public class TEmpDisabilityInfoServiceImpl extends ServiceImpl<TEmpDisabilityInf ...@@ -130,9 +130,6 @@ public class TEmpDisabilityInfoServiceImpl extends ServiceImpl<TEmpDisabilityInf
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种 不可为空!")); errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种 不可为空!"));
continue; continue;
} }
if (CommonConstants.ZERO_STRING.equals(excel.getOtherFlag())){
excel.setRemark("曾经或正在追究与承担过刑事责任");
}
// 数据合法情况 // 数据合法情况
insertExcel(excel,emp); insertExcel(excel,emp);
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS));
......
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