diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java index e1c34e5e..b8bbfb9d 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java @@ -380,6 +380,21 @@ public class AppEnforcementRegistrationController extends BaseController return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败"); } + @PostMapping("/edit2") + @ResponseBody + public ZDResponse editSave2(@RequestBody EnforcementRegistration enforcementRegistration) + { + enforcementRegistration.setIsSubmit(0); + int resNum = enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration); + if (StringUtils.isNotEmpty(enforcementRegistration.getLawId())) { + EnterpriseLawEnforcement law = new EnterpriseLawEnforcement(); + law.setId(enforcementRegistration.getLawId()); + law.setIsReg(1); + resNum = enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(law); + } + return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败"); + } + /** * 修改执法端-执法登记 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java index 110c881d..691eab0e 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java @@ -159,23 +159,36 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat { UserBean user = userApi.getUserByUserId(enforcementRegistration.getUserId()); int resNum = 0; - if (StringUtils.isNotEmpty(enforcementRegistration.getId())) { -// enforcementRegistration.setIsSubmit(0); - resNum = this.updateEnforcementRegistration(enforcementRegistration); - } else { - enforcementRegistration.setId(IdUtil.simpleUUID()); - enforcementRegistration.setCreateBy(user.getUserName()); - enforcementRegistration.setCreateTime(DateUtils.getNowDate()); - enforcementRegistration.setUserId(user.getUserId()); - enforcementRegistration.setDeptId(user.getDeptId()); - //默认评价状态为 0 否 - enforcementRegistration.setIsEvaluate(0); - //默认为登记状态 +// if (StringUtils.isNotEmpty(enforcementRegistration.getId())) { +//// enforcementRegistration.setIsSubmit(0); +// resNum = this.updateEnforcementRegistration(enforcementRegistration); +// } else { +// enforcementRegistration.setId(IdUtil.simpleUUID()); +// enforcementRegistration.setCreateBy(user.getUserName()); +// enforcementRegistration.setCreateTime(DateUtils.getNowDate()); +// enforcementRegistration.setUserId(user.getUserId()); +// enforcementRegistration.setDeptId(user.getDeptId()); +// //默认评价状态为 0 否 +// enforcementRegistration.setIsEvaluate(0); +// //默认为登记状态 +//// enforcementRegistration.setStatus(0); +// resNum = enforcementRegistrationMapper.insertEnforcementRegistration(enforcementRegistration); +// } +// // 先清空之前的附件, 不然删除会有问题 +// zdxtFileCommonApi.deleteZdxtFileByIds(enforcementRegistration.getId()); + + // 业务又改了 保存和提交都走新增, 区别是保存后的可以修改, 提交后的不能修改.(这块在controller控制了isSubmit状态) + enforcementRegistration.setId(IdUtil.simpleUUID()); + enforcementRegistration.setCreateBy(user.getUserName()); + enforcementRegistration.setCreateTime(DateUtils.getNowDate()); + enforcementRegistration.setUserId(user.getUserId()); + enforcementRegistration.setDeptId(user.getDeptId()); + //默认评价状态为 0 否 + enforcementRegistration.setIsEvaluate(0); + //默认为登记状态 // enforcementRegistration.setStatus(0); - resNum = enforcementRegistrationMapper.insertEnforcementRegistration(enforcementRegistration); - } - // 先清空之前的附件, 不然删除会有问题 - zdxtFileCommonApi.deleteZdxtFileByIds(enforcementRegistration.getId()); + resNum = enforcementRegistrationMapper.insertEnforcementRegistration(enforcementRegistration); + // 重新加入附件 if (resNum > 0 && enforcementRegistration.getFileList().size() > 0) { zdxtFileCommonApi.deleteZdxtFileByIds(enforcementRegistration.getId());