提交不需要的代码

lib/EmergencyService/pom.xml

@@ -13,7 +13,7 @@
         <module>zdxtEmergencyBootStart</module>
         <module>zdxtEmergencyAppService</module>
         <module>zdxtEmergencyLogService</module>
-        <module>zdxtEmergencyExcelService</module>
+<!--        <module>zdxtEmergencyExcelService</module>-->
         <module>zdxtEmergencyMessageService</module>
         <module>zdxtLawEnforcementCodeService</module>
         <module>zdxtEmergencyDictService</module>

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/web/page/TableDataInfo.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 /**
  * 表格分页数据对象
- * 
+ *
  * @author ruoyi
  */
 public class TableDataInfo implements Serializable
@@ -33,7 +33,7 @@ public class TableDataInfo implements Serializable
 
     /**
      * 分页
-     * 
+     *
      * @param list 列表数据
      * @param total 总记录数
      */

lib/EmergencyService/zdxtEmergencyBootStart/pom.xml

@@ -52,11 +52,6 @@
             <artifactId>zdxtTableManagementComponent</artifactId>
             <version>1.0</version>
         </dependency>
-        <dependency>
-            <groupId>EmergencyService</groupId>
-            <artifactId>zdxtEmergencyExcelService</artifactId>
-            <version>1.0</version>
-        </dependency>
 
         <dependency>
             <groupId>ZdxtComponent</groupId>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat.css

@@ -39,7 +39,7 @@ body {
 	top: 110px;
 	right: 1%;
 	align-items: center;
-    width: 67%;
+    width: 70%;
 }
 
 .seltime > i {

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/login.html

@@ -87,15 +87,15 @@
 <input class="pwsty" type="password" placeholder="请输入密码" id="login-password" name="password" />
 
 <!--<a href="#" class="fortxt">忘记密码？</a> -->
-<div class="vcbox" th:if="${captchaEnabled==true}">
-    <div class="inptit">验证码</div>
-    <input class="vcsty" type="text" placeholder="请输入验证码" name="validateCode" maxlength="6" autocomplete="off" />
-    <div class="vcode">
-        <a href="javascript:void(0);" title="点击更换验证码">
-            <img th:src="@{captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>
-        </a>
-    </div>
-</div>
+<!--<div class="vcbox" th:if="${captchaEnabled==true}">-->
+<!--    <div class="inptit">验证码</div>-->
+<!--    <input class="vcsty" type="text" placeholder="请输入验证码" name="validateCode" maxlength="6" autocomplete="off" />-->
+<!--    <div class="vcode">-->
+<!--        <a href="javascript:void(0);" title="点击更换验证码">-->
+<!--            <img th:src="@{captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>-->
+<!--        </a>-->
+<!--    </div>-->
+<!--</div>-->
    <div class="logindiv">
        <div>
            <input class="checksty" name="" type="checkbox" value="" checked="checked" /><span class="remtxt">记住密码</span>

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

@@ -14,9 +14,11 @@
         <i class="icsty"></i>
         <span>
             <select id="year" name="year" onchange="selectDate()">
-              <option value="2024">2024</option>
-              <option value="2023">2023</option>
-              <option value="2022">2022</option>
+                <option value="2026">2026</option>
+                <option value="2025">2025</option>
+                <option value="2024">2024</option>
+                <option value="2023">2023</option>
+                <option value="2022">2022</option>
             </select>年度
         </span>
         <span>
@@ -726,7 +728,7 @@
                     tmpList.push({name: list[i].name, value: list[i].total})
                 }
                 document.getElementById("enterprise_Total").innerText=data.data.length;
-                console.log(data)
+                console.log(data);
                 var tabStr = fillTable(tmpList);
                 document.getElementById("echartSortTable").innerHTML = tabStr;
 

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

@@ -41,10 +41,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') and law_enforcement_item is not null
-        <if test="params.dataScope != null and params.dataScope != ''">
-            <!-- 数据范围过滤 -->
-            ${params.dataScope}
-        </if>
+
         GROUP BY law_enforcement_item
     </select>
     <select id="statisticalLawEnforcer" parameterType="StatisticalVo" resultMap="StatisticalVoResult">
@@ -66,10 +63,6 @@
                 enforcement_registration er
             <where>
                 and DATE_FORMAT( er.enforcement_time, '%Y%m' ) = DATE_FORMAT( CURDATE(), '%Y%m' )
-                <if test="params.dataScope != null and params.dataScope != ''">
-                    <!-- 数据范围过滤 -->
-                    ${params.dataScope}
-                </if>
             </where>
             GROUP BY
                 law_enforcer_id_two) t  GROUP BY t.law_enforcer_id  order by t.total desc
@@ -78,8 +71,6 @@
         SELECT er.law_enforcer, er.law_enforcer_id, count(1) AS total
         FROM enforcement_registration er
         WHERE DATE_FORMAT( er.enforcement_time, '%Y%m' ) = DATE_FORMAT( CURDATE(), '%Y%m' )
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
         GROUP BY er.law_enforcer_id  order by total desc
     </select>
     <select id="statisticalEnterpriseType" parameterType="StatisticalVo" resultMap="StatisticalVoResult">
@@ -96,10 +87,6 @@
                 on ei.enterprise_type = sdd.dict_value
             <where>
                 and DATE_FORMAT( er.enforcement_time, '%Y%m' ) = DATE_FORMAT( CURDATE(), '%Y%m' )
-                <if test="params.dataScope != null and params.dataScope != ''">
-                    <!-- 数据范围过滤 -->
-                    ${params.dataScope}
-                </if>
             </where>
 
     </select>
@@ -110,10 +97,6 @@
             from enforcement_registration er
             <where>
                 AND DATE_FORMAT(er.enforcement_time, '%Y%m' ) = DATE_FORMAT( CURDATE(), '%Y%m' )
-                <if test="params.dataScope != null and params.dataScope != ''">
-                    <!-- 数据范围过滤 -->
-                    ${params.dataScope}
-                </if>
             </where>
     </select>
 
@@ -145,8 +128,6 @@
             <if test="checkCategory!= null and checkCategory!= ''">
                 AND er.check_category = #{checkCategory}
             </if>
-            <!-- 数据范围过滤 -->
-            ${params.dataScope}
         </where>
         GROUP BY er.law_enforcement_id ORDER BY total DESC limit 100
     </select>
@@ -174,8 +155,6 @@
             <if test="checkCategory!= null and checkCategory!= ''">
                 AND er.check_category = #{checkCategory}
             </if>
-            <!-- 数据范围过滤 -->
-            ${params.dataScope}
         </where>
         GROUP BY er.law_enforcer_id  ORDER BY total DESC limit 100
     </select>
@@ -205,8 +184,6 @@
         <if test="checkCategory!= null and checkCategory!= ''">
             AND r.check_category = #{checkCategory}
         </if>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
         GROUP BY d.id  ORDER BY total DESC limit 100
     </select>
 
@@ -233,8 +210,6 @@
             <if test="checkCategory!= null and checkCategory!= ''">
                 AND r.check_category = #{checkCategory}
             </if>
-            <!-- 数据范围过滤 -->
-            ${params.dataScope}
         </where>
         GROUP BY i.company_org_type ORDER BY total DESC limit 100
     </select>
@@ -257,8 +232,6 @@
             <if test="checkCategory != null and checkCategory != ''">
                 AND check_category = #{checkCategory}
             </if>
-            <!-- 数据范围过滤 -->
-            ${params.dataScope}
         </where>
         GROUP BY DATE_FORMAT(enforcement_time, '%Y-%m-%d') ORDER BY enforcement_time ASC
     </select>
@@ -280,8 +253,6 @@
             <if test="checkCategory != null and checkCategory != ''">
                 AND check_category = #{checkCategory}
             </if>
-            <!-- 数据范围过滤 -->
-            ${params.dataScope}
         </where>
         GROUP BY enterprise_number ORDER BY total desc
     </select>
@@ -310,8 +281,6 @@
             <if test="checkCategory!= null and checkCategory!= ''">
                 AND er.check_category = #{checkCategory}
             </if>
-            <!-- 数据范围过滤 -->
-            ${params.dataScope}
         </where>
         GROUP BY DATE_FORMAT(enforcement_time, '%Y-%m-%d'), er.enterprise_number ORDER BY total DESC limit 100
     </select>

lib/ZdxtComponent/pom.xml

@@ -14,7 +14,7 @@
         <module>zdxtVisualizationComponent</module>
         <module>zdxtBaiduUeditorComponent</module>
         <module>zdxtTableManagementComponent</module>
-        <module>zdxtExcelComponent</module>
+<!--        <module>zdxtExcelComponent</module>-->
         <module>zdxtDynamicFormComponent</module>
         <module>zdxtAutoCodeComponent</module>
     </modules>