From 4e358ea366135453b0b245b7558797a24d13a01f Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Mon, 5 Aug 2024 22:10:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppEnforcementRegistrationController.java        |  2 +-
 .../code/service/impl/StatisticalServiceImpl.java    | 12 ++++++------
 .../mapper/EnforcementRegistrationMapper.xml         |  6 +++---
 .../mapper/EnterpriseLawEnforcementMapper.xml        |  2 +-
 .../src/main/resources/mapper/StatisticalMapper.xml  |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
index 315ec2e4..feccf409 100644
--- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
+++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
@@ -344,7 +344,7 @@ public class AppEnforcementRegistrationController extends BaseController
         String tmpUserShow = "";
         for (UserBean ub : userBeans) {
             String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum();
-            tmpUserShow += ub.getUserName() +" - "+ lawCertificateNum + ",";
+            tmpUserShow += ub.getUserName() +" "+ lawCertificateNum + ",";
         }
         if (tmpUserShow.length() > 0) {
             tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1);
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java
index 280d81a6..b07ab1d1 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java
@@ -39,12 +39,12 @@ public class StatisticalServiceImpl implements StatisticalService
     public Map<String,Object> statisticalData(StatisticalVo statisticalVo) {
         //执法事项统计
         List<StatisticalVo> statisticalVos = statisticalMapper.statisticalLawEnforcementItem(statisticalVo);
-        for (StatisticalVo vo : statisticalVos) {
-            LinkageDict linkageDict = linkageDictMapper.selectLinkageDictById(vo.getLawEnforcementItem());
-            if(null != linkageDict){
-                vo.setLawEnforcementItem(linkageDict.getTitle());
-            }
-        }
+//        for (StatisticalVo vo : statisticalVos) {
+//            LinkageDict linkageDict = linkageDictMapper.selectLinkageDictById(vo.getLawEnforcementItem());
+//            if(null != linkageDict){
+//                vo.setLawEnforcementItem(linkageDict.getTitle());
+//            }
+//        }
 
         //企业类型数据
         List<StatisticalVo> statisticalVos1 = statisticalMapper.statisticalEnterpriseType(statisticalVo);
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
index ccacccde..72bc9ea3 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
@@ -124,15 +124,15 @@ 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(create_time,'%Y-%m') &gt;= #{beginTime}
+                and DATE_FORMAT(enforcement_time,'%Y-%m') &gt;= #{beginTime}
             </if>
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-                and DATE_FORMAT(create_time,'%Y-%m') &lt;= #{endTime}
+                and DATE_FORMAT(enforcement_time,'%Y-%m') &lt;= #{endTime}
             </if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
-        order by create_time desc
+        order by enforcement_time desc
     </select>
     
     <select id="selectEnforcementRegistrationById" parameterType="String" resultMap="EnforcementRegistrationResult">
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml
index ab94453d..5cf3d2c3 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml
@@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and DATE_FORMAT(check_time, '%Y-%m') = #{searchDate}
             </if>
         </where>
-        order by create_time desc
+        order by check_time desc
     </select>
     
     <select id="selectEnterpriseLawEnforcementById" parameterType="String" resultMap="EnterpriseLawEnforcementResult">
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalMapper.xml
index 6af9fb61..da9b6033 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalMapper.xml
@@ -40,7 +40,7 @@
 
     <select id="statisticalLawEnforcementItem" parameterType="StatisticalVo" resultMap="StatisticalVoResult">
         select law_enforcement_item,count(*) as total from enforcement_registration er
-        where DATE_FORMAT(er.enforcement_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
+        where DATE_FORMAT(er.enforcement_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m') and law_enforcement_item is not null
         <if test="params.dataScope != null and params.dataScope != ''">
             <!-- 数据范围过滤 -->
             ${params.dataScope}