提交预警和执法部门查询

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java

@@ -97,6 +97,17 @@ public class AppEnterpriseComplaintController extends BaseController {
                 ZDResponse.success("修改成功") : ZDResponse.error("修改失败");
     }
 
+    /**
+     * 查询在线投诉详情
+     */
+    @GetMapping( "/queryById")
+    @ResponseBody
+    public ZDResponse queryById(String id)
+    {
+        EnterpriseComplaint enterpriseComplaint = enterpriseComplaintService.selectEnterpriseComplaintById(id);
+        return ZDResponse.success("投诉详情查询",enterpriseComplaint);
+    }
+
     /**
      * 删除企业执法-在线投诉
      */

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java

@@ -61,7 +61,7 @@ public class CorsFilter implements Filter {
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
         //配置可信域名
         String[]  authhosts = {"http://10.132.108.3:85","http://jdm.szssfj.cn","http://localhost:85","http://192.168.31.196:3301","http://192.168.31.196:85","http://127.0.0.1:85",
-                "http://localhost:3301","http://192.168.110.35:3301"};
+                "http://localhost:3301","http://192.168.110.35:3301","http://localhost:86"};
         String authost = "";
         HttpServletRequest httprequest = (HttpServletRequest) request;
         String origin = httprequest.getHeader("Origin");

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

@@ -104,4 +104,16 @@ public class EnterpriseComplaintController extends BaseController
         return enterpriseComplaintService.deleteEnterpriseComplaintByIds(ids) > 0
                 ? ZDResponse.success("删除成功") : ZDResponse.error("删除失败");
     }
+
+
+    /**
+     * 查询在线投诉详情
+     */
+    @GetMapping( "/queryById")
+    @ResponseBody
+    public ZDResponse queryById(String id)
+    {
+        EnterpriseComplaint enterpriseComplaint = enterpriseComplaintService.selectEnterpriseComplaintById(id);
+        return ZDResponse.success("投诉详情查询",enterpriseComplaint);
+    }
 }

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

@@ -30,6 +30,11 @@ public class EnforceRegCount
     /** 级别 */
     private String level;
 
+    /**
+     * 预警类型 0本部门 1 本企业
+     */
+    private Integer warnType;
+
     public String getLawEnforcement() {
         return lawEnforcement;
     }
@@ -69,4 +74,12 @@ public class EnforceRegCount
     public void setEnterpriseNumber(String enterpriseNumber) {
         this.enterpriseNumber = enterpriseNumber;
     }
+
+    public Integer getWarnType() {
+        return warnType;
+    }
+
+    public void setWarnType(Integer warnType) {
+        this.warnType = warnType;
+    }
 }

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

@@ -0,0 +1,93 @@
+package com.zdxt.code.domain;
+
+import com.zdxt.common.BaseDomain;
+
+/**
+ * 执法评价
+ */
+public class EnforcementEvaluate extends BaseDomain {
+
+    /**
+     * 系统主键ID
+     */
+    private String id;
+    /**
+     * 案件名称
+     */
+    private String enforcementName;
+    /**
+     * 案件ID
+     */
+    private String enforcementId;
+
+    /**
+     * 评价｜意见建议
+     */
+    private String evaluateDescription;
+
+    /** 联系人 */
+    private String linkman;
+
+    /** 联系方式 */
+    private String linkmanTel;
+
+    /** 是否授权 */
+    private int authorization;
+
+
+    public String getEnforcementName() {
+        return enforcementName;
+    }
+
+    public void setEnforcementName(String enforcementName) {
+        this.enforcementName = enforcementName;
+    }
+
+    public String getEnforcementId() {
+        return enforcementId;
+    }
+
+    public void setEnforcementId(String enforcementId) {
+        this.enforcementId = enforcementId;
+    }
+
+    public String getEvaluateDescription() {
+        return evaluateDescription;
+    }
+
+    public void setEvaluateDescription(String evaluateDescription) {
+        this.evaluateDescription = evaluateDescription;
+    }
+
+    public String getLinkman() {
+        return linkman;
+    }
+
+    public void setLinkman(String linkman) {
+        this.linkman = linkman;
+    }
+
+    public String getLinkmanTel() {
+        return linkmanTel;
+    }
+
+    public void setLinkmanTel(String linkmanTel) {
+        this.linkmanTel = linkmanTel;
+    }
+
+    public int getAuthorization() {
+        return authorization;
+    }
+
+    public void setAuthorization(int authorization) {
+        this.authorization = authorization;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}

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

@@ -56,6 +56,15 @@ public class EnforcementInspectionProgram extends BaseDomain
      */
     private  FileObject fileObject;
 
+    /**
+     * 局级部门ID
+     */
+    private String bureauDeptId;
+    /**
+     * 局级部门名称
+     */
+    private String bureauDeptName;
+
     /**
      * 关键字搜索
      */
@@ -228,6 +237,22 @@ public class EnforcementInspectionProgram extends BaseDomain
         this.fileListObj = fileListObj;
     }
 
+    public String getBureauDeptId() {
+        return bureauDeptId;
+    }
+
+    public void setBureauDeptId(String bureauDeptId) {
+        this.bureauDeptId = bureauDeptId;
+    }
+
+    public String getBureauDeptName() {
+        return bureauDeptName;
+    }
+
+    public void setBureauDeptName(String bureauDeptName) {
+        this.bureauDeptName = bureauDeptName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -37,6 +37,11 @@ public class LawEnforcementWarningList extends BaseDomain
     /** 执法次数 */
     private Integer enforcementNumber;
 
+    /**
+     * 预警类型 0本部门 1 本企业
+     */
+    private Integer warnType;
+
     /**
      * 搜索日期
      */
@@ -117,6 +122,15 @@ public class LawEnforcementWarningList extends BaseDomain
         this.searchDate = searchDate;
     }
 
+
+    public Integer getWarnType() {
+        return warnType;
+    }
+
+    public void setWarnType(Integer warnType) {
+        this.warnType = warnType;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -68,4 +68,17 @@ public interface EnforcementRegistrationMapper
      */
     public List<EnforceRegCount> countMentByTime(@Param("timeMonth") Long timeMonth, @Param("searchValue") String searchValue);
     public List<EnforceRegCount> countMentByTime2(@Param("timeMonth") Long timeMonth, @Param("searchValue") String searchValue);
+
+    /**
+     * 执法预警-统计执法部门执法数量
+     * @param timeMonth
+     * @return
+     */
+    public List<EnforceRegCount> countMentByTimeLawNew(@Param("timeMonth") Long timeMonth);
+    /**
+     * 执法预警-统计企业执法数量
+     * @param timeMonth
+     * @return
+     */
+    public List<EnforceRegCount> countMentByTimeQyNew(@Param("timeMonth") Long timeMonth);
 }

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

@@ -15,6 +15,7 @@ import com.zdxt.code.domain.*;
 import com.zdxt.code.mapper.LinkageDictMapper;
 import com.zdxt.code.service.ILawEnforcementWarningListService;
 import com.zdxt.code.service.IRuleItemListService;
+import com.zdxt.code.service.IRuleListService;
 import com.zdxt.common.annotation.DataScope;
 import com.zdxt.common.config.RuoYiConfig;
 import com.zdxt.common.util.DateUtils;
@@ -44,6 +45,9 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
     @Autowired
     private IRuleItemListService iRuleItemListService;
 
+    @Autowired
+    private IRuleListService ruleListService;
+
     @Autowired
     private ZdxtFileCommonApi zdxtFileCommonApi;
 
@@ -233,64 +237,79 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
 
     @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.countMentByTime2(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
-                        )
-                ));
-
-        Date nowDate = DateUtils.getNowDate();
-        List<LawEnforcementWarningList> lawEnforcementWarningLists = new ArrayList<>();
+        //存储查询结果
         List<EnforceRegCount> results = new ArrayList<>();
-        Iterator<Map.Entry<String, EnforceRegCount>> iterator = maxItems.entrySet().iterator();
-        while (iterator.hasNext()) {
-            EnforceRegCount reg = iterator.next().getValue();
-            // 判断预警级别
+        //查询规则
+        RuleList ruleList = new RuleList();
+        ruleList.setStatus(0);
+        List<RuleList> ruleLists = ruleListService.selectRuleListList(ruleList);
+        for (RuleList list : ruleLists) {
+            // 先获取规则
+            RuleItemList ruleItem = new RuleItemList();
+            ruleItem.setStatus(0L);
+            ruleItem.setRuleId(list.getId());
+            List<RuleItemList> ruleItemLists = iRuleItemListService.selectRuleItemListList(ruleItem);
+            // 根据规则作为条件查询符合要求的数据
+            List<EnforceRegCount> regList = new ArrayList<>();
             for (RuleItemList rule : ruleItemLists) {
-                if (reg.getNum() >= rule.getExistAlarm() && reg.getNum() <= rule.getExistAlarmEnd()) {
-                    reg.setLevel(rule.getAlarmType());
-                    LawEnforcementWarningList lawEnforcementWarningList = new LawEnforcementWarningList();
-                    lawEnforcementWarningList.setId(IdUtil.simpleUUID());
-                    //获取执法次数
-                    lawEnforcementWarningList.setEnforcementNumber(reg.getNum());
-                    //企业名称
-                    lawEnforcementWarningList.setEnterpriseName(reg.getLawEnforcement());
-                    //企业统一信用代码
-                    lawEnforcementWarningList.setEnterpriseNumber(reg.getEnterpriseNumber());
-                    //预警原因
-                    lawEnforcementWarningList.setWarningCause(""+ reg.getNum() +"");
-                    //预警时间
-                    lawEnforcementWarningList.setWarningTime(nowDate);
-                    //创建时间
-                    lawEnforcementWarningList.setCreateTime(nowDate);
-                    //存储告警信息
-                    lawEnforcementWarningLists.add(lawEnforcementWarningList);
+                List<EnforceRegCount> tmpList = new ArrayList<>();
+                if(list.getRuleCode().equals("zf_warn")){
+                    tmpList = enforcementRegistrationMapper.countMentByTimeLawNew(rule.getCycleTime());
+                }else if (list.getRuleCode().equals("qy_warn")){
+                    tmpList = enforcementRegistrationMapper.countMentByTimeQyNew(rule.getCycleTime());
+                }else {
+                    tmpList = enforcementRegistrationMapper.countMentByTime2(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)));
+            Date nowDate = DateUtils.getNowDate();
+            List<LawEnforcementWarningList> lawEnforcementWarningLists = new ArrayList<>();
 
-                    break;
+            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()) {
+                    if (reg.getNum() >= rule.getExistAlarm()) {
+                        reg.setLevel(rule.getAlarmType());
+                        LawEnforcementWarningList lawEnforcementWarningList = new LawEnforcementWarningList();
+                        lawEnforcementWarningList.setId(IdUtil.simpleUUID());
+                        //获取执法次数
+                        lawEnforcementWarningList.setEnforcementNumber(reg.getNum());
+                        //企业名称
+                        lawEnforcementWarningList.setEnterpriseName(reg.getLawEnforcement());
+                        //企业统一信用代码
+                        lawEnforcementWarningList.setEnterpriseNumber(reg.getEnterpriseNumber());
+                        //预警原因
+                        lawEnforcementWarningList.setWarningCause(""+ reg.getNum() +"");
+                        //预警时间
+                        lawEnforcementWarningList.setWarningTime(nowDate);
+                        //创建时间
+                        lawEnforcementWarningList.setCreateTime(nowDate);
+                        if(list.getRuleCode().equals("zf_warn")){
+                            lawEnforcementWarningList.setWarnType(0);
+                        }else if (list.getRuleCode().equals("qy_warn")){
+                            lawEnforcementWarningList.setWarnType(1);
+                        }
+                        //存储告警信息
+                        lawEnforcementWarningLists.add(lawEnforcementWarningList);
+
+                        break;
+                    }
                 }
+                results.add(reg);
             }
-            results.add(reg);
         }
-        //添加预警信息
-//        for (LawEnforcementWarningList lawEnforcementWarningList : lawEnforcementWarningLists) {
-//            lawEnforcementWarningListService.insertLawEnforcementWarningList(lawEnforcementWarningList);
-//        }
-
         return results;
     }
 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java

@@ -2,6 +2,7 @@ package com.zdxt.code.task;
 
 
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import com.zdxt.auth.dto.UserBean;
 import com.zdxt.auth.feign.UserApi;
 import com.zdxt.code.domain.EnforceRegCount;
@@ -42,16 +43,19 @@ public class EarlyWarningTask {
         try{
             List<EnforceRegCount> list = iEnforcementRegistrationService.queryEarlyWarning(null);
             for (EnforceRegCount warn : list) {
+                if(StrUtil.isEmpty(warn.getLevel())){
+                    continue;
+                }
                 LawEnforcementWarningList params = new LawEnforcementWarningList();
                 params.setEnterpriseNumber(warn.getEnterpriseNumber());
                 params.setWarningLevel(Integer.parseInt(warn.getLevel()));
+                params.setWarnType(warn.getWarnType());
                 List<LawEnforcementWarningList> res = lawEnforcementWarningListService.selectLawEnforcementWarningListList(params);
                 if (null == res || res.size() < 1) {
                     LawEnforcementWarningList warning = new LawEnforcementWarningList();
                     warning.setWarningTime(DateUtils.getNowDate());
                     warning.setWarningCause("本月对该企业已检查" + warn.getNum() + "次");
                     warning.setWarningLevel(Integer.parseInt(warn.getLevel()));
-//                    warning.setEnterpriseName(warn.get());
                     EnterpriseInformation enterpriseInformation = new EnterpriseInformation();
                     enterpriseInformation.setEnterpriseNumber(warn.getEnterpriseNumber());
                     List<EnterpriseInformation> enterpriseInformations =
@@ -64,6 +68,8 @@ public class EarlyWarningTask {
 
                     warning.setId(IdUtil.simpleUUID());
                     warning.setCreateTime(DateUtils.getNowDate());
+                    //预警类型
+                    warning.setWarnType(warn.getWarnType());
                     lawEnforcementWarningListService.insertLawEnforcementWarningList(warning);
                 }
             }

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

@@ -18,10 +18,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptId"    column="dept_id"    />
         <result property="isDelete"    column="is_delete"    />
         <result property="isPublish"    column="is_publish"    />
+        <result property="bureauDeptId"    column="bureau_dept_id"    />
+        <result property="bureauDeptName"    column="bureau_dept_name"    />
     </resultMap>
 
     <sql id="selectEnforcementInspectionProgramVo">
-        select id, plan_year, plan_name, enforcement_department, enforcement_department_id, enforcement_time, enforcement_area, create_time, create_by, user_id, dept_id, is_delete,is_publish from enforcement_inspection_program
+        select id, plan_year, plan_name, enforcement_department,
+         enforcement_department_id, enforcement_time, enforcement_area,
+         create_time, create_by, user_id, dept_id, is_delete,is_publish,
+         bureau_dept_id,bureau_dept_name from enforcement_inspection_program
     </sql>
 
     <select id="selectEnforcementInspectionProgramList" parameterType="EnforcementInspectionProgram" resultMap="EnforcementInspectionProgramResult">
@@ -94,6 +99,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null  and deptId != ''">dept_id,</if>
             <if test="isDelete != null ">is_delete,</if>
             <if test="isPublish != null ">is_publish,</if>
+            <if test="bureauDeptName != null and bureauDeptName != ''"> bureau_dept_name,</if>
+            <if test="bureauDeptId != null and bureauDeptId != ''"> bureau_dept_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null  and id != ''">#{id},</if>
@@ -109,6 +116,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null  and deptId != ''">#{deptId},</if>
             <if test="isDelete != null ">#{isDelete},</if>
             <if test="isPublish != null ">#{isPublish},</if>
+            <if test="bureauDeptName != null and bureauDeptName != ''"> #{bureauDeptName},</if>
+            <if test="bureauDeptId != null and bureauDeptId != ''"> #{bureauDeptId},</if>
          </trim>
     </insert>
 
@@ -127,6 +136,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null  and deptId != ''">dept_id = #{deptId},</if>
             <if test="isDelete != null ">is_delete = #{isDelete},</if>
             <if test="isPublish != null ">is_publish = #{isPublish},</if>
+            <if test="bureauDeptName != null and bureauDeptName != ''"> bureau_dept_name = #{bureauDeptName},</if>
+            <if test="bureauDeptId != null and bureauDeptId != ''"> bureau_dept_id = #{bureauDeptId},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -294,5 +294,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND t1.law_enforcement_id IS NOT NULL
         GROUP BY t1.enterprise_number
     </select>
+    <select id="countMentByTimeLawNew" resultMap="EnforceRegCountResult"
+            resultType="com.zdxt.code.domain.EnforceRegCount">
+        SELECT
+            t1.law_enforcement_id,
+            t1.enterprise_name AS law_enforcement,
+            t1.enterprise_number,
+            SUM(T1.total) as num
+        FROM
+            ( SELECT enterprise_name, enterprise_number, law_enforcement_id, unite_check, create_time ,
+            count( enterprise_number ) AS total  FROM enforcement_registration
+            WHERE create_time >= DATE_SUB( CURDATE(), INTERVAL #{timeMonth} MONTH ) AND law_enforcement_id IS NOT NULL  GROUP BY unite_check ,law_enforcement_id  ) AS t1
+            GROUP BY t1.law_enforcement_id
+    </select>
+    <select id="countMentByTimeQyNew" resultMap="EnforceRegCountResult"
+            resultType="com.zdxt.code.domain.EnforceRegCount">
+        SELECT
+            t1.law_enforcement_id,
+            t1.enterprise_name AS law_enforcement,
+            t1.enterprise_number,
+            SUM(T1.total) as num
+        FROM
+            ( SELECT enterprise_name, enterprise_number, law_enforcement_id, unite_check, create_time ,
+            count( enterprise_number ) AS total  FROM enforcement_registration
+            WHERE create_time >= DATE_SUB( CURDATE(), INTERVAL #{timeMonth} MONTH ) AND law_enforcement_id IS NOT NULL
+              GROUP BY unite_check ,law_enforcement_id ) AS t1
+            GROUP BY t1.enterprise_number
+    </select>
     
 </mapper>

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

@@ -13,10 +13,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="enterpriseName"    column="enterprise_name"    />
         <result property="enterpriseNumber"    column="enterprise_number"    />
         <result property="enforcementNumber"    column="enforcement_number"    />
+        <result property="warnType"    column="warn_type"    />
     </resultMap>
 
     <sql id="selectLawEnforcementWarningListVo">
-        select id, warning_time, warning_cause, warning_level, create_time, enterprise_name, enterprise_number,enforcement_number from law_enforcement_warning_list
+        select id, warning_time, warning_cause, warning_level,
+        create_time, enterprise_name, enterprise_number,enforcement_number,warn_type from law_enforcement_warning_list
     </sql>
 
     <select id="selectLawEnforcementWarningListList" parameterType="LawEnforcementWarningList" resultMap="LawEnforcementWarningListResult">
@@ -58,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseName != null  and enterpriseName != ''">enterprise_name,</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''">enterprise_number,</if>
             <if test="enforcementNumber != null  and enforcementNumber != ''">enforcement_number,</if>
+            <if test="warnType != null  and warnType != ''">warn_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null  and id != ''">#{id},</if>
@@ -68,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseName != null  and enterpriseName != ''">#{enterpriseName},</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''">#{enterpriseNumber},</if>
             <if test="enforcementNumber != null  and enforcementNumber != ''">#{enforcementNumber},</if>
+            <if test="warnType != null  and warnType != ''">#{warnType},</if>
          </trim>
     </insert>