Merge remote-tracking branch 'origin/v3' into v3

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("修改失败");
+    }
+
 
     /**
      * 修改执法端-执法登记

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());

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}))
+        <where>
+            <if test="deptId != null  and deptId != ''">and find_in_set(#{deptId},s.ancestors)</if>
+            <if test="year != null  and year != ''">and (year(e.create_time)=#{year})</if>
+            <if test="month != null  and month != ''">and (month(e.create_time)in(${month}))</if>
+        </where>
         order by e.enterprise_name
     </select>
 
@@ -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}))
+        <where>
+            and !find_in_set((select dept_id from sys_dept where dept_name="区"),s.ancestors)
+            <if test="year != null  and year != ''">and (year(e.create_time)=#{year})</if>
+            <if test="month != null  and month != ''">and (month(e.create_time)in(${month}))</if>
+        </where>
         order by e.enterprise_name
     </select>