Merge branch 'dev' of http://146.56.199.25:3000/zhuibobo/EnforcementCode-2.0 into dev

script/sql/zfjd-refactoring-v1/其他/njy/njy.sql

@@ -18,3 +18,6 @@ ALTER TABLE efcode_cp_notice ADD is_read INT DEFAULT 0 NULL COMMENT '预告是
 ALTER TABLE enterprise_information MODIFY COLUMN enterprise_tel varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '企业联系电话';
 
 ALTER TABLE non_enforcement_registration ADD other_reasons varchar(500) NULL COMMENT '其他原因';
+
+
+ALTER TABLE enforcement_registration ADD notice_id varchar(100) NULL COMMENT '预告ID';

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpNoticeController.java

@@ -145,4 +145,14 @@ public class AppEnfCpNoticeController {
         return R.ok();
     }
 
+
+
+    /**
+     * 预告到期自动更新以执行（手动触发，强制匹配并落库）
+     */
+    @GetMapping("/noticeReserve")
+    public R<Void> noticeReserve() {
+        efcodeCpNoticeService.markExpiredNoticesAsExecuted();
+        return R.ok();
+    }
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpPlanController.java

@@ -102,4 +102,26 @@ public class AppEnfCpPlanController extends EfcodeCpPlanController {
         cpPlanService.autoMatchReserveV3(true, true, true);
         return R.ok();
     }
+
+    /**
+     * 计划到期自动生成任务（手动触发，强制匹配并落库）
+     * @return
+     */
+    @GetMapping("/autoMatchReserve")
+    public R<Void> autoTaskReserve() {
+        int count = cpPlanService.processPlanDeadlineAutoGenTask();
+        return R.ok();
+    }
+
+
+
+    /**
+     * 取消超出自动匹配时间的联合执法计划（手动触发，强制匹配并落库）
+     * @return
+     */
+    @GetMapping("/updateIsUnion")
+    public R<Void> updateIsUnion() {
+        int count = cpPlanService.updateIsUnion();
+        return R.ok();
+    }
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpReserveController.java

@@ -124,4 +124,14 @@ public class AppEnfCpReserveController extends EfcodeCpReserveController {
         return R.ok("修改预约状态为已读成功！");
         }
 
+
+    /**
+     * 预约超期自动取消
+     */
+    @GetMapping("/autoOverdueManualReserves")
+    public R<Void> autoOverdueManualReserves() {
+        int manualCount = cpReserveService.cancelOverdueManualReserves(false);
+        int systemCount = cpReserveService.cancelOverdueSystemReserves(false);
+        return R.ok();
+    }
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java

@@ -2,7 +2,9 @@ package com.zdxt.enforcementcode.controller.app.enforcement;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.zdxt.enforcementcode.common.util.CommonUtil;
+import com.zdxt.enforcementcode.domain.EfcodeCpNotice;
 import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo;
 import com.zdxt.enforcementcode.domain.bo.EnterpriseLawEnforcementBo;
 import com.zdxt.enforcementcode.domain.bo.enterprise.AppEnterpriseComplaintBo;
@@ -13,6 +15,7 @@ import com.zdxt.enforcementcode.domain.vo.EnterpriseLawEnforcementVo;
 import com.zdxt.enforcementcode.domain.vo.enterprise.UnionEnforcementGroupVo;
 import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnterpriseComplaintVo;
 import com.zdxt.enforcementcode.domain.vo.enterprise.AppLawEnforcementCaseVo;
+import com.zdxt.enforcementcode.mapper.EfcodeCpNoticeMapper;
 import com.zdxt.enforcementcode.service.IEnforcementRegistrationService;
 import com.zdxt.enforcementcode.service.IEnterpriseEvaluateService;
 import com.zdxt.enforcementcode.service.IEnterpriseLawEnforcementService;
@@ -75,6 +78,7 @@ public class AppEnforcementRegistrationController extends BaseController {
 
     @Autowired
     private IAppLawEnforcementCaseService appLawEnforcementCaseService;
+    private final EfcodeCpNoticeMapper efcodeCpNoticeMapper;
 
     /**
      * 执法端-执法登记新增保存
@@ -216,11 +220,18 @@ public class AppEnforcementRegistrationController extends BaseController {
                 bo.setId(null);
             }
         }
-        if (StringUtils.isNotEmpty(bo.getLawId())) {
+        /*if (StringUtils.isNotEmpty(bo.getLawId())) {
             EnterpriseLawEnforcementBo eleBo = new EnterpriseLawEnforcementBo();
             eleBo.setId(bo.getLawId());
             eleBo.setIsReg(1L);
             resNum = enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(eleBo);
+        }*/
+        //更新联合预告状态
+        if(bo.getNoticeId()!=null){
+            UpdateWrapper<EfcodeCpNotice> wrapper = new UpdateWrapper();
+            wrapper.eq("id",bo.getNoticeId());
+            wrapper.set("status",3);
+            efcodeCpNoticeMapper.update(null,wrapper);
         }
         return toAjax(resNum);
     }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnforcementRegistration.java

@@ -323,4 +323,9 @@ public class EnforcementRegistration {
      */
     private String otherReasons;
 
+    /**
+     * 预告ID
+     */
+    private String noticeId;
+
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java

@@ -334,4 +334,9 @@ public class EnforcementRegistrationBo extends BaseEntity {
     private String lawEnforceCategoryText;
 
     private String checkCategoryText;
+
+    /**
+     * 预告id
+     */
+    private String noticeId;
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java

@@ -414,4 +414,9 @@ public class EnforcementRegistrationVo implements Serializable {
      *  其他原因
      */
     private String otherReasons;
+
+    /**
+     * 预告ID
+     */
+    private String noticeId;
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java

@@ -90,7 +90,7 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService {
         Long userId = LoginHelper.getUserId();
         lqw.eq(userId != null, EfcodeCpNotice::getCreateBy, userId);
         //企业统一信用代码不等于空的
-        lqw.eq(StringUtils.isNotBlank(bo.getBureauDeptId()),EfcodeCpNotice::getEnterpriseNumber,bo.getEnterpriseNumber());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseNumber()),EfcodeCpNotice::getEnterpriseNumber,bo.getEnterpriseNumber());
          //状态不等于空的
         lqw.eq(bo.getStatus() != null, EfcodeCpNotice::getStatus, bo.getStatus());
         // 过滤已删除

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zdxt.enforcementcode.common.annotation.DataScope;
 import com.zdxt.enforcementcode.common.commonenum.PlatformTypeEnums;
@@ -67,6 +68,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
     private final SysDeptMapper sysDeptMapper;
     private final EnterpriseInformationMapper enterpriseInformationMapper;
 
+
     /**
      * 查询企业端-执法登记记录
      *
@@ -713,6 +715,8 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
                 zdxtFileMapper.insertZdxtFile(zdxtFile);
             });
         }
+
+
         return resNum;
     }
 
@@ -1030,11 +1034,6 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
                 zdxtFileMapper.insertZdxtFile(zdxtFile);
             });
         }
-        //判断数据修改成功且状态为1时同步推送至
-        if(i > 0 && null != bo.getStatus() && bo.getStatus() == 1){
-            //TODO 提交相对应的数据到后台管理，同时绑定对应的商户。相关的执法数据推送到其它平台
-
-        }
         return i;
     }
 

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml

@@ -322,6 +322,7 @@
             <if test="entrustDeptId != null and entrustDeptId!=''"> entrust_dept_id=#{entrustDeptId},</if>
             <if test="entrustDeptName != null and entrustDeptName!=''"> entrust_dept_name=#{entrustDeptName},</if>
             <if test="otherReasons != null  and otherReasons != ''"> other_reasons = #{otherReasons},</if>
+            <if test="noticeId != null  and noticeId != ''"> notice_id = #{noticeId},</if>
         </trim>
         where id = #{id}
     </update>
@@ -391,6 +392,7 @@
             <if test="entrustDeptId != null and entrustDeptId!=''"> entrust_dept_id,</if>
             <if test="entrustDeptName != null and entrustDeptName!=''"> entrust_dept_name,</if>
             <if test="otherReasons != null  and otherReasons != ''"> other_reasons,</if>
+            <if test="noticeId != null  and noticeId != ''"> notice_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null  and id != ''">#{id},</if>
@@ -446,6 +448,7 @@
             <if test="entrustDeptId != null and entrustDeptId!=''"> #{entrustDeptId},</if>
             <if test="entrustDeptName != null and entrustDeptName!=''"> #{entrustDeptName},</if>
             <if test="otherReasons != null  and otherReasons != ''"> #{otherReasons},</if>
+            <if test="noticeId != null  and noticeId != ''"> #{noticeId},</if>
         </trim>
     </insert>
 

zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/interface/index.vue

@@ -19,6 +19,38 @@ const interfaceConfigs = ref<InterfaceItem[]>([
     method: 'get',
     description: '手动触发,强制匹配并落库',
     confirm: true
+  },
+  {
+    name: '计划到期自动生成任务',
+    group: 'AppEnfCpPlanController',
+    url: '/app-enf/cpPlan/autoTaskReserve',
+    method: 'get',
+    description: '手动触发,强制匹配并落库',
+    confirm: true
+  },
+  {
+    name: '取消超出自动匹配时间的联合执法计划',
+    group: 'AppEnfCpPlanController',
+    url: '/app-enf/cpPlan/updateIsUnion',
+    method: 'get',
+    description: '手动触发,强制匹配并落库',
+    confirm: true
+  },
+   {
+    name: '预约超期自动取消',
+    group: 'AppEnfCpReserveController',
+    url: '/app-enf/cpReserve/autoOverdueManualReserves',
+    method: 'get',
+    description: '手动触发,强制匹配并落库',
+    confirm: true
+  },
+  {
+    name: '预告到期自动修改状态',
+    group: 'AppEnfCpNoticeController',
+    url: '/app-enf/cpNotice/noticeReserve',
+    method: 'get',
+    description: '手动触发,强制匹配并落库',
+    confirm: true
   }
 ]);