提交查询执法计划部门名称搜索

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

@@ -152,6 +152,40 @@ public class AppEnforcementRegistrationController extends BaseController
         return ZDResponse.success("查询成功",res);
     }
 
+    /** 剔除执法日期距离今天超过5天的执法数据 */
+    @GetMapping("/queryListWithFiveDay")
+    @ResponseBody
+    public TableDataInfo queryListWithFiveDay(EnforcementRegistration enforcementRegistration)
+    {
+
+        startPage();
+        List<EnforcementRegistration> res = new ArrayList<>();
+        List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration);
+        for (EnforcementRegistration ee : list) {
+            // 判断是否投诉
+            EnterpriseComplaint params = new EnterpriseComplaint();
+            params.setRelId(ee.getId());
+            params.setComOrOpi(1);
+            List<EnterpriseComplaint> enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params);
+            if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) {
+                ee.setComOrOpi(1);
+            } else {
+                ee.setComOrOpi(0);
+            }
+            // 判断超时多少天
+            Instant instant = ee.getEnforcementTime().toInstant();
+            ZoneId zoneId = ZoneId.systemDefault();
+            LocalDate startDate = instant.atZone(zoneId).toLocalDate();
+            // 今天距离执法时间所差天数
+            long daysBetween = ChronoUnit.DAYS.between(startDate, LocalDate.now());
+            ee.setOutTimeDayNum(daysBetween);
+            if (daysBetween <= 4) {
+                res.add(ee);
+            }
+        }
+        return getDataTable(res);
+    }
+
     /**
      * 新增执法端-执法登记
      */

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

@@ -57,6 +57,7 @@ public class EnterpriseComplaint extends BaseDomain
      */
     private String evaluateTime;
 
+
     public String getProWoCode() {
         return proWoCode;
     }
@@ -78,9 +79,21 @@ public class EnterpriseComplaint extends BaseDomain
      */
     private List<String> fileList;
 
+    /**
+     * 统一信用代码
+     */
     public String enterpriseNumber;
+    /**
+     * 检查事项
+     */
     public String lawEnforcementIncident;
+    /**
+     * 投诉类型
+     */
     public String enforceTypeText;
+    /**
+     * 企业名称
+     */
     public String enterpriseName;
     private List fileListObj;
 

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

@@ -126,16 +126,16 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
     {
         List<EnforcementRegistration> enforcementRegistrations =
                 enforcementRegistrationMapper.selectEnforcementRegistrationList(enforcementRegistration);
-        for (EnforcementRegistration registration : enforcementRegistrations) {
+//        for (EnforcementRegistration registration : enforcementRegistrations) {
-            LinkageDict linkageDict = linkageDictMapper.selectLinkageDictById(registration.getLawEnforcementItem());
+//            LinkageDict linkageDict = linkageDictMapper.selectLinkageDictById(registration.getLawEnforcementItem());
-            if(BeanUtil.isNotEmpty(linkageDict) && StrUtil.isNotEmpty(linkageDict.getId())){
+//            if(BeanUtil.isNotEmpty(linkageDict) && StrUtil.isNotEmpty(linkageDict.getId())){
-                registration.setLawEnforcementItemText(linkageDict.getTitle());
+//                registration.setLawEnforcementItemText(linkageDict.getTitle());
-            }
+//            }
-            LinkageDict linkageBasic = linkageDictMapper.selectLinkageDictById(registration.getLawEnforcementBasis());
+//            LinkageDict linkageBasic = linkageDictMapper.selectLinkageDictById(registration.getLawEnforcementBasis());
-            if(BeanUtil.isNotEmpty(linkageBasic) && StrUtil.isNotEmpty(linkageBasic.getId())){
+//            if(BeanUtil.isNotEmpty(linkageBasic) && StrUtil.isNotEmpty(linkageBasic.getId())){
-                registration.setLawEnforcementBasisText(linkageBasic.getTitle());
+//                registration.setLawEnforcementBasisText(linkageBasic.getTitle());
-            }
+//            }
-        }
+//        }
 
         return enforcementRegistrations;
     }

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

@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -70,7 +71,19 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
     @Override
     public List<EnterpriseComplaint> selectEnterpriseComplaintList(EnterpriseComplaint enterpriseComplaint)
     {
-        return enterpriseComplaintMapper.selectEnterpriseComplaintList(enterpriseComplaint);
+        List<EnterpriseComplaint> enterpriseComplaints =
+                enterpriseComplaintMapper.selectEnterpriseComplaintList(enterpriseComplaint);
+        for (int i = 0; i < enterpriseComplaints.size(); i++) {
+            if(StringUtils.isNotEmpty(enterpriseComplaints.get(i).getRelId())){
+                EnforcementRegistration enforcementRegistration =
+                        enforcementRegistrationMapper.selectEnforcementRegistrationById(enterpriseComplaints.get(i).getRelId());
+                //判断检查事件是否为空
+                if(BeanUtil.isNotEmpty(enforcementRegistration) && StringUtils.isNotEmpty(enforcementRegistration.getLawEnforcementItemText())){
+                    enterpriseComplaints.get(i).setLawEnforcementIncident(enforcementRegistration.getLawEnforcementItemText());
+                }
+            }
+        }
+        return enterpriseComplaints;
     }
 
     /**
@@ -124,7 +137,7 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
                     for (int z=0; z<enterpriseComplaint.getFileListObj().size(); z++) {
                         HashMap rest = (HashMap) enterpriseComplaint.getFileListObj().get(z);
                         String fl = enterpriseComplaint.getFileList().get(z);
-                        String fileName = fl.substring(fl.lastIndexOf("/")+1, fl.length());
+                        String fileName = fl.substring(fl.lastIndexOf("/")+1);
                         String base64 = rest.get("content").toString();
                         base64 = base64.replace("data:image/jpeg;base64,","");
                         FileData fd = new FileData();

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

@@ -70,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectEnforcementRegistrationVo"/>
         <where>  
             <if test="lawEnforcement != null  and lawEnforcement != ''"> and law_enforcement like concat('%', #{lawEnforcement}, '%')</if>
+            <if test="bureauDeptName != null  and bureauDeptName != ''"> and bureau_dept_name like concat('%', #{bureauDeptName}, '%')</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>
@@ -92,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="isComplaint != null "> and is_complaint = #{isComplaint}</if>
             <if test="status != null "> and status = #{status}</if>
             <if test="lawEnforcementCode != null  and lawEnforcementCode != ''"> and law_enforcement_code = #{lawEnforcementCode}</if>
             <if test="searchValue != null and searchValue != ''">
@@ -126,10 +128,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and DATE_FORMAT(enforcement_time, '%Y-%m') = #{dateSearch}
             </if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-                and DATE_FORMAT(enforcement_time,'%Y-%m') &gt;= #{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') &lt;= #{endTime}
+                and DATE_FORMAT(enforcement_time,'%Y-%m-%d') &lt;= #{endTime}
             </if>
 
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->