修改任务来源新增执法类别

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

@@ -587,6 +587,17 @@ public class AppEnforcementRegistrationController extends BaseController
                     }
                 }
             }
+            // 执法类别
+            if (StringUtils.isNotEmpty(enforcementRegistration.getLawEnforceCategory())) {
+                dictParams.setDictType("law_enforce_category");
+                List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
+                for (DictDataBean d : dicts) {
+                    if (d.getDictValue().equals(enforcementRegistration.getLawEnforceCategory())) {
+                        enforcementRegistration.setLawEnforceCategoryText(d.getDictLabel());
+                        break;
+                    }
+                }
+            }
         }
         return ZDResponse.success("查询成功",enforcementRegistration);
     }
@@ -668,7 +679,7 @@ public class AppEnforcementRegistrationController extends BaseController
                     }
                 }
             }
-            // 执法类别
+            // 任务来源
             if (StringUtils.isNotEmpty(reg.getCheckCategory())) {
                 dictParams.setDictType("check_category");
                 List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
@@ -679,6 +690,18 @@ public class AppEnforcementRegistrationController extends BaseController
                     }
                 }
             }
+
+            // 执法类别
+            if (StringUtils.isNotEmpty(reg.getLawEnforceCategory())) {
+                dictParams.setDictType("law_enforce_category");
+                List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
+                for (DictDataBean d : dicts) {
+                    if (d.getDictValue().equals(reg.getLawEnforceCategory())) {
+                        reg.setLawEnforceCategoryText(d.getDictLabel());
+                        break;
+                    }
+                }
+            }
             // 评价
 
             //查询行政检查评价

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html

@@ -63,7 +63,7 @@
                                 </li>
                                 <li>
                                     <p>执法类别：</p>
-                                    <select id="checkCategory" name="checkCategory" th:with="type=${@dict.getType('check_category')}">
+                                    <select id="lawEnforceCategory" name="lawEnforceCategory" th:with="type=${@dict.getType('law_enforce_category')}">
                                         <option value="">所有</option>
                                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                     </select>
@@ -102,6 +102,15 @@
                                         <option th:fragment="jd" th:each="j:${jdList}" th:text="${j.dictLabel}" th:value="${j.dictValue}"></option>
                                     </select>
                                 </li>
+                                <li>
+                                <li>
+                                    <p>任务来源：</p>
+                                    <select id="checkCategory" name="checkCategory" th:with="type=${@dict.getType('check_category')}">
+                                        <option value="">所有</option>
+                                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                    </select>
+                                </li>
+                                </li>
                                 <li>
                                     <p>时段：</p>
                                     <select id="year" name="year">
@@ -265,6 +274,7 @@
         var removeFlag = [[${@permission.hasPermi('code:registration:remove')}]];
         var detailFlag = [[${@permission.hasPermi('code:registration:datail')}]];
         var checkCategory=[[${@dict.getType('check_category')}]];
+        var lawEnforceCategory=[[${@dict.getType('law_enforce_category')}]];
         var reson=[[${@dict.getType('no-scan-reason')}]];
         var caseType=[];
         var prefix = ctx + "code/registration";
@@ -411,9 +421,20 @@
                             }
                         }
                     },
+                    {
+                        field : 'lawEnforceCategory',
+                        title : '执法类别',
+                        formatter:function (value,row,index) {
+                            for(i=0;i<lawEnforceCategory.length;i++){
+                                if(lawEnforceCategory[i].dictValue==row.lawEnforceCategory){
+                                    return lawEnforceCategory[i].dictLabel;
+                                }
+                            }
+                        }
+                    },
                     {
                         field : 'checkCategory',
-                        title : '行政执法类别',
+                        title : '任务来源',
                         formatter:function (value,row,index) {
                             for(i=0;i<checkCategory.length;i++){
                                 if(checkCategory[i].dictValue==row.checkCategory){

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

@@ -236,7 +236,7 @@ public class EnforcementRegistration extends BaseDomain
     private String lawFieldText;
 
     /**
-     * 执法类别
+     * 执法类别（现任务来源）
      */
     private String checkCategory;
     private String checkCategoryText;
@@ -247,11 +247,34 @@ public class EnforcementRegistration extends BaseDomain
 
     private String numRight;
 
+    /**
+     * 执法类别 新
+     */
+    private String lawEnforceCategory;
+
+    private String lawEnforceCategoryText;
+
     /**
      * 行政执法评价
      */
     private EnterpriseEvaluate enterpriseEvaluate;
 
+    public String getLawEnforceCategoryText() {
+        return lawEnforceCategoryText;
+    }
+
+    public void setLawEnforceCategoryText(String lawEnforceCategoryText) {
+        this.lawEnforceCategoryText = lawEnforceCategoryText;
+    }
+
+    public String getLawEnforceCategory() {
+        return lawEnforceCategory;
+    }
+
+    public void setLawEnforceCategory(String lawEnforceCategory) {
+        this.lawEnforceCategory = lawEnforceCategory;
+    }
+
     public String getLawFieldText() {
         return lawFieldText;
     }

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

@@ -863,6 +863,8 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
         Map<String,DictData> dictDataMap1=dictDataList1.stream().collect(Collectors.toMap(DictData::getDictValue, Function.identity()));
         List<DictData> dictDataList2=iDictDataService.selectDictDataByType("no-scan-reason");
         Map<String,DictData> dictDataMap2=dictDataList2.stream().collect(Collectors.toMap(DictData::getDictValue, Function.identity()));
+        List<DictData> lawDict=iDictDataService.selectDictDataByType("law_enforce_category");
+        Map<String,DictData> lawMap=lawDict.stream().collect(Collectors.toMap(DictData::getDictValue, Function.identity()));
         HSSFWorkbook workbook = new HSSFWorkbook();
         HSSFSheet sheet = workbook.createSheet("涉企执法情况");
         //设置文件名称
@@ -887,7 +889,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
         styleRow2.setBorderLeft(BorderStyle.THIN);
         styleRow2.setFont(font2);
         //设置表头
-        String[] headerList = {"被执法企业名称","企业所属区域", "企业所属街道", "执法单位", "执法人员","执法事项","执法时间","联合执法","行政执法类别","是否扫码","未扫码原因","是否投诉"};
+        String[] headerList = {"被执法企业名称","企业所属区域", "企业所属街道", "执法单位", "执法人员","执法事项","执法时间","联合执法","行政执法类别","任务来源","是否扫码","未扫码原因","是否投诉"};
         HSSFRow headerRow = sheet.createRow(0);
         for (int i = 0; i < headerList.length; i++) {
             HSSFCell cell = headerRow.createCell(i);
@@ -934,24 +936,28 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
                 cell7.setCellValue("否");
             }
             HSSFCell cell8 = row.createCell(8);
-            if(dictDataMap1.containsKey(e.getCheckCategory())){
+            if(lawMap.containsKey(e.getLawEnforceCategory())){
-                cell8.setCellValue(dictDataMap1.get(e.getCheckCategory()).getDictLabel());
+                cell8.setCellValue(lawMap.get(e.getLawEnforceCategory()).getDictLabel());
             }
             HSSFCell cell9 = row.createCell(9);
+            if(dictDataMap1.containsKey(e.getCheckCategory())){
+                cell9.setCellValue(dictDataMap1.get(e.getCheckCategory()).getDictLabel());
+            }
+            HSSFCell cell10 = row.createCell(10);
             if(e.getCheckCss()!=null&&!"".equals(e.getCheckCss())){
-                cell9.setCellValue("否");
+                cell10.setCellValue("否");
             }else {
-                cell9.setCellValue("是");
+                cell10.setCellValue("是");
             }
-            HSSFCell cell10 = row.createCell(10);
+            HSSFCell cell11 = row.createCell(11);
             if(dictDataMap2.containsKey(e.getCheckCss())){
-                cell10.setCellValue(dictDataMap2.get(e.getCheckCss()).getDictLabel());
+                cell11.setCellValue(dictDataMap2.get(e.getCheckCss()).getDictLabel());
             }
-            HSSFCell cell11 = row.createCell(11);
+            HSSFCell cell13 = row.createCell(12);
             if(e.getIsComplaint()==0){
-                cell11.setCellValue("否");
+                cell13.setCellValue("否");
             }else {
-                cell11.setCellValue("是");
+                cell13.setCellValue("是");
             }
 
         }

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

@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unionNo"    column="union_no"    />
         <result property="hasUnion"    column="has_union"    />
         <result property="hasAuto"    column="has_auto"    />
+        <result property="lawEnforceCategory"    column="law_enforce_category"    />
     </resultMap>
 
     <resultMap type="com.zdxt.code.domain.EnforceRegCount" id="EnforceRegCountResult">
@@ -69,7 +70,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          subsidiaryer_id, subsidiaryer_tel, law_enforcement_item, law_enforcement_item_text,
          law_enforcement_basis, law_enforcement_basis_text, remark, reslut, user_id, dept_id, is_delete, status, law_enforcement_code,
          is_complaint,is_submit, unite_check,check_css, enforce_reason, law_field,check_category,
-         bureau_dept_id,bureau_dept_name,is_evaluate, law_id, law_text, has_union, has_auto, union_no
+         bureau_dept_id,bureau_dept_name,is_evaluate, law_id, law_text, has_union, has_auto, union_no,
+            law_enforce_category
          from enforcement_registration
     </sql>
 
@@ -512,7 +514,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectEnforcementRegistrationAndAddressList" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
         select r.id,r.bureau_dept_name,r.bureau_dept_id,r.law_enforcer,r.law_enforcer_two,r.enterprise_name,r.enterprise_number,i.enterprise_address,r.law_enforcement_item_text,r.unite_check,
-        r.check_category,r.check_css,r.is_complaint,r.create_time,r.law_id, r.enforcement_time from enforcement_registration r
+        r.check_category,r.check_css,r.is_complaint,r.create_time,r.law_id, r.enforcement_time,r.law_enforce_category
+        from enforcement_registration r
         left join (select * from enterprise_information group by enterprise_number order by is_delete asc) i on r.enterprise_number=i.enterprise_number
         <where>
             and r.bureau_dept_name is not null
@@ -569,6 +572,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="month != null and month != '' ">
                 AND DATE_FORMAT(r.enforcement_time, '%m') = #{month}
             </if>
+            <if test="lawEnforceCategory != null and lawEnforceCategory!=''"> and law_enforce_category = #{lawEnforceCategory}</if>
             <!-- 数据范围过滤 -->
             <if test="params.dataScope != null and params.dataScope != ''">
                 <!-- 数据范围过滤 -->
@@ -724,6 +728,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unionNo != null  and unionNo != ''"> union_no,</if>
             <if test="hasUnion != null"> has_union,</if>
             <if test="hasAuto != null"> has_auto,</if>
+            <if test="lawEnforceCategory != null and lawEnforceCategory!=''"> law_enforce_category,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null  and id != ''">#{id},</if>
@@ -771,6 +776,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unionNo != null  and unionNo != ''"> #{unionNo},</if>
             <if test="hasUnion != null"> #{hasUnion},</if>
             <if test="hasAuto != null"> #{hasAuto},</if>
+            <if test="lawEnforceCategory != null and lawEnforceCategory!=''"> #{lawEnforceCategory},</if>
          </trim>
     </insert>
 
@@ -822,6 +828,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="uniteCheck != null  and uniteCheck != ''"> unite_check = #{uniteCheck},</if>
             <if test="hasUnion != null"> has_union = #{hasUnion},</if>
             <if test="hasAuto != null"> has_auto = #{hasAuto},</if>
+            <if test="lawEnforceCategory != null and lawEnforceCategory!=''"> law_enforce_category = #{lawEnforceCategory},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -361,14 +361,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="checkRowSql"/>
         <where>
             <if test="searchValue!=null and searchValue!=''">
-                AND m.title like concat('%',#{searchValue},'%')
+                AND (m.title like concat('%',#{searchValue},'%')
                 or m.bureauDeptName like concat('%',#{searchValue},'%')
                 or m.lawEnforcer like concat('%',#{searchValue},'%')
                 or m.lawEnforcerOther like concat('%',#{searchValue},'%')
                 or m.lawEnforcementType like concat('%',#{searchValue},'%')
                 <if test="checkCategoryCode!=null and checkCategoryCode!=''">
                     or m.lawEnforcementType = #{checkCategoryCode}
-                </if>
+                </if>)
             </if>
             <if test="beginTime!=null and beginTime!=''">
                 and date_format(m.enforcementTime,'%Y-%m-%d') &gt;=#{beginTime}
@@ -388,14 +388,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="checkRowSql"/>
         <where>
             <if test="searchValue!=null and searchValue!=''">
-                AND m.title like concat('%',#{searchValue},'%')
+                AND (m.title like concat('%',#{searchValue},'%')
                 or m.bureauDeptName like concat('%',#{searchValue},'%')
                 or m.lawEnforcer like concat('%',#{searchValue},'%')
                 or m.lawEnforcerOther like concat('%',#{searchValue},'%')
                 or m.lawEnforcementType like concat('%',#{searchValue},'%')
                 <if test="checkCategoryCode!=null and checkCategoryCode!=''">
                     or m.lawEnforcementType = #{checkCategoryCode}
-                </if>
+                </if>)
             </if>
             <if test="beginTime!=null and beginTime!=''">
                 and date_format(m.enforcementTime,'%Y-%m-%d') &gt;= #{beginTime}