From b6d7b3502910960e3b86aff72c16d28b0ee91efe Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Sat, 14 Sep 2024 16:42:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=A5=E5=BD=95,=20=E5=8E=86=E5=8F=B2?=
=?UTF-8?q?=E7=99=BB=E8=AE=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../AppEnforcementRegistrationController.java | 15 +++++++
.../EnforcementRegistrationServiceImpl.java | 45 ++++++++++++-------
2 files changed, 44 insertions(+), 16 deletions(-)
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());
From 774df846d6c295a4e255c321f9074c4c407395df Mon Sep 17 00:00:00 2001
From: zouyx <1798599149@qq.com>
Date: Sat, 14 Sep 2024 16:45:48 +0800
Subject: [PATCH 2/2] excel3
---
.../mapper/EnforcementCheckStatisticsMapper.xml | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml
index e74b552b..79536c78 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml
@@ -22,7 +22,11 @@
from enforcement_registration e
inner join sys_dept s on e.law_enforcement_id=s.dept_id
inner join enterprise_information i on e.enterprise_number=i.enterprise_number
- where find_in_set(#{deptId},s.ancestors) and (year(e.create_time)=#{year}) and (month(e.create_time)in(${month}))
+
+ and find_in_set(#{deptId},s.ancestors)
+ and (year(e.create_time)=#{year})
+ and (month(e.create_time)in(${month}))
+
order by e.enterprise_name
@@ -31,7 +35,11 @@
from enforcement_registration e
inner join sys_dept s on e.law_enforcement_id=s.dept_id
inner join enterprise_information i on e.enterprise_number=i.enterprise_number
- where !find_in_set((select dept_id from sys_dept where dept_name="区"),s.ancestors) and (year(e.create_time)=#{year}) and (month(e.create_time)in(${month}))
+
+ and !find_in_set((select dept_id from sys_dept where dept_name="区"),s.ancestors)
+ and (year(e.create_time)=#{year})
+ and (month(e.create_time)in(${month}))
+
order by e.enterprise_name