登记

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

@@ -10,6 +10,8 @@ import com.zdxt.code.domain.*;
 import com.zdxt.code.service.*;
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.controller.BaseController;
+import com.zdxt.common.util.Constants;
+import com.zdxt.common.util.ServletUtils;
 import com.zdxt.common.util.StringUtils;
 import com.zdxt.common.util.TableDataInfo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -23,6 +25,7 @@ import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -182,6 +185,32 @@ public class AppEnforcementRegistrationController extends BaseController
         return getDataTable(list);
     }
 
+
+    /**
+     * 查询执法端-执法登记列表
+     */
+//    @RequiresPermissions("code:registration:list")
+    @GetMapping("/queryListNew")
+    @ResponseBody
+    public TableDataInfo queryListNew(EnforcementRegistration enforcementRegistration)
+    {
+        startPage();
+        if (StringUtils.isEmpty(enforcementRegistration.getSearchValue())
+                && StringUtils.isEmpty(enforcementRegistration.getEnterpriseNumber())) {
+            return getDataTable(new ArrayList<EnforcementRegistration>());
+        }
+        List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationListNew(enforcementRegistration);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/queryByEpId")
+    @ResponseBody
+    public ZDResponse queryByEpId(EnforcementRegistration enforcementRegistration)
+    {
+        List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationByEpId(enforcementRegistration);
+        return ZDResponse.success("获取当前企业本月登记信息",list);
+    }
+
     /**
      * 查询企业端-执法登记列表
      */

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

@@ -229,6 +229,8 @@ public class EnforcementRegistration extends BaseDomain
     private String checkCategory;
     private String checkCategoryText;
 
+    private String num;
+
     /**
      * 行政执法评价
      */
@@ -755,4 +757,12 @@ public class EnforcementRegistration extends BaseDomain
     public void setRegionId(String regionId) {
         this.regionId = regionId;
     }
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
 }

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

@@ -33,6 +33,10 @@ public interface EnforcementRegistrationMapper
      * @return 执法端-执法登记集合
      */
     List<EnforcementRegistration> selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration);
+
+    List<EnforcementRegistration> selectEnforcementRegistrationListNew(EnforcementRegistration enforcementRegistration);
+
+    List<EnforcementRegistration> selectEnforcementRegistrationByEpId(EnforcementRegistration enforcementRegistration);
     List<EnforcementRegistration> selectEnforcementRegistrationList1(EnforcementRegistration enforcementRegistration);
     List<EnforcementRegistration> selectEnforcementRegistrationAndAddressList(EnforcementRegistration enforcementRegistration);
     /*substring(i.enterprise_address,INSTR(i.enterprise_address, '深圳市')+3,INSTR(i.enterprise_address, '区')-3)as qy,substring(i.enterprise_address,INSTR(i.enterprise_address, '区')+1,INSTR(i.enterprise_address, '街道')-INSTR(i.enterprise_address, '区')+1)as jd*/

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

@@ -35,6 +35,10 @@ public interface IEnforcementRegistrationService
      * @return 执法端-执法登记集合
      */
     List<EnforcementRegistration> selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration);
+
+    List<EnforcementRegistration> selectEnforcementRegistrationListNew(EnforcementRegistration enforcementRegistration);
+
+    List<EnforcementRegistration> selectEnforcementRegistrationByEpId(EnforcementRegistration enforcementRegistration);
     List<EnforcementRegistration>  selectEnforcementRegistrationList1(EnforcementRegistration enforcementRegistration);
     List<EnforcementRegistration>  selectUnite(EnforcementRegistration enforcementRegistration);
 

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

@@ -28,12 +28,15 @@ import com.zdxt.code.mapper.LinkageDictMapper;
 import com.zdxt.code.service.*;
 import com.zdxt.common.annotation.DataScope;
 import com.zdxt.common.util.DateUtils;
+import com.zdxt.common.util.StringUtils;
 import com.zdxt.common.zdxtFile.AttFileRespDTO;
 import com.zdxt.common.zdxtFile.FilePreviewUtilBean;
 import com.zdxt.common.zdxtFile.ZdxtFileCommon;
 import com.zdxt.domain.auth.DictData;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ss.usermodel.*;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zdxt.code.mapper.EnforcementRegistrationMapper;
@@ -193,6 +196,24 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
                 enforcementRegistrationMapper.selectEnforcementRegistrationList(enforcementRegistration);
         return enforcementRegistrations;
     }
+
+    @Override
+//    @DataScope
+    public List<EnforcementRegistration> selectEnforcementRegistrationListNew(EnforcementRegistration enforcementRegistration)
+    {
+        List<EnforcementRegistration> enforcementRegistrations =
+                enforcementRegistrationMapper.selectEnforcementRegistrationListNew(enforcementRegistration);
+        return enforcementRegistrations;
+    }
+
+    @Override
+    public List<EnforcementRegistration> selectEnforcementRegistrationByEpId(EnforcementRegistration enforcementRegistration)
+    {
+        List<EnforcementRegistration> enforcementRegistrations =
+                enforcementRegistrationMapper.selectEnforcementRegistrationByEpId(enforcementRegistration);
+        return enforcementRegistrations;
+    }
+
     @Override
     @DataScope
     public List<EnforcementRegistration> selectEnforcementRegistrationList1(EnforcementRegistration enforcementRegistration)

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

@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isEvaluate"    column="is_evaluate"    />
         <result property="lawId"    column="law_id"    />
         <result property="lawText"    column="law_text"    />
+        <result property="num"    column="num"    />
     </resultMap>
 
     <resultMap type="com.zdxt.code.domain.EnforceRegCount" id="EnforceRegCountResult">
@@ -153,6 +154,142 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by enforcement_time desc
     </select>
+
+    <select id="selectEnforcementRegistrationListNew" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
+        select * from (select id, law_enforcement, law_enforcement_id, enforce, 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_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, count( enterprise_number ) AS num
+        from enforcement_registration
+        <where>
+            <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="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="searchValue != null and searchValue != ''">-->
+<!--                and (law_enforcement_item_text  like concat(concat('%',#{searchValue}),'%')-->
+<!--                or law_enforcement like concat(concat('%',#{searchValue}),'%')-->
+<!--                or law_enforcer like concat(concat('%',#{searchValue}),'%')-->
+<!--                or law_enforcer_two like concat(concat('%',#{searchValue}),'%')-->
+<!--                or enterprise_name like concat(concat('%',#{searchValue}),'%')-->
+<!--                )-->
+<!--            </if>-->
+            <if test="searchValue != null  and searchValue != ''">
+                and ( enterprise_name like concat('%',#{searchValue},'%'))</if>
+            <if test="dateSearch != null  and dateSearch != ''">
+                and DATE_FORMAT(enforcement_time, '%Y-%m') = #{dateSearch}
+            </if>
+            <if test="dateType != null and dateType == 1">
+                and DATE_FORMAT(enforcement_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
+            </if>
+            <if test="dateType != null and dateType == 2">
+                AND DATE_FORMAT(enforcement_time, '%Y-%m') &gt;= CONCAT(YEAR(CURDATE()), '-',
+                CASE WHEN QUARTER(CURDATE()) IN (1) THEN '01'
+                WHEN QUARTER(CURDATE()) IN (2) THEN '04'
+                WHEN QUARTER(CURDATE()) IN (3) THEN '07'
+                ELSE '10' END)
+                and DATE_FORMAT(enforcement_time, '%Y-%m') &lt;= CONCAT(YEAR(CURDATE()), '-',
+                CASE
+                WHEN QUARTER(CURDATE()) IN (1) THEN '03'
+                WHEN QUARTER(CURDATE()) IN (2) THEN '06'
+                WHEN QUARTER(CURDATE()) IN (3) THEN '09'
+                ELSE '12'
+                END)
+            </if>
+            <if test="dateType != null and dateType == 3">
+                and DATE_FORMAT(enforcement_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
+            </if>
+            <if test="dateSearch != null and dateSearch != ''">
+                and DATE_FORMAT(enforcement_time, '%Y-%m') = #{dateSearch}
+            </if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                and DATE_FORMAT(enforcement_time,'%Y-%m-%d') &gt;= #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                and DATE_FORMAT(enforcement_time,'%Y-%m-%d') &lt;= #{endTime}
+            </if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and enforcement_time &gt;= #{params.beginTime}
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and enforcement_time &lt;= #{params.endTime}
+            </if>
+            <if test="params.dataScope != null and params.dataScope != ''">
+                <!-- 数据范围过滤 -->
+                ${params.dataScope}
+            </if>
+        </where>
+        GROUP BY enterprise_number order by enforcement_time desc) t
+        <where>
+          <if test="num != null and num != ''">
+            and t.num &gt;= #{num}
+          </if>
+       </where>
+    </select>
+
+    <select id="selectEnforcementRegistrationByEpId" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
+        <include refid="selectEnforcementRegistrationVo"/>
+        <where>
+            <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="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="searchValue != null  and searchValue != ''">
+                and ( enterprise_name like concat('%',#{searchValue},'%'))</if>
+            <if test="dateSearch != null  and dateSearch != ''">
+                and DATE_FORMAT(enforcement_time, '%Y-%m') = #{dateSearch}
+            </if>
+            <if test="dateType != null and dateType == 1">
+                and DATE_FORMAT(enforcement_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
+            </if>
+            <if test="dateType != null and dateType == 2">
+                AND DATE_FORMAT(enforcement_time, '%Y-%m') &gt;= CONCAT(YEAR(CURDATE()), '-',
+                CASE WHEN QUARTER(CURDATE()) IN (1) THEN '01'
+                WHEN QUARTER(CURDATE()) IN (2) THEN '04'
+                WHEN QUARTER(CURDATE()) IN (3) THEN '07'
+                ELSE '10' END)
+                and DATE_FORMAT(enforcement_time, '%Y-%m') &lt;= CONCAT(YEAR(CURDATE()), '-',
+                CASE
+                WHEN QUARTER(CURDATE()) IN (1) THEN '03'
+                WHEN QUARTER(CURDATE()) IN (2) THEN '06'
+                WHEN QUARTER(CURDATE()) IN (3) THEN '09'
+                ELSE '12'
+                END)
+            </if>
+            <if test="dateType != null and dateType == 3">
+                and DATE_FORMAT(enforcement_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
+            </if>
+            <if test="dateSearch != null and dateSearch != ''">
+                and DATE_FORMAT(enforcement_time, '%Y-%m') = #{dateSearch}
+            </if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                and DATE_FORMAT(enforcement_time,'%Y-%m-%d') &gt;= #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                and DATE_FORMAT(enforcement_time,'%Y-%m-%d') &lt;= #{endTime}
+            </if>
+
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and enforcement_time &gt;= #{params.beginTime}
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and enforcement_time &lt;= #{params.endTime}
+            </if>
+        </where>
+        order by enforcement_time desc
+    </select>
+
+
     <select id="selectEnforcementRegistrationList1" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
         <include refid="selectEnforcementRegistrationVo"/>
         <where>