司法登记, 预约, 报警

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java

@@ -1,7 +1,9 @@
 package com.zdxt.code.controller;
 
 import java.util.List;
+import java.util.Map;
 
+import com.zdxt.code.domain.EnforceRegCount;
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.controller.BaseController;
 import com.zdxt.common.util.TableDataInfo;
@@ -52,7 +54,7 @@ public class EnforcementRegistrationController extends BaseController
     /**
      * 查询执法端-执法登记列表
      */
-    @RequiresPermissions("code:registration:queryList")
+    @RequiresPermissions("code:registration:list")
     @GetMapping("/queryList")
     @ResponseBody
     public ZDResponse queryList(EnforcementRegistration enforcementRegistration)
@@ -129,4 +131,16 @@ public class EnforcementRegistrationController extends BaseController
         return enforcementRegistrationService.deleteEnforcementRegistrationByIds(ids) > 0 ?
                 ZDResponse.success("删除成功") : ZDResponse.error("删除失败");
     }
+
+    /**
+     * 获取预警信息
+     */
+    @RequiresPermissions("code:registration:list")
+    @GetMapping("/queryEarlyWarning")
+    @ResponseBody
+    public ZDResponse queryEarlyWarning(EnforcementRegistration enforcementRegistration)
+    {
+        List<EnforceRegCount> list = enforcementRegistrationService.queryEarlyWarning(enforcementRegistration.getSearchValue());
+        return ZDResponse.success("查询成功",list);
+    }
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java

@@ -60,6 +60,15 @@ public class EnterpriseLawEnforcementController extends BaseController
         return ZDResponse.success("查询成功",list);
     }
 
+    @RequiresPermissions("code:enforcement:list")
+    @GetMapping("/queryList")
+    @ResponseBody
+    public ZDResponse queryList(EnterpriseLawEnforcement enterpriseLawEnforcement)
+    {
+        List<EnterpriseLawEnforcement> list = enterpriseLawEnforcementService.selectEnterpriseLawEnforcementList(enterpriseLawEnforcement);
+        return ZDResponse.success("查询成功",list);
+    }
+
 
     /**
      * 新增企业端-执法部门预约记录

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforceRegCount.java

@@ -0,0 +1,58 @@
+package com.zdxt.code.domain;
+
+import com.zdxt.common.BaseDomain;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 执法端-执法登记对象 enforcement_registration
+ * 
+ * @author chenrui
+ * @date 2024-02-23
+ */
+public class EnforceRegCount
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 企业名称 */
+    private String lawEnforcement;
+    /** 企业id */
+    private String lawEnforcementId;
+    /** 统计数量 */
+    private Integer num;
+    /** 级别 */
+    private String level;
+
+    public String getLawEnforcement() {
+        return lawEnforcement;
+    }
+
+    public void setLawEnforcement(String lawEnforcement) {
+        this.lawEnforcement = lawEnforcement;
+    }
+
+    public String getLawEnforcementId() {
+        return lawEnforcementId;
+    }
+
+    public void setLawEnforcementId(String lawEnforcementId) {
+        this.lawEnforcementId = lawEnforcementId;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+
+    public void setNum(Integer num) {
+        this.num = num;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+}

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java

@@ -4,6 +4,9 @@ import com.zdxt.common.BaseDomain;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 执法端-执法登记对象 enforcement_registration
  * 
@@ -17,18 +20,24 @@ public class EnforcementRegistration extends BaseDomain
     /** 主键ID */
     private String id;
 
-    /** 执法事件 */
-    private String lawEnforcementIncident;
-
-    /** 执法内容 */
-    private String lawEnforcementContent;
-
     /** 执法部门 */
     private String lawEnforcement;
 
     /** 执法部门ID */
     private String lawEnforcementId;
 
+    /** 被执法企业ID */
+    private String enterpriseId;
+
+    /** 被执法企业 */
+    private String enterpriseName;
+
+    /** 被执法企业税号 */
+    private String enterpriseNumber;
+
+    /** 执法时间 */
+    private Date enforcementTime;
+
     /** 执法人员姓名 */
     private String lawEnforcer;
 
@@ -38,141 +47,207 @@ public class EnforcementRegistration extends BaseDomain
     /** 执法人员联系方式 */
     private String lawEnforcerTel;
 
-    /**
-     * 是否删除 0否 1 是
-     */
-    private Integer isDelete;
+    /** 执法人员2姓名 */
+    private String lawEnforcerTwo;
 
-    /**
-     *  执法登记数据状态 0 登记 1 提交
-     */
-    private Integer status;
+    /** 执法人员2ID */
+    private Long lawEnforcerIdTwo;
 
-    /**
-     * 企业纳税识别号，被执法企业
-     */
-    private String enterpriseNumber;
+    /** 执法人员2联系方式 */
+    private String lawEnforcerTelTwo;
 
-    /**
-     * 备注
-     */
+    /** 辅助人员姓名 */
+    private String subsidiaryer;
+
+    /** 辅助人员ID */
+    private Long subsidiaryerId;
+
+    /** 辅助人员联系方式 */
+    private String subsidiaryerTel;
+
+    /** 执法事项 */
+    private String lawEnforcementItem;
+
+    /** 执法依据 */
+    private String lawEnforcementBasis;
+
+    /** 登记编号 */
+    private String lawEnforcementCode;
+
+    /** 备注 */
     private String remark;
 
     /**
-     * 搜索框搜索
+     * 执法结果 0 合格 1 不合格
      */
-    private String searchText;
+    private Integer reslut;
 
     /**
-     * 搜索时间
+     * 状态 0 正常 1 取消
      */
-    private Integer dateType;
+    private Integer status;
+
+    /** 是否删除 0 否 1 是 */
+    private Integer isDelete;
 
     /**
-     * 是否投诉 0 否 1 是
+     * 文件几个
      */
-    private Integer isComplaint;
+    private List<String> fileList;
 
+    /** 查询时间类型 */
+    private Integer dateType;
 
-    public void setId(String id) 
-    {
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
         this.id = id;
     }
 
-    public String getId() 
-    {
-        return id;
+    public String getLawEnforcement() {
+        return lawEnforcement;
     }
-    public void setLawEnforcementIncident(String lawEnforcementIncident) 
-    {
-        this.lawEnforcementIncident = lawEnforcementIncident;
+
+    public void setLawEnforcement(String lawEnforcement) {
+        this.lawEnforcement = lawEnforcement;
     }
 
-    public String getLawEnforcementIncident() 
-    {
-        return lawEnforcementIncident;
+    public String getLawEnforcementId() {
+        return lawEnforcementId;
     }
-    public void setLawEnforcementContent(String lawEnforcementContent) 
-    {
-        this.lawEnforcementContent = lawEnforcementContent;
+
+    public void setLawEnforcementId(String lawEnforcementId) {
+        this.lawEnforcementId = lawEnforcementId;
     }
 
-    public String getLawEnforcementContent() 
-    {
-        return lawEnforcementContent;
+    public String getEnterpriseId() {
+        return enterpriseId;
     }
-    public void setLawEnforcement(String lawEnforcement) 
-    {
-        this.lawEnforcement = lawEnforcement;
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
     }
 
-    public String getLawEnforcement() 
-    {
-        return lawEnforcement;
+    public String getEnterpriseName() {
+        return enterpriseName;
     }
-    public void setLawEnforcementId(String lawEnforcementId) 
-    {
-        this.lawEnforcementId = lawEnforcementId;
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
     }
 
-    public String getLawEnforcementId() 
-    {
-        return lawEnforcementId;
+    public String getEnterpriseNumber() {
+        return enterpriseNumber;
     }
-    public void setLawEnforcer(String lawEnforcer) 
-    {
-        this.lawEnforcer = lawEnforcer;
+
+    public void setEnterpriseNumber(String enterpriseNumber) {
+        this.enterpriseNumber = enterpriseNumber;
+    }
+
+    public Date getEnforcementTime() {
+        return enforcementTime;
     }
 
-    public String getLawEnforcer() 
-    {
+    public void setEnforcementTime(Date enforcementTime) {
+        this.enforcementTime = enforcementTime;
+    }
+
+    public String getLawEnforcer() {
         return lawEnforcer;
     }
-    public void setLawEnforcerId(Long lawEnforcerId) 
-    {
-        this.lawEnforcerId = lawEnforcerId;
+
+    public void setLawEnforcer(String lawEnforcer) {
+        this.lawEnforcer = lawEnforcer;
     }
 
-    public Long getLawEnforcerId() 
-    {
+    public Long getLawEnforcerId() {
         return lawEnforcerId;
     }
-    public void setLawEnforcerTel(String lawEnforcerTel) 
-    {
-        this.lawEnforcerTel = lawEnforcerTel;
+
+    public void setLawEnforcerId(Long lawEnforcerId) {
+        this.lawEnforcerId = lawEnforcerId;
     }
 
-    public String getLawEnforcerTel() 
-    {
+    public String getLawEnforcerTel() {
         return lawEnforcerTel;
     }
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
+    public void setLawEnforcerTel(String lawEnforcerTel) {
+        this.lawEnforcerTel = lawEnforcerTel;
     }
 
-    public Integer getIsDelete() {
-        return isDelete;
+    public String getLawEnforcerTwo() {
+        return lawEnforcerTwo;
     }
 
-    public void setIsDelete(Integer isDelete) {
-        this.isDelete = isDelete;
+    public void setLawEnforcerTwo(String lawEnforcerTwo) {
+        this.lawEnforcerTwo = lawEnforcerTwo;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Long getLawEnforcerIdTwo() {
+        return lawEnforcerIdTwo;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setLawEnforcerIdTwo(Long lawEnforcerIdTwo) {
+        this.lawEnforcerIdTwo = lawEnforcerIdTwo;
     }
 
-    public String getEnterpriseNumber() {
-        return enterpriseNumber;
+    public String getLawEnforcerTelTwo() {
+        return lawEnforcerTelTwo;
     }
 
-    public void setEnterpriseNumber(String enterpriseNumber) {
-        this.enterpriseNumber = enterpriseNumber;
+    public void setLawEnforcerTelTwo(String lawEnforcerTelTwo) {
+        this.lawEnforcerTelTwo = lawEnforcerTelTwo;
+    }
+
+    public String getSubsidiaryer() {
+        return subsidiaryer;
+    }
+
+    public void setSubsidiaryer(String subsidiaryer) {
+        this.subsidiaryer = subsidiaryer;
+    }
+
+    public Long getSubsidiaryerId() {
+        return subsidiaryerId;
+    }
+
+    public void setSubsidiaryerId(Long subsidiaryerId) {
+        this.subsidiaryerId = subsidiaryerId;
+    }
+
+    public String getSubsidiaryerTel() {
+        return subsidiaryerTel;
+    }
+
+    public void setSubsidiaryerTel(String subsidiaryerTel) {
+        this.subsidiaryerTel = subsidiaryerTel;
+    }
+
+    public String getLawEnforcementItem() {
+        return lawEnforcementItem;
+    }
+
+    public void setLawEnforcementItem(String lawEnforcementItem) {
+        this.lawEnforcementItem = lawEnforcementItem;
+    }
+
+    public String getLawEnforcementBasis() {
+        return lawEnforcementBasis;
+    }
+
+    public void setLawEnforcementBasis(String lawEnforcementBasis) {
+        this.lawEnforcementBasis = lawEnforcementBasis;
+    }
+
+    public String getLawEnforcementCode() {
+        return lawEnforcementCode;
+    }
+
+    public void setLawEnforcementCode(String lawEnforcementCode) {
+        this.lawEnforcementCode = lawEnforcementCode;
     }
 
     @Override
@@ -185,44 +260,43 @@ public class EnforcementRegistration extends BaseDomain
         this.remark = remark;
     }
 
-    public String getSearchText() {
-        return searchText;
+    public Integer getReslut() {
+        return reslut;
     }
 
-    public void setSearchText(String searchText) {
-        this.searchText = searchText;
+    public void setReslut(Integer reslut) {
+        this.reslut = reslut;
     }
 
-    public Integer getDateType() {
-        return dateType;
+    public Integer getStatus() {
+        return status;
     }
 
-    public void setDateType(Integer dateType) {
-        this.dateType = dateType;
+    public void setStatus(Integer status) {
+        this.status = status;
     }
 
-    public Integer getIsComplaint() {
-        return isComplaint;
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
     }
 
-    public void setIsComplaint(Integer isComplaint) {
-        this.isComplaint = isComplaint;
+    public List<String> getFileList() {
+        return fileList;
     }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("lawEnforcementIncident", getLawEnforcementIncident())
-            .append("lawEnforcementContent", getLawEnforcementContent())
-            .append("lawEnforcement", getLawEnforcement())
-            .append("lawEnforcementId", getLawEnforcementId())
-            .append("lawEnforcer", getLawEnforcer())
-            .append("lawEnforcerId", getLawEnforcerId())
-            .append("lawEnforcerTel", getLawEnforcerTel())
-            .append("createTime", getCreateTime())
-            .append("userId", getUserId())
-            .append("deptId", getDeptId())
-            .toString();
+    public void setFileList(List<String> fileList) {
+        this.fileList = fileList;
+    }
+
+    public Integer getDateType() {
+        return dateType;
+    }
+
+    public void setDateType(Integer dateType) {
+        this.dateType = dateType;
     }
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java

@@ -4,6 +4,7 @@ import com.zdxt.common.BaseDomain;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 企业端-执法部门预约记录对象 enterprise_law_enforcement
@@ -17,10 +18,24 @@ public class EnterpriseLawEnforcement extends BaseDomain
 
     /** 主键ID */
     private String id;
-
+    /** 登记编号 */
+    private String lawEnforcementCode;
+    /** 企业名称 */
+    private String enterpriseName;
+    /** 企业ID */
+    private String enterpriseId;
+    /** 企业联系人 */
+    private String linkMan;
+    /** 联系人电话 */
+    private String linkTel;
+    /** 检查时间 */
+    private String checkTime;
+    /** 检查事项 */
+    private String checkItem;
+    /** 检查要求 */
+    private String checkRequire;
     /** 执法部门 */
     private String lawEnforcement;
-
     /** 执法部门ID */
     private String lawEnforcementId;
 
@@ -29,28 +44,14 @@ public class EnterpriseLawEnforcement extends BaseDomain
 
     /** 登记编号 */
     private String lawEnforcementCode;
-
-    /** 被执法企业 */
-    private String enterpriseName;
-
-    /** 被执法企业税号 */
-    private String enterpriseNumber;
-
-    /** 执法时间 */
-    private Date enforcementTime;
-
-    /** 执法人员姓名 */
+    /** 执法人员 */
     private String lawEnforcer;
-
     /** 执法人员ID */
-    private Long lawEnforcerId;
-
-    /** 执法人员联系方式 */
-    private String lawEnforcerTel;
+    private String lawEnforcerId;
+    /** 备注 */
+    private String remark;
 
-    /**
-     * 状态 0 正常 1 取消
-     */
+    /** 状态 0 正常 1 取消 */
     private Integer status;
 
     /**
@@ -58,90 +59,124 @@ public class EnterpriseLawEnforcement extends BaseDomain
      */
     private Integer isDelete;
 
-    public void setId(String id) 
-    {
-        this.id = id;
-    }
+    /** 是否删除 0 否 1 是 */
+    private Integer isDelete;
+
+    /** 查询时间类型 */
+    private Integer dateType;
 
-    public String getId() 
-    {
+    public String getId() {
         return id;
     }
-    public void setLawEnforcement(String lawEnforcement) 
-    {
-        this.lawEnforcement = lawEnforcement;
+
+    public void setId(String id) {
+        this.id = id;
     }
 
-    public String getLawEnforcement() 
-    {
-        return lawEnforcement;
+    public String getLawEnforcementCode() {
+        return lawEnforcementCode;
     }
-    public void setLawEnforcementId(String lawEnforcementId) 
-    {
-        this.lawEnforcementId = lawEnforcementId;
+
+    public void setLawEnforcementCode(String lawEnforcementCode) {
+        this.lawEnforcementCode = lawEnforcementCode;
     }
 
-    public String getLawEnforcementId() 
-    {
-        return lawEnforcementId;
+    public String getEnterpriseName() {
+        return enterpriseName;
     }
-    public void setEnterpriseName(String enterpriseName) 
-    {
+
+    public void setEnterpriseName(String enterpriseName) {
         this.enterpriseName = enterpriseName;
     }
 
-    public String getEnterpriseName() 
-    {
-        return enterpriseName;
+    public String getEnterpriseId() {
+        return enterpriseId;
     }
-    public void setEnterpriseNumber(String enterpriseNumber) 
-    {
-        this.enterpriseNumber = enterpriseNumber;
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
     }
 
-    public String getEnterpriseNumber() 
-    {
-        return enterpriseNumber;
+    public String getLinkMan() {
+        return linkMan;
     }
-    public void setEnforcementTime(Date enforcementTime) 
-    {
-        this.enforcementTime = enforcementTime;
+
+    public void setLinkMan(String linkMan) {
+        this.linkMan = linkMan;
     }
 
-    public Date getEnforcementTime() 
-    {
-        return enforcementTime;
+    public String getLinkTel() {
+        return linkTel;
     }
-    public void setLawEnforcer(String lawEnforcer) 
-    {
-        this.lawEnforcer = lawEnforcer;
+
+    public void setLinkTel(String linkTel) {
+        this.linkTel = linkTel;
+    }
+
+    public String getCheckTime() {
+        return checkTime;
+    }
+
+    public void setCheckTime(String checkTime) {
+        this.checkTime = checkTime;
+    }
+
+    public String getCheckItem() {
+        return checkItem;
+    }
+
+    public void setCheckItem(String checkItem) {
+        this.checkItem = checkItem;
+    }
+
+    public String getCheckRequire() {
+        return checkRequire;
+    }
+
+    public void setCheckRequire(String checkRequire) {
+        this.checkRequire = checkRequire;
+    }
+
+    public String getLawEnforcement() {
+        return lawEnforcement;
+    }
+
+    public void setLawEnforcement(String lawEnforcement) {
+        this.lawEnforcement = lawEnforcement;
     }
 
-    public String getLawEnforcer() 
-    {
+    public String getLawEnforcementId() {
+        return lawEnforcementId;
+    }
+
+    public void setLawEnforcementId(String lawEnforcementId) {
+        this.lawEnforcementId = lawEnforcementId;
+    }
+
+    public String getLawEnforcer() {
         return lawEnforcer;
     }
-    public void setLawEnforcerId(Long lawEnforcerId) 
-    {
-        this.lawEnforcerId = lawEnforcerId;
+
+    public void setLawEnforcer(String lawEnforcer) {
+        this.lawEnforcer = lawEnforcer;
     }
 
-    public Long getLawEnforcerId() 
-    {
+    public String getLawEnforcerId() {
         return lawEnforcerId;
     }
-    public void setLawEnforcerTel(String lawEnforcerTel) 
-    {
-        this.lawEnforcerTel = lawEnforcerTel;
+
+    public void setLawEnforcerId(String lawEnforcerId) {
+        this.lawEnforcerId = lawEnforcerId;
     }
 
-    public String getLawEnforcerTel() 
-    {
-        return lawEnforcerTel;
+    @Override
+    public String getRemark() {
+        return remark;
     }
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
     }
 
     public Integer getStatus() {
@@ -176,20 +211,19 @@ public class EnterpriseLawEnforcement extends BaseDomain
         this.lawEnforcementCode = lawEnforcementCode;
     }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("lawEnforcement", getLawEnforcement())
-            .append("lawEnforcementId", getLawEnforcementId())
-            .append("enterpriseName", getEnterpriseName())
-            .append("enterpriseNumber", getEnterpriseNumber())
-            .append("enforcementTime", getEnforcementTime())
-            .append("createTime", getCreateTime())
-            .append("createBy", getCreateBy())
-            .append("lawEnforcer", getLawEnforcer())
-            .append("lawEnforcerId", getLawEnforcerId())
-            .append("lawEnforcerTel", getLawEnforcerTel())
-            .toString();
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public Integer getDateType() {
+        return dateType;
+    }
+
+    public void setDateType(Integer dateType) {
+        this.dateType = dateType;
     }
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/RuleItemList.java

@@ -26,6 +26,9 @@ public class RuleItemList extends BaseDomain
     /** 告警次数 */
     private Long existAlarm;
 
+    /** 告警次数上边界 */
+    private long existAlarmEnd;
+
     /** 告警级别 */
     private String alarmType;
 
@@ -82,7 +85,15 @@ public class RuleItemList extends BaseDomain
         this.status = status;
     }
 
-    public Long getStatus() 
+    public long getExistAlarmEnd() {
+        return existAlarmEnd;
+    }
+
+    public void setExistAlarmEnd(long existAlarmEnd) {
+        this.existAlarmEnd = existAlarmEnd;
+    }
+
+    public Long getStatus()
     {
         return status;
     }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java

@@ -1,7 +1,11 @@
 package com.zdxt.code.mapper;
 
+import com.zdxt.code.domain.EnforceRegCount;
 import com.zdxt.code.domain.EnforcementRegistration;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
+import java.util.Map;
 
 /**
  * 执法端-执法登记Mapper接口
@@ -58,4 +62,9 @@ public interface EnforcementRegistrationMapper
      * @return 结果
      */
     public int deleteEnforcementRegistrationByIds(String[] ids);
+
+    /**
+     * 查询企业端-执法部门预约记录列表
+     */
+    public List<EnforceRegCount> countMentByTime(@Param("timeMonth") Long timeMonth, @Param("searchValue") String searchValue);
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseLawEnforcementMapper.java

@@ -2,6 +2,7 @@ package com.zdxt.code.mapper;
 
 import com.zdxt.code.domain.EnterpriseLawEnforcement;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 企业端-执法部门预约记录Mapper接口
@@ -58,4 +59,5 @@ public interface EnterpriseLawEnforcementMapper
      * @return 结果
      */
     public int deleteEnterpriseLawEnforcementByIds(String[] ids);
+
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java

@@ -1,7 +1,9 @@
 package com.zdxt.code.service;
 
+import com.zdxt.code.domain.EnforceRegCount;
 import com.zdxt.code.domain.EnforcementRegistration;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 执法端-执法登记Service接口
@@ -58,4 +60,10 @@ public interface IEnforcementRegistrationService
      * @return 结果
      */
     public int deleteEnforcementRegistrationById(String id);
+
+    /**
+     * 获取预警信息
+     */
+    public List<EnforceRegCount> queryEarlyWarning(String searchValue);
+
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java

@@ -1,11 +1,20 @@
 package com.zdxt.code.service.impl;
 
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.IdUtil;
 import com.zdxt.auth.dto.UserBean;
 import com.zdxt.auth.feign.UserApi;
+import com.zdxt.auth.feign.ZdxtFileCommonApi;
+import com.zdxt.code.domain.EnforceRegCount;
+import com.zdxt.code.domain.RuleItemList;
+import com.zdxt.code.service.IRuleItemListService;
 import com.zdxt.common.util.DateUtils;
+import com.zdxt.common.util.StringUtils;
+import com.zdxt.common.zdxtFile.ZdxtFileCommon;
+import org.dmg.pmml.association.Item;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zdxt.code.mapper.EnforcementRegistrationMapper;
@@ -24,6 +33,12 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
     @Autowired
     private EnforcementRegistrationMapper enforcementRegistrationMapper;
 
+    @Autowired
+    private IRuleItemListService iRuleItemListService;
+
+    @Autowired
+    private ZdxtFileCommonApi zdxtFileCommonApi;
+
     @Autowired
     private UserApi userApi;
 
@@ -61,13 +76,27 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
     public int insertEnforcementRegistration(EnforcementRegistration enforcementRegistration)
     {
         UserBean user = userApi.getCurrentUser();
+        enforcementRegistration.setId(IdUtil.simpleUUID());
+        enforcementRegistration.setCreateBy(user.getUserName());
         enforcementRegistration.setCreateTime(DateUtils.getNowDate());
         enforcementRegistration.setUserId(user.getUserId());
         enforcementRegistration.setDeptId(user.getDeptId());
         //默认为登记状态
         enforcementRegistration.setStatus(0);
         int i = enforcementRegistrationMapper.insertEnforcementRegistration(enforcementRegistration);
-
+        if(i > 0 && enforcementRegistration.getFileList().size() > 0){
+            enforcementRegistration.getFileList().forEach(res ->{
+                ZdxtFileCommon zdxtFileCommon = new ZdxtFileCommon();
+                zdxtFileCommon.setBusinessId(enforcementRegistration.getId());
+                zdxtFileCommon.setGuid(IdUtil.simpleUUID());
+                //文件后缀
+//                zdxtFileCommon.setFileSuffix("JPG");
+                zdxtFileCommon.setUploadPath(res);
+                zdxtFileCommon.setUploadPersonId(user.getUserId().toString());
+                zdxtFileCommon.setUploadPersonName(user.getUserName());
+                zdxtFileCommonApi.addZdxtFileCommon(zdxtFileCommon);
+            });
+        }
         return i;
     }
 
@@ -113,4 +142,44 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
     {
         return enforcementRegistrationMapper.deleteEnforcementRegistrationById(id);
     }
+
+    @Override
+    public List<EnforceRegCount> queryEarlyWarning(String searchValue) {
+        // 先获取规则
+        RuleItemList ruleItem = new RuleItemList();
+        ruleItem.setStatus(0L);
+        List<RuleItemList> ruleItemLists = iRuleItemListService.selectRuleItemListList(ruleItem);
+        // 根据规则作为条件查询复合要求的数据
+        List<EnforceRegCount> regList = new ArrayList<>();
+        for (RuleItemList rule : ruleItemLists) {
+            List<EnforceRegCount> tmpList = enforcementRegistrationMapper.countMentByTime(rule.getCycleTime(), searchValue);
+            regList.addAll(tmpList);
+        }
+
+        // 对数据进行组合
+        Map<String, EnforceRegCount> maxItems = regList.stream()
+                .collect(Collectors.groupingBy(
+                        EnforceRegCount::getLawEnforcementId,
+                        Collectors.collectingAndThen(
+                                Collectors.maxBy(Comparator.comparingInt(EnforceRegCount::getNum)),
+                                Optional::get
+                        )
+                ));
+
+        List<EnforceRegCount> results = new ArrayList<>();
+        Iterator<Map.Entry<String, EnforceRegCount>> iterator = maxItems.entrySet().iterator();
+        while (iterator.hasNext()) {
+            EnforceRegCount reg = iterator.next().getValue();
+            // 判断预警级别
+            for (RuleItemList rule : ruleItemLists) {
+                if (reg.getNum() >= rule.getExistAlarm() && reg.getNum() <= rule.getExistAlarmEnd()) {
+                    reg.setLevel(rule.getAlarmType());
+                    break;
+                }
+            }
+            results.add(reg);
+        }
+
+        return results;
+    }
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java

@@ -6,7 +6,9 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.IdUtil;
 import com.zdxt.auth.dto.UserBean;
 import com.zdxt.auth.feign.UserApi;
+import com.zdxt.auth.feign.ZdxtFileCommonApi;
 import com.zdxt.common.util.DateUtils;
+import com.zdxt.common.zdxtFile.ZdxtFileCommon;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zdxt.code.mapper.EnterpriseLawEnforcementMapper;
@@ -25,6 +27,9 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc
     @Autowired
     private EnterpriseLawEnforcementMapper enterpriseLawEnforcementMapper;
 
+    @Autowired
+    private ZdxtFileCommonApi zdxtFileCommonApi;
+
     @Autowired
     private UserApi userApi;
 
@@ -69,7 +74,8 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc
         enterpriseLawEnforcement.setCreateBy(user.getUserName());
         //预约记录，默认正常
         enterpriseLawEnforcement.setStatus(0);
-        return enterpriseLawEnforcementMapper.insertEnterpriseLawEnforcement(enterpriseLawEnforcement);
+        int i = enterpriseLawEnforcementMapper.insertEnterpriseLawEnforcement(enterpriseLawEnforcement);
+        return i;
     }
 
     /**

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@@ -4,129 +4,194 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zdxt.code.mapper.EnforcementRegistrationMapper">
     
-    <resultMap type="EnforcementRegistration" id="EnforcementRegistrationResult">
+    <resultMap type="com.zdxt.code.domain.EnforcementRegistration" id="EnforcementRegistrationResult">
         <result property="id"    column="id"    />
-        <result property="lawEnforcementIncident"    column="law_enforcement_incident"    />
-        <result property="lawEnforcementContent"    column="law_enforcement_content"    />
         <result property="lawEnforcement"    column="law_enforcement"    />
         <result property="lawEnforcementId"    column="law_enforcement_id"    />
+        <result property="enterpriseId"    column="enterprise_id"    />
+        <result property="enterpriseName"    column="enterprise_name"    />
+        <result property="enterpriseNumber"    column="enterprise_number"    />
+        <result property="enforcementTime"    column="enforcement_time"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
         <result property="lawEnforcer"    column="law_enforcer"    />
         <result property="lawEnforcerId"    column="law_enforcer_id"    />
         <result property="lawEnforcerTel"    column="law_enforcer_tel"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="lawEnforcerTwo"    column="law_enforcer_two"    />
+        <result property="lawEnforcerIdTwo"    column="law_enforcer_id_two"    />
+        <result property="lawEnforcerTelTwo"    column="law_enforcer_tel_two"    />
+        <result property="subsidiaryer"    column="subsidiaryer"    />
+        <result property="subsidiaryerId"    column="subsidiaryer_id"    />
+        <result property="subsidiaryerTel"    column="subsidiaryer_tel"    />
+        <result property="lawEnforcementItem"    column="law_enforcement_item"    />
+        <result property="lawEnforcementBasis"    column="law_enforcement_basis"    />
+        <result property="remark"    column="remark"    />
+        <result property="reslut"    column="reslut"    />
         <result property="userId"    column="user_id"    />
         <result property="deptId"    column="dept_id"    />
         <result property="isDelete"    column="is_delete"    />
         <result property="status"    column="status"    />
-        <result property="enterpriseNumber"    column="enterprise_number"    />
-        <result property="remark"    column="remark"    />
-        <result property="isComplaint"    column="is_complaint"    />
+        <result property="lawEnforcementCode"    column="law_enforcement_code"    />
+    </resultMap>
+
+    <resultMap type="com.zdxt.code.domain.EnforceRegCount" id="EnforceRegCountResult">
+        <result property="num"    column="num"    />
+        <result property="lawEnforcement"    column="law_enforcement"    />
+        <result property="lawEnforcementId"    column="law_enforcement_id"    />
     </resultMap>
 
     <sql id="selectEnforcementRegistrationVo">
-        select id, law_enforcement_incident, law_enforcement_content, law_enforcement, law_enforcement_id, law_enforcer, law_enforcer_id, law_enforcer_tel, create_time, user_id, dept_id,is_delete, status,enterprise_number,remark,is_complaint from enforcement_registration
+        select id, law_enforcement, law_enforcement_id, enterprise_id, enterprise_name, enterprise_number, enforcement_time, create_time, create_by, law_enforcer, law_enforcer_id, law_enforcer_tel, law_enforcer_two, law_enforcer_id_two, law_enforcer_tel_two, subsidiaryer, subsidiaryer_id, subsidiaryer_tel, law_enforcement_item, law_enforcement_basis, remark, reslut, user_id, dept_id, is_delete, status, law_enforcement_code from enforcement_registration
     </sql>
 
     <select id="selectEnforcementRegistrationList" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
         <include refid="selectEnforcementRegistrationVo"/>
         <where>  
-            <if test="lawEnforcementIncident != null  and lawEnforcementIncident != ''"> and law_enforcement_incident like concat('%', #{lawEnforcementIncident}, '%')</if>
-            <if test="lawEnforcementContent != null  and lawEnforcementContent != ''"> and law_enforcement_content = #{lawEnforcementContent}</if>
-            <if test="lawEnforcement != null  and lawEnforcement != ''"> and law_enforcement like concat('%', #{lawEnforcement}, '%')</if>
+            <if test="lawEnforcement != null  and lawEnforcement != ''"> and law_enforcement = #{lawEnforcement}</if>
             <if test="lawEnforcementId != null  and lawEnforcementId != ''"> and law_enforcement_id = #{lawEnforcementId}</if>
-            <if test="lawEnforcer != null  and lawEnforcer != ''"> and law_enforcer like concat('%', #{lawEnforcer}, '%')</if>
-            <if test="lawEnforcerId != null "> and law_enforcer_id = #{lawEnforcerId}</if>
-            <if test="lawEnforcerTel != null  and lawEnforcerTel != ''"> and law_enforcer_tel = #{lawEnforcerTel}</if>
+            <if test="enterpriseId != null  and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''"> and enterprise_number = #{enterpriseNumber}</if>
+            <if test="enforcementTime != null "> and enforcement_time = #{enforcementTime}</if>
+            <if test="lawEnforcer != null  and lawEnforcer != ''"> and law_enforcer = #{lawEnforcer}</if>
+            <if test="lawEnforcerId != null  and lawEnforcerId != ''"> and law_enforcer_id = #{lawEnforcerId}</if>
+            <if test="lawEnforcerTel != null  and lawEnforcerTel != ''"> and law_enforcer_tel = #{lawEnforcerTel}</if>
+            <if test="lawEnforcerTwo != null  and lawEnforcerTwo != ''"> and law_enforcer_two = #{lawEnforcerTwo}</if>
+            <if test="lawEnforcerIdTwo != null  and lawEnforcerIdTwo != ''"> and law_enforcer_id_two = #{lawEnforcerIdTwo}</if>
+            <if test="lawEnforcerTelTwo != null  and lawEnforcerTelTwo != ''"> and law_enforcer_tel_two = #{lawEnforcerTelTwo}</if>
+            <if test="subsidiaryer != null  and subsidiaryer != ''"> and subsidiaryer = #{subsidiaryer}</if>
+            <if test="subsidiaryerId != null  and subsidiaryerId != ''"> and subsidiaryer_id = #{subsidiaryerId}</if>
+            <if test="subsidiaryerTel != null  and subsidiaryerTel != ''"> and subsidiaryer_tel = #{subsidiaryerTel}</if>
+            <if test="lawEnforcementItem != null  and lawEnforcementItem != ''"> and law_enforcement_item = #{lawEnforcementItem}</if>
+            <if test="lawEnforcementBasis != null  and lawEnforcementBasis != ''"> and law_enforcement_basis = #{lawEnforcementBasis}</if>
+            <if test="reslut != null "> and reslut = #{reslut}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
             <if test="status != null "> and status = #{status}</if>
-            <if test="isComplaint != null "> and is_complaint = #{isComplaint}</if>
-            <if test="dateType == 1">
-                and YEAR(create_time) = YEAR(CURDATE())
+            <if test="lawEnforcementCode != null  and lawEnforcementCode != ''"> and law_enforcement_code = #{lawEnforcementCode}</if>
+            <if test="searchValue != null and searchValue != ''">
+                and ( enterprise_name like concat(concat('%',#{searchValue}),'%')
+                or law_enforcement_code like concat(concat('%',#{searchValue}),'%')
+                or law_enforcer_tel like concat(concat('%',#{searchValue}),'%')
+                )
+            </if>
+            <if test="dateType != null and dateType == 1">
+                and DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
             </if>
-            <if test="dateType == 2">
-                and DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m')
+            <if test="dateType != null and dateType == 2">
+                and create_time >= DATE_SUB(CURDATE(), INTERVAL 3 MONTH)
             </if>
-            <if test="searchText != null and searchText != ''">
-                or law_enforcement_incident like concat('%', #{searchText}, '%')
-                or law_enforcement like concat('%', #{searchText}, '%')
-                or law_enforcer like concat('%', #{searchText}, '%')
+            <if test="dateType != null and dateType == 3">
+                and create_time >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
             </if>
-            and is_delete = 0
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectEnforcementRegistrationById" parameterType="String" resultMap="EnforcementRegistrationResult">
         <include refid="selectEnforcementRegistrationVo"/>
-        where id = #{id} and is_delete = 0
+        where id = #{id}
     </select>
         
     <insert id="insertEnforcementRegistration" parameterType="EnforcementRegistration">
         insert into enforcement_registration
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null  and id != ''">id,</if>
-            <if test="lawEnforcementIncident != null  and lawEnforcementIncident != ''">law_enforcement_incident,</if>
-            <if test="lawEnforcementContent != null  and lawEnforcementContent != ''">law_enforcement_content,</if>
             <if test="lawEnforcement != null  and lawEnforcement != ''">law_enforcement,</if>
             <if test="lawEnforcementId != null  and lawEnforcementId != ''">law_enforcement_id,</if>
-            <if test="lawEnforcer != null  and lawEnforcer != ''">law_enforcer,</if>
-            <if test="lawEnforcerId != null ">law_enforcer_id,</if>
-            <if test="lawEnforcerTel != null  and lawEnforcerTel != ''">law_enforcer_tel,</if>
+            <if test="enterpriseId != null  and enterpriseId != ''">enterprise_id,</if>
+            <if test="enterpriseName != null  and enterpriseName != ''">enterprise_name,</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''">enterprise_number,</if>
+            <if test="enforcementTime != null ">enforcement_time,</if>
             <if test="createTime != null ">create_time,</if>
+            <if test="createBy != null  and createBy != ''">create_by,</if>
+            <if test="lawEnforcer != null  and lawEnforcer != ''">law_enforcer,</if>
+            <if test="lawEnforcerId != null  and lawEnforcerId != ''">law_enforcer_id,</if>
+            <if test="lawEnforcerTel != null  and lawEnforcerTel != ''">law_enforcer_tel,</if>
+            <if test="lawEnforcerTwo != null  and lawEnforcerTwo != ''">law_enforcer_two,</if>
+            <if test="lawEnforcerIdTwo != null  and lawEnforcerIdTwo != ''">law_enforcer_id_two,</if>
+            <if test="lawEnforcerTelTwo != null  and lawEnforcerTelTwo != ''">law_enforcer_tel_two,</if>
+            <if test="subsidiaryer != null  and subsidiaryer != ''">subsidiaryer,</if>
+            <if test="subsidiaryerId != null  and subsidiaryerId != ''">subsidiaryer_id,</if>
+            <if test="subsidiaryerTel != null  and subsidiaryerTel != ''">subsidiaryer_tel,</if>
+            <if test="lawEnforcementItem != null  and lawEnforcementItem != ''">law_enforcement_item,</if>
+            <if test="lawEnforcementBasis != null  and lawEnforcementBasis != ''">law_enforcement_basis,</if>
+            <if test="remark != null  and remark != ''">remark,</if>
+            <if test="reslut != null ">reslut,</if>
             <if test="userId != null ">user_id,</if>
             <if test="deptId != null ">dept_id,</if>
-            <if test="status != null ">  status,</if>
             <if test="isDelete != null ">is_delete,</if>
-            <if test="remark != null and remark != '' ">remark,</if>
-            <if test="isComplaint != null">is_complaint,</if>
+            <if test="status != null ">status,</if>
+            <if test="lawEnforcementCode != null  and lawEnforcementCode != ''">law_enforcement_code,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null  and id != ''">#{id},</if>
-            <if test="lawEnforcementIncident != null  and lawEnforcementIncident != ''">#{lawEnforcementIncident},</if>
-            <if test="lawEnforcementContent != null  and lawEnforcementContent != ''">#{lawEnforcementContent},</if>
             <if test="lawEnforcement != null  and lawEnforcement != ''">#{lawEnforcement},</if>
             <if test="lawEnforcementId != null  and lawEnforcementId != ''">#{lawEnforcementId},</if>
-            <if test="lawEnforcer != null  and lawEnforcer != ''">#{lawEnforcer},</if>
-            <if test="lawEnforcerId != null ">#{lawEnforcerId},</if>
-            <if test="lawEnforcerTel != null  and lawEnforcerTel != ''">#{lawEnforcerTel},</if>
+            <if test="enterpriseId != null  and enterpriseId != ''">#{enterpriseId},</if>
+            <if test="enterpriseName != null  and enterpriseName != ''">#{enterpriseName},</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''">#{enterpriseNumber},</if>
+            <if test="enforcementTime != null ">#{enforcementTime},</if>
             <if test="createTime != null ">#{createTime},</if>
+            <if test="createBy != null  and createBy != ''">#{createBy},</if>
+            <if test="lawEnforcer != null  and lawEnforcer != ''">#{lawEnforcer},</if>
+            <if test="lawEnforcerId != null  and lawEnforcerId != ''">#{lawEnforcerId},</if>
+            <if test="lawEnforcerTel != null  and lawEnforcerTel != ''">#{lawEnforcerTel},</if>
+            <if test="lawEnforcerTwo != null  and lawEnforcerTwo != ''">#{lawEnforcerTwo},</if>
+            <if test="lawEnforcerIdTwo != null  and lawEnforcerIdTwo != ''">#{lawEnforcerIdTwo},</if>
+            <if test="lawEnforcerTelTwo != null  and lawEnforcerTelTwo != ''">#{lawEnforcerTelTwo},</if>
+            <if test="subsidiaryer != null  and subsidiaryer != ''">#{subsidiaryer},</if>
+            <if test="subsidiaryerId != null  and subsidiaryerId != ''">#{subsidiaryerId},</if>
+            <if test="subsidiaryerTel != null  and subsidiaryerTel != ''">#{subsidiaryerTel},</if>
+            <if test="lawEnforcementItem != null  and lawEnforcementItem != ''">#{lawEnforcementItem},</if>
+            <if test="lawEnforcementBasis != null  and lawEnforcementBasis != ''">#{lawEnforcementBasis},</if>
+            <if test="remark != null  and remark != ''">#{remark},</if>
+            <if test="reslut != null ">#{reslut},</if>
             <if test="userId != null ">#{userId},</if>
             <if test="deptId != null ">#{deptId},</if>
-            <if test="status != null "> #{status},</if>
-            <if test="isDelete != null "> #{isDelete},</if>
-            <if test="remark != null and remark != '' "> #{remark},</if>
-            <if test="isComplaint != null">#{isComplaint},</if>
+            <if test="isDelete != null ">#{isDelete},</if>
+            <if test="status != null ">#{status},</if>
+            <if test="lawEnforcementCode != null  and lawEnforcementCode != ''">#{lawEnforcementCode},</if>
          </trim>
     </insert>
 
     <update id="updateEnforcementRegistration" parameterType="EnforcementRegistration">
         update enforcement_registration
         <trim prefix="SET" suffixOverrides=",">
-            <if test="lawEnforcementIncident != null  and lawEnforcementIncident != ''">law_enforcement_incident = #{lawEnforcementIncident},</if>
-            <if test="lawEnforcementContent != null  and lawEnforcementContent != ''">law_enforcement_content = #{lawEnforcementContent},</if>
             <if test="lawEnforcement != null  and lawEnforcement != ''">law_enforcement = #{lawEnforcement},</if>
             <if test="lawEnforcementId != null  and lawEnforcementId != ''">law_enforcement_id = #{lawEnforcementId},</if>
+            <if test="enterpriseId != null  and enterpriseId != ''">enterprise_id = #{enterpriseId},</if>
+            <if test="enterpriseName != null  and enterpriseName != ''">enterprise_name = #{enterpriseName},</if>
+            <if test="enterpriseNumber != null  and enterpriseNumber != ''">enterprise_number = #{enterpriseNumber},</if>
+            <if test="enforcementTime != null ">enforcement_time = #{enforcementTime},</if>
+            <if test="createTime != null ">create_time = #{createTime},</if>
+            <if test="createBy != null  and createBy != ''">create_by = #{createBy},</if>
             <if test="lawEnforcer != null  and lawEnforcer != ''">law_enforcer = #{lawEnforcer},</if>
-            <if test="lawEnforcerId != null ">law_enforcer_id = #{lawEnforcerId},</if>
+            <if test="lawEnforcerId != null  and lawEnforcerId != ''">law_enforcer_id = #{lawEnforcerId},</if>
             <if test="lawEnforcerTel != null  and lawEnforcerTel != ''">law_enforcer_tel = #{lawEnforcerTel},</if>
-            <if test="createTime != null ">create_time = #{createTime},</if>
+            <if test="lawEnforcerTwo != null  and lawEnforcerTwo != ''">law_enforcer_two = #{lawEnforcerTwo},</if>
+            <if test="lawEnforcerIdTwo != null  and lawEnforcerIdTwo != ''">law_enforcer_id_two = #{lawEnforcerIdTwo},</if>
+            <if test="lawEnforcerTelTwo != null  and lawEnforcerTelTwo != ''">law_enforcer_tel_two = #{lawEnforcerTelTwo},</if>
+            <if test="subsidiaryer != null  and subsidiaryer != ''">subsidiaryer = #{subsidiaryer},</if>
+            <if test="subsidiaryerId != null  and subsidiaryerId != ''">subsidiaryer_id = #{subsidiaryerId},</if>
+            <if test="subsidiaryerTel != null  and subsidiaryerTel != ''">subsidiaryer_tel = #{subsidiaryerTel},</if>
+            <if test="lawEnforcementItem != null  and lawEnforcementItem != ''">law_enforcement_item = #{lawEnforcementItem},</if>
+            <if test="lawEnforcementBasis != null  and lawEnforcementBasis != ''">law_enforcement_basis = #{lawEnforcementBasis},</if>
+            <if test="remark != null  and remark != ''">remark = #{remark},</if>
+            <if test="reslut != null ">reslut = #{reslut},</if>
             <if test="userId != null ">user_id = #{userId},</if>
             <if test="deptId != null ">dept_id = #{deptId},</if>
-            <if test="status != null ">  status = #{status},</if>
-            <if test="isDelete != null ">  is_delete = #{isDelete},</if>
-            <if test="enterpriseNumber != null  and enterpriseNumber != ''">enterprise_number = #{enterpriseNumber},</if>
-            <if test="remark != null  and remark != ''">remark = #{remark},</if>
-            <if test="isComplaint != null">is_complaint = #{isComplaint},</if>
+            <if test="isDelete != null ">is_delete = #{isDelete},</if>
+            <if test="status != null ">status = #{status},</if>
+            <if test="lawEnforcementCode != null  and lawEnforcementCode != ''">law_enforcement_code = #{lawEnforcementCode},</if>
         </trim>
         where id = #{id}
     </update>
 
-    <update id="deleteEnforcementRegistrationById" parameterType="String">
-        update enforcement_registration set is_delete = 1 where id = #{id}
-    </update>
+    <delete id="deleteEnforcementRegistrationById" parameterType="String">
+        delete from enforcement_registration where id = #{id}
+    </delete>
 
     <delete id="deleteEnforcementRegistrationByIds" parameterType="String">
         delete from enforcement_registration where id in 
@@ -135,5 +200,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-
+    <select id="countMentByTime" resultMap="EnforceRegCountResult"
+            resultType="com.zdxt.code.domain.EnforceRegCount">
+        SELECT law_enforcement, law_enforcement_id, COUNT(law_enforcement_id) AS num
+        FROM enforcement_registration
+        WHERE create_time >= DATE_SUB(CURDATE(), INTERVAL #{timeMonth} MONTH)
+        <if test="searchValue != null and searchValue != ''">AND law_enforcement like concat(concat('%',#{searchValue}),'%')</if>
+        AND law_enforcement_id IS NOT NULL
+        GROUP BY law_enforcement_id
+    </select>
+    
 </mapper>

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml

@@ -4,27 +4,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zdxt.code.mapper.EnterpriseLawEnforcementMapper">
     
-    <resultMap type="EnterpriseLawEnforcement" id="EnterpriseLawEnforcementResult">
+    <resultMap type="com.zdxt.code.domain.EnterpriseLawEnforcement" id="EnterpriseLawEnforcementResult">
         <result property="id"    column="id"    />
         <result property="lawEnforcement"    column="law_enforcement"    />
         <result property="lawEnforcementId"    column="law_enforcement_id"    />
+        <result property="enterpriseId"    column="enterprise_id"    />
         <result property="enterpriseName"    column="enterprise_name"    />
-        <result property="enterpriseNumber"    column="enterprise_number"    />
-        <result property="enforcementTime"    column="enforcement_time"    />
+        <result property="checkTime"    column="check_time"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="lawEnforcer"    column="law_enforcer"    />
         <result property="lawEnforcerId"    column="law_enforcer_id"    />
-        <result property="lawEnforcerTel"    column="law_enforcer_tel"    />
+        <result property="remark"    column="remark"    />
         <result property="userId"    column="user_id"    />
         <result property="deptId"    column="dept_id"    />
+        <result property="isDelete"    column="is_delete"    />
         <result property="status"    column="status"    />
-        <result property="lawEnforcementItem"    column="law_enforcement_item"    />
         <result property="lawEnforcementCode"    column="law_enforcement_code"    />
+        <result property="linkMan"    column="link_man"    />
+        <result property="linkTel"    column="link_tel"    />
+        <result property="checkItem"    column="check_item"    />
+        <result property="checkRequire"    column="check_require"    />
     </resultMap>
 
     <sql id="selectEnterpriseLawEnforcementVo">
-        select id, law_enforcement, law_enforcement_id, enterprise_name, enterprise_number, enforcement_time, create_time, create_by, law_enforcer, law_enforcer_id, law_enforcer_tel,status,law_enforcement_item,law_enforcement_code from enterprise_law_enforcement
+        select id, law_enforcement, law_enforcement_id, enterprise_id, enterprise_name, check_time, create_time, create_by, law_enforcer, law_enforcer_id, remark, user_id, dept_id, is_delete, status, law_enforcement_code, link_man, link_tel, check_item, check_require from enterprise_law_enforcement
     </sql>
 
     <select id="selectEnterpriseLawEnforcementList" parameterType="EnterpriseLawEnforcement" resultMap="EnterpriseLawEnforcementResult">
@@ -32,17 +36,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="lawEnforcement != null  and lawEnforcement != ''"> and law_enforcement = #{lawEnforcement}</if>
             <if test="lawEnforcementId != null  and lawEnforcementId != ''"> and law_enforcement_id = #{lawEnforcementId}</if>
+            <if test="enterpriseId != null  and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
             <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
-            <if test="enterpriseNumber != null  and enterpriseNumber != ''"> and enterprise_number like concat('%', #{enterpriseNumber}, '%')</if>
-            <if test="enforcementTime != null "> and enforcement_time = #{enforcementTime}</if>
+            <if test="checkTime != null "> and check_time = #{checkTime}</if>
             <if test="lawEnforcer != null  and lawEnforcer != ''"> and law_enforcer = #{lawEnforcer}</if>
-            <if test="lawEnforcerId != null "> and law_enforcer_id = #{lawEnforcerId}</if>
-            <if test="lawEnforcerTel != null  and lawEnforcerTel != ''"> and law_enforcer_tel = #{lawEnforcerTel}</if>
-            <if test="status != null"> and status = #{lawEnforcerTel}</if>
-            <if test="lawEnforcementItem != null and lawEnforcementItem != ''"> and law_enforcement_item = #{lawEnforcementItem}</if>
-            <if test="lawEnforcementCode != null and lawEnforcementCode != ''"> and law_enforcement_code = #{lawEnforcementCode}</if>
+            <if test="lawEnforcerId != null  and lawEnforcerId != ''"> and law_enforcer_id = #{lawEnforcerId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="lawEnforcementCode != null  and lawEnforcementCode != ''"> and law_enforcement_code = #{lawEnforcementCode}</if>
+            <if test="linkMan != null  and linkMan != ''"> and link_man = #{linkMan}</if>
+            <if test="linkTel != null  and linkTel != ''"> and link_tel = #{linkTel}</if>
+            <if test="checkItem != null  and checkItem != ''"> and check_item = #{checkItem}</if>
+            <if test="checkRequire != null  and checkRequire != ''"> and check_require = #{checkRequire}</if>
+            <if test="searchValue != null and searchValue != ''">
+                and ( enterprise_name like concat(concat('%',#{searchValue}),'%')
+                or law_enforcement_code like concat(concat('%',#{searchValue}),'%')
+                or link_tel like concat(concat('%',#{searchValue}),'%')
+                )
+            </if>
+            <if test="dateType != null and dateType == 1">
+                and DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
+            </if>
+            <if test="dateType != null and dateType == 2">
+                and create_time >= DATE_SUB(CURDATE(), INTERVAL 3 MONTH)
+            </if>
+            <if test="dateType != null and dateType == 3">
+                and create_time >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
+            </if>
         </where>
-        order by enforcement_time desc
+        order by create_time desc
     </select>
     
     <select id="selectEnterpriseLawEnforcementById" parameterType="String" resultMap="EnterpriseLawEnforcementResult">
@@ -56,37 +80,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null  and id != ''">id,</if>
             <if test="lawEnforcement != null  and lawEnforcement != ''">law_enforcement,</if>
             <if test="lawEnforcementId != null  and lawEnforcementId != ''">law_enforcement_id,</if>
+            <if test="enterpriseId != null  and enterpriseId != ''">enterprise_id,</if>
             <if test="enterpriseName != null  and enterpriseName != ''">enterprise_name,</if>
-            <if test="enterpriseNumber != null  and enterpriseNumber != ''">enterprise_number,</if>
-            <if test="enforcementTime != null ">enforcement_time,</if>
+            <if test="checkTime != null ">check_time,</if>
             <if test="createTime != null ">create_time,</if>
             <if test="createBy != null  and createBy != ''">create_by,</if>
             <if test="lawEnforcer != null  and lawEnforcer != ''">law_enforcer,</if>
-            <if test="lawEnforcerId != null ">law_enforcer_id,</if>
-            <if test="lawEnforcerTel != null  and lawEnforcerTel != ''">law_enforcer_tel,</if>
-            <if test="userId != null  and userId != ''">user_id,</if>
-            <if test="deptId != null  and deptId != ''">dept_id,</if>
-            <if test="status != null">status,</if>
-            <if test="lawEnforcementItem != null and lawEnforcementItem != ''">law_enforcement_item,</if>
-            <if test="lawEnforcementCode != null and lawEnforcementCode != ''">law_enforcement_code,</if>
+            <if test="lawEnforcerId != null  and lawEnforcerId != ''">law_enforcer_id,</if>
+            <if test="remark != null  and remark != ''">remark,</if>
+            <if test="userId != null ">user_id,</if>
+            <if test="deptId != null ">dept_id,</if>
+            <if test="isDelete != null ">is_delete,</if>
+            <if test="status != null ">status,</if>
+            <if test="lawEnforcementCode != null  and lawEnforcementCode != ''">law_enforcement_code,</if>
+            <if test="linkMan != null  and linkMan != ''">link_man,</if>
+            <if test="linkTel != null  and linkTel != ''">link_tel,</if>
+            <if test="checkItem != null  and checkItem != ''">check_item,</if>
+            <if test="checkRequire != null  and checkRequire != ''">check_require,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null  and id != ''">#{id},</if>
             <if test="lawEnforcement != null  and lawEnforcement != ''">#{lawEnforcement},</if>
             <if test="lawEnforcementId != null  and lawEnforcementId != ''">#{lawEnforcementId},</if>
+            <if test="enterpriseId != null  and enterpriseId != ''">#{enterpriseId},</if>
             <if test="enterpriseName != null  and enterpriseName != ''">#{enterpriseName},</if>
-            <if test="enterpriseNumber != null  and enterpriseNumber != ''">#{enterpriseNumber},</if>
-            <if test="enforcementTime != null ">#{enforcementTime},</if>
+            <if test="checkTime != null ">#{checkTime},</if>
             <if test="createTime != null ">#{createTime},</if>
             <if test="createBy != null  and createBy != ''">#{createBy},</if>
             <if test="lawEnforcer != null  and lawEnforcer != ''">#{lawEnforcer},</if>
-            <if test="lawEnforcerId != null ">#{lawEnforcerId},</if>
-            <if test="lawEnforcerTel != null  and lawEnforcerTel != ''">#{lawEnforcerTel},</if>
-            <if test="userId != null  and userId != ''">#{userId},</if>
-            <if test="deptId != null  and deptId != ''">#{deptId},</if>
-            <if test="deptId != null">#{status},</if>
-            <if test="lawEnforcementItem != null and lawEnforcementItem != ''">#{lawEnforcementItem},</if>
-            <if test="lawEnforcementCode != null and lawEnforcementCode != ''">#{lawEnforcementCode},</if>
+            <if test="lawEnforcerId != null  and lawEnforcerId != ''">#{lawEnforcerId},</if>
+            <if test="remark != null  and remark != ''">#{remark},</if>
+            <if test="userId != null ">#{userId},</if>
+            <if test="deptId != null ">#{deptId},</if>
+            <if test="isDelete != null ">#{isDelete},</if>
+            <if test="status != null ">#{status},</if>
+            <if test="lawEnforcementCode != null  and lawEnforcementCode != ''">#{lawEnforcementCode},</if>
+            <if test="linkMan != null  and linkMan != ''">#{linkMan},</if>
+            <if test="linkTel != null  and linkTel != ''">#{linkTel},</if>
+            <if test="checkItem != null  and checkItem != ''">#{checkItem},</if>
+            <if test="checkRequire != null  and checkRequire != ''">#{checkRequire},</if>
          </trim>
     </insert>
 
@@ -95,16 +127,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="lawEnforcement != null  and lawEnforcement != ''">law_enforcement = #{lawEnforcement},</if>
             <if test="lawEnforcementId != null  and lawEnforcementId != ''">law_enforcement_id = #{lawEnforcementId},</if>
+            <if test="enterpriseId != null  and enterpriseId != ''">enterprise_id = #{enterpriseId},</if>
             <if test="enterpriseName != null  and enterpriseName != ''">enterprise_name = #{enterpriseName},</if>
-            <if test="enterpriseNumber != null  and enterpriseNumber != ''">enterprise_number = #{enterpriseNumber},</if>
-            <if test="enforcementTime != null ">enforcement_time = #{enforcementTime},</if>
+            <if test="checkTime != null ">check_time = #{checkTime},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
             <if test="createBy != null  and createBy != ''">create_by = #{createBy},</if>
             <if test="lawEnforcer != null  and lawEnforcer != ''">law_enforcer = #{lawEnforcer},</if>
-            <if test="lawEnforcerId != null ">law_enforcer_id = #{lawEnforcerId},</if>
-            <if test="lawEnforcerTel != null  and lawEnforcerTel != ''">law_enforcer_tel = #{lawEnforcerTel},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="lawEnforcementItem != null and lawEnforcementItem != ''">law_enforcement_item = #{lawEnforcementItem},</if>
+            <if test="lawEnforcerId != null  and lawEnforcerId != ''">law_enforcer_id = #{lawEnforcerId},</if>
+            <if test="remark != null  and remark != ''">remark = #{remark},</if>
+            <if test="userId != null ">user_id = #{userId},</if>
+            <if test="deptId != null ">dept_id = #{deptId},</if>
+            <if test="isDelete != null ">is_delete = #{isDelete},</if>
+            <if test="status != null ">status = #{status},</if>
+            <if test="lawEnforcementCode != null  and lawEnforcementCode != ''">law_enforcement_code = #{lawEnforcementCode},</if>
+            <if test="linkMan != null  and linkMan != ''">link_man = #{linkMan},</if>
+            <if test="linkTel != null  and linkTel != ''">link_tel = #{linkTel},</if>
+            <if test="checkItem != null  and checkItem != ''">check_item = #{checkItem},</if>
+            <if test="checkRequire != null  and checkRequire != ''">check_require = #{checkRequire},</if>
         </trim>
         where id = #{id}
     </update>

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/RuleItemListMapper.xml

@@ -9,12 +9,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="ruleId"    column="rule_id"    />
         <result property="cycleTime"    column="cycle_time"    />
         <result property="existAlarm"    column="exist_alarm"    />
+        <result property="existAlarmEnd"    column="exist_alarm_end"    />
         <result property="alarmType"    column="alarm_type"    />
         <result property="status"    column="status"    />
     </resultMap>
 
     <sql id="selectRuleItemListVo">
-        select id, rule_id, cycle_time, exist_alarm, alarm_type, status from rule_item_list
+        select id, rule_id, cycle_time, exist_alarm, exist_alarm_end, alarm_type, status from rule_item_list
     </sql>
 
     <select id="selectRuleItemListList" parameterType="RuleItemList" resultMap="RuleItemListResult">

lib/EmergencyServiceApi/pom.xml

@@ -13,7 +13,6 @@
         <module>EmergencyAuthServiceApi</module>
         <module>emergencyCommonServiceApi</module>
         <module>emergencyExcelServiceApi</module>
-        <module>emergencyKnowledgeServiceApi</module>
 
 
     </modules>