fix: 报错处理

zjrs-service-backend/pom.xml

@@ -143,6 +143,13 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/src/main/resources/lib/leaf6-uni-log-mybatis-2.0.0-SinoBest.21.jar</systemPath>
         </dependency>
+        <dependency>
+            <groupId>com.leaf6</groupId>
+            <artifactId>leaf6-uni-cloud-uc-api</artifactId>
+            <version>1.0.0-SinoBest-Beta.18.6</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/resources/lib/leaf6-uni-cloud-uc-api-1.0.0-SinoBest-Beta.18.6.jar</systemPath>
+        </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
@@ -158,6 +165,7 @@
             <systemPath>${project.basedir}/src/main/resources/lib/bcp-httpcs-1.4.jar</systemPath>
         </dependency>
 
+
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
@@ -416,11 +424,7 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-
+            <!-- 1. Transformer 插件通常先处理 javax -> jakarta 的转换 -->
             <plugin>
                 <groupId>org.eclipse.transformer</groupId>
                 <artifactId>transformer-maven-plugin</artifactId>
@@ -440,8 +444,27 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <!-- 2. Spring Boot 插件负责最后打成可执行 Fat JAR -->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <!-- 注意：如果你的 pom 有 parent，这里不需要写 version -->
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                    <!-- 显式指定启动类，防止打包时扫描不到 -->
+                    <mainClass>com.zjrs.ZjrsServiceBackendApplication</mainClass>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
-        <!-- 将XML打包编译 -->
+
         <resources>
             <resource>
                 <directory>src/main/java</directory>
@@ -452,6 +475,9 @@
             </resource>
             <resource>
                 <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
             </resource>
         </resources>
     </build>

zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/bpo/impl/UserBPOImpl.java

@@ -521,7 +521,9 @@ public class UserBPOImpl extends BPOImpl implements UserBPO {
             codeCacheDTO.setStarttime(System.currentTimeMillis());
             Cache cache = leafCacheManager.getCache(IMGCACHENAME);
 
-            cache.put(getCodeCacheKey(reqid), codeCacheDTO);
+            if (cache != null) {
+                cache.put(getCodeCacheKey(reqid), codeCacheDTO);
+            }
             return ajaxResponse;
         } catch (IOException e) {
             LOG.info("验证码生成失败");

zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/po/VRsSxConfig.java

@@ -103,8 +103,8 @@ public class VRsSxConfig {
     @TableField("SFJBSX")
     private String sfjbsx;//是否即办即结
     
-//    @TableField("FWDX")
-//    private String fwdx;//服务对象
+    @TableField("FWDX")
+    private String fwdx;//服务对象
 
 	@TableField("BZ")
 	private String bz;//备注
@@ -387,13 +387,13 @@ public class VRsSxConfig {
 		this.sfjbsx = sfjbsx;
 	}
 
-//	public String getFwdx() {
-//		return fwdx;
-//	}
-//
-//	public void setFwdx(String fwdx) {
-//		this.fwdx = fwdx;
-//	}
+	public String getFwdx() {
+		return fwdx;
+	}
+
+	public void setFwdx(String fwdx) {
+		this.fwdx = fwdx;
+	}
 
 	public String getGlsx() {
 		return glsx;

zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/po/VRsWbRmfw.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 热门服务
@@ -16,7 +18,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
  */
 @TableName("V_RS_WB_RMFW")
 @Schema(name = "VRsWbRmfw对象", description = "热门服务")
-public class VRsWbRmfw {
+public class VRsWbRmfw implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @Schema(description = "热门服务流水号")
     @TableId(value = "RS_WB_RMFW_LSH", type = IdType.ASSIGN_UUID)

zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/po/VRsWbRmsx.java

@@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
+import java.io.Serializable;
+
 @TableName("V_RS_WB_RMSX")
-public class VRsWbRmsx {
+public class VRsWbRmsx implements Serializable {
+    private static final long serialVersionUID = 1L;
 	
 	@TableId(value = "SXBM", type = IdType.INPUT)
     private String sxbm;//事项编码

zjrs-service-backend/src/main/java/com/zjrs/ggfw/sggfw/controller/ExportPdfQueryController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 @Tag(name = "省公共服务接口:打印报表生成接口")
 @RestController
-@RequestMapping("/api/sggfw/exportPdfQuery")
+@RequestMapping("/api/ggfw/sggfw/exportPdfQuery")
 public class ExportPdfQueryController {
     private static final Logger LOG = LoggerFactory.getLogger(ExportPdfQueryController.class);
     @Resource

zjrs-service-backend/src/main/java/com/zjrs/ggfw/sggfw/controller/QueryBusinessController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Tag(name = "省公共服务接口:查询业务信息")
 @RestController
-@RequestMapping("/api/sggfw/queryBusiness")
+@RequestMapping("/api/ggfw/sggfw/queryBusiness")
 public class QueryBusinessController {
     private static final Logger LOG = LoggerFactory.getLogger(QueryBusinessController.class);
     @Resource

zjrs-service-backend/src/main/java/com/zjrs/ggfw/sggfw/controller/ZgrzController.java

@@ -19,7 +19,7 @@ import java.net.SocketTimeoutException;
 
 @Tag(name = "省公共服务接口:资格认证")
 @RestController
-@RequestMapping("/api/sggfw/zgrz")
+@RequestMapping("/api/ggfw/sggfw/zgrz")
 public class ZgrzController {
     private static final Logger LOG = LoggerFactory.getLogger(ZgrzController.class);
     @Resource

zjrs-service-backend/src/main/java/com/zjrs/zwnw/portal/blo/impl/CommonBLOimpl.java

@@ -107,8 +107,12 @@ public class CommonBLOimpl extends BLOImpl implements CommonBLO {
         VRsSyOrgAreaPO orgareapo = vRsSyOrgAreaMapper.selectOne(new QueryWrapper<VRsSyOrgAreaPO>()
                 .select("org_id", "area_id")
                 .eq("user_id", userid));
-        String orgid = orgareapo.getOrgid();
-        String areaid = orgareapo.getAreaid();
+        String orgid = "";
+        String areaid = "";
+        if (orgareapo != null) {
+            orgid = orgareapo.getOrgid();
+            areaid = orgareapo.getAreaid();
+        }
         int totalcnt = 0;
         // 日程个数--个人日程
         if (StringUtils.isNotBlank(userid)) {

zjrs-service-backend/src/main/java/com/zjrs/zwnw/portal/blo/impl/RcglBLOimpl.java

@@ -48,8 +48,12 @@ public class RcglBLOimpl extends BLOImpl implements RcglBLO {
         VRsSyOrgAreaPO orgareapo = vRsSyOrgAreaMapper.selectOne(new QueryWrapper<VRsSyOrgAreaPO>()
                 .select("org_id", "area_id")
                 .eq("user_id", userid));
-        String orgid = orgareapo.getOrgid();
-        String areaid = orgareapo.getAreaid();
+        String orgid = "";
+        String areaid = "";
+        if (orgareapo != null) {
+            orgid = orgareapo.getOrgid();
+            areaid = orgareapo.getAreaid();
+        }
         List<Object> result = new ArrayList<Object>();
         if (dto.getFlag().equals("month")) {
             // 个人日程

zjrs-service-backend/src/main/java/com/zjrs/zwnw/sxgl/entity/SxtjMapper.xml

@@ -32,102 +32,153 @@
     </select>
 
     <select id="queryYwltjList" parameterType="com.zjrs.zwnw.sxgl.dto.YwltjQueryDTO" resultType="com.zjrs.zwnw.sxgl.dto.YwltjResultDTO">
-        SELECT * FROM (SELECT '柜台经办' "sqqdname", '1' "sqqd",
-        (select sxmc from rs_sx_config a where a.sxbm = q.sbsx) "sxmc",sbsx "sbsx",
-        count(1) "ywl",to_char(sum(fcbmy)) "fcbmy",to_char(sum(bmy)) "bmy",to_char(sum(jbmy)) "jbmy",
-        to_char(sum(my)) "my",to_char(sum(fcmy)) "fcmy",
-        decode(instr(to_char(ROUND(((sum(fcbmy)+sum(bmy))/count(1))*100,1),'fm9999990.0'),'.'),'0',
-        to_char(ROUND(((sum(fcbmy)+sum(bmy))/count(1))*100,1),'fm9999990.0'),
-        to_char(ROUND(((sum(fcbmy)+sum(bmy))/count(1))*100,1),'fm9999990.0'))||'%' "cpl",
-        decode(instr(to_char(ROUND(((sum(jbmy)+sum(my)+sum(fcmy))/count(1))*100,1),'fm9999990.0'),'.'),'0',
-        to_char(ROUND(((sum(jbmy)+sum(my)+sum(fcmy))/count(1))*100,1),'fm9999990.0'),
-        to_char(ROUND(((sum(jbmy)+sum(my)+sum(fcmy))/count(1))*100,1),'fm9999990.0'))||'%' "hpl"
-        FROM (select
+        SELECT * FROM (
+        /* 1. 柜台经办 */
+        SELECT
+        '柜台经办' "sqqdname",
+        '1' "sqqd",
+        (SELECT sxmc FROM rs_sx_config a WHERE a.sxbm = q.sbsx) "sxmc",
+        sbsx "sbsx",
+        COUNT(1) "ywl",
+        TO_CHAR(SUM(fcbmy)) "fcbmy",
+        TO_CHAR(SUM(bmy)) "bmy",
+        TO_CHAR(SUM(jbmy)) "jbmy",
+        TO_CHAR(SUM(my)) "my",
+        TO_CHAR(SUM(fcmy)) "fcmy",
+        /* 简化百分比计算逻辑，fm9999990.0 会自动处理小数点和前导0 */
+        TO_CHAR(ROUND(((SUM(fcbmy) + SUM(bmy)) / DECODE(COUNT(1), 0, 1, COUNT(1))) * 100, 1), 'fm9999990.0') || '%' "cpl",
+        TO_CHAR(ROUND(((SUM(jbmy) + SUM(my) + SUM(fcmy)) / DECODE(COUNT(1), 0, 1, COUNT(1))) * 100, 1), 'fm9999990.0') || '%' "hpl"
+        FROM (
+        SELECT
         sbsx,
-        (SELECT count(1) FROM RS_JK_HCP WHERE sllsh = b.sllsh AND EVALPROCESS='2' AND yhpj = '1') fcbmy,
-        (SELECT count(1) FROM RS_JK_HCP WHERE sllsh = b.sllsh AND EVALPROCESS='2' AND yhpj = '2') bmy,
-        (SELECT count(1) FROM RS_JK_HCP WHERE sllsh = b.sllsh AND EVALPROCESS='2' AND yhpj = '3') jbmy,
-        (SELECT count(1) FROM RS_JK_HCP WHERE sllsh = b.sllsh AND EVALPROCESS='2' AND yhpj = '4') my,
-        (SELECT count(1) FROM RS_JK_HCP WHERE sllsh = b.sllsh AND EVALPROCESS='2' AND yhpj = '5') fcmy
-        from rs_slxx b
-        where sjly = '1'
+        (SELECT COUNT(1) FROM RS_JK_HCP WHERE sllsh = b.sllsh AND EVALPROCESS = '2' AND yhpj = '1') fcbmy,
+        (SELECT COUNT(1) FROM RS_JK_HCP WHERE sllsh = b.sllsh AND EVALPROCESS = '2' AND yhpj = '2') bmy,
+        (SELECT COUNT(1) FROM RS_JK_HCP WHERE sllsh = b.sllsh AND EVALPROCESS = '2' AND yhpj = '3') jbmy,
+        (SELECT COUNT(1) FROM RS_JK_HCP WHERE sllsh = b.sllsh AND EVALPROCESS = '2' AND yhpj = '4') my,
+        (SELECT COUNT(1) FROM RS_JK_HCP WHERE sllsh = b.sllsh AND EVALPROCESS = '2' AND yhpj = '5') fcmy
+        FROM rs_slxx b
+        WHERE sjly = '1'
         <if test="dto.sqrqc != null and dto.sqrqc != ''">
-            AND to_date(substr(slbh,0,8),'yyyyMMdd') &gt;= to_date(REPLACE(#{dto.sqrqc},'-',''),'yyyyMMdd')
+            <!-- 增加有效性检查：只有前8位是数字，且长度足够时才转换 -->
+            AND (
+            CASE WHEN REGEXP_LIKE(SUBSTR(slbh, 1, 8), '^[0-9]{8}$')
+            THEN TO_DATE(SUBSTR(slbh, 1, 8), 'yyyyMMdd')
+            ELSE TO_DATE('19000101', 'yyyyMMdd') END
+            ) &gt;= TO_DATE(REPLACE(#{dto.sqrqc}, '-', ''), 'yyyyMMdd')
         </if>
         <if test="dto.sqrqz != null and dto.sqrqz != ''">
-            AND to_date(substr(slbh,0,8),'yyyyMMdd') &lt;= to_date(REPLACE(#{dto.sqrqz},'-',''),'yyyyMMdd')
+            <!-- 增加有效性检查：只有前8位是数字，且长度足够时才转换 -->
+            AND (
+            CASE WHEN REGEXP_LIKE(SUBSTR(slbh, 1, 8), '^[0-9]{8}$')
+            THEN TO_DATE(SUBSTR(slbh, 1, 8), 'yyyyMMdd')
+            ELSE TO_DATE('19000101', 'yyyyMMdd') END
+            ) &lt;= TO_DATE(REPLACE(#{dto.sqrqz}, '-', ''), 'yyyyMMdd')
         </if>
-        ) q group by sbsx
+        ) q
+        GROUP BY sbsx
+
         UNION ALL
-        SELECT '公共服务' "sqqdname", '2' "sqqd",(select sxmc from rs_sx_config a where a.sxbm = q.sbsx) "sxmc", sbsx
-        "sbsx", count(1) "ywl",
-        to_char(sum(fcbmy)) "fcbmy",to_char(sum(bmy)) "bmy",to_char(sum(jbmy)) "jbmy",
-        to_char(sum(my)) "my",to_char(sum(fcmy)) "fcmy",
-        decode(instr(to_char(ROUND(((sum(fcbmy)+sum(bmy))/count(1))*100,1),'fm9999990.0'),'.'),'0',
-        to_char(ROUND(((sum(fcbmy)+sum(bmy))/count(1))*100,1),'fm9999990.0'),
-        to_char(ROUND(((sum(fcbmy)+sum(bmy))/count(1))*100,1),'fm9999990.0'))||'%' "cpl",
-        decode(instr(to_char(ROUND(((sum(jbmy)+sum(my)+sum(fcmy))/count(1))*100,1),'fm9999990.0'),'.'),'0',
-        to_char(ROUND(((sum(jbmy)+sum(my)+sum(fcmy))/count(1))*100,1),'fm9999990.0'),
-        to_char(ROUND(((sum(jbmy)+sum(my)+sum(fcmy))/count(1))*100,1),'fm9999990.0'))||'%' "hpl"
-        FROM (SELECT b.sbsx,
-        (SELECT count(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS='2' AND yhpj = '1') fcbmy,
-        (SELECT count(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS='2' AND yhpj = '2') bmy,
-        (SELECT count(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS='2' AND yhpj = '3') jbmy,
-        (SELECT count(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS='2' AND yhpj = '4') my,
-        (SELECT count(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS='2' AND yhpj = '5') fcmy
-        from rs_wb_bj b
-        where sjly = '2'
+
+        /* 2. 公共服务 */
+        SELECT
+        '公共服务' "sqqdname",
+        '2' "sqqd",
+        (SELECT sxmc FROM rs_sx_config a WHERE a.sxbm = q.sbsx) "sxmc",
+        sbsx "sbsx",
+        COUNT(1) "ywl",
+        TO_CHAR(SUM(fcbmy)) "fcbmy",
+        TO_CHAR(SUM(bmy)) "bmy",
+        TO_CHAR(SUM(jbmy)) "jbmy",
+        TO_CHAR(SUM(my)) "my",
+        TO_CHAR(SUM(fcmy)) "fcmy",
+        TO_CHAR(ROUND(((SUM(fcbmy) + SUM(bmy)) / DECODE(COUNT(1), 0, 1, COUNT(1))) * 100, 1), 'fm9999990.0') || '%' "cpl",
+        TO_CHAR(ROUND(((SUM(jbmy) + SUM(my) + SUM(fcmy)) / DECODE(COUNT(1), 0, 1, COUNT(1))) * 100, 1), 'fm9999990.0') || '%' "hpl"
+        FROM (
+        SELECT
+        b.sbsx,
+        (SELECT COUNT(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS = '2' AND yhpj = '1') fcbmy,
+        (SELECT COUNT(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS = '2' AND yhpj = '2') bmy,
+        (SELECT COUNT(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS = '2' AND yhpj = '3') jbmy,
+        (SELECT COUNT(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS = '2' AND yhpj = '4') my,
+        (SELECT COUNT(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS = '2' AND yhpj = '5') fcmy
+        FROM rs_wb_bj b
+        WHERE sjly = '2'
         <if test="dto.sqrqc != null and dto.sqrqc != ''">
-            and SUBSTR(cjsj,0,10) &gt;= #{dto.sqrqc}
+            AND SUBSTR(cjsj, 1, 10) &gt;= #{dto.sqrqc}
         </if>
         <if test="dto.sqrqz != null and dto.sqrqz != ''">
-            and SUBSTR(cjsj,0,10) &lt;= #{dto.sqrqz}
+            AND SUBSTR(cjsj, 1, 10) &lt;= #{dto.sqrqz}
         </if>
-        and sqzt not in ('0')
-        ) q group by sbsx
+        AND sqzt NOT IN ('0')
+        ) q
+        GROUP BY sbsx
+
         UNION ALL
-        SELECT '微信小程序' "sqqdname", '3' "sqqd",(select sxmc from rs_sx_config a where a.sxbm = q.sbsx) "sxmc", sbsx
-        "sbsx", count(1) "ywl",
-        to_char(sum(fcbmy)) "fcbmy",to_char(sum(bmy)) "bmy",to_char(sum(jbmy)) "jbmy",
-        to_char(sum(my)) "my",to_char(sum(fcmy)) "fcmy",
-        decode(instr(to_char(ROUND(((sum(fcbmy)+sum(bmy))/count(1))*100,1),'fm9999990.0'),'.'),'0',
-        to_char(ROUND(((sum(fcbmy)+sum(bmy))/count(1))*100,1),'fm9999990.0'),
-        to_char(ROUND(((sum(fcbmy)+sum(bmy))/count(1))*100,1),'fm9999990.0'))||'%' "cpl",
-        decode(instr(to_char(ROUND(((sum(jbmy)+sum(my)+sum(fcmy))/count(1))*100,1),'fm9999990.0'),'.'),'0',
-        to_char(ROUND(((sum(jbmy)+sum(my)+sum(fcmy))/count(1))*100,1),'fm9999990.0'),
-        to_char(ROUND(((sum(jbmy)+sum(my)+sum(fcmy))/count(1))*100,1),'fm9999990.0'))||'%' "hpl"
-        FROM (SELECT b.sbsx,
-        (SELECT count(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS='2' AND yhpj = '1') fcbmy,
-        (SELECT count(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS='2' AND yhpj = '2') bmy,
-        (SELECT count(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS='2' AND yhpj = '3') jbmy,
-        (SELECT count(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS='2' AND yhpj = '4') my,
-        (SELECT count(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS='2' AND yhpj = '5') fcmy
-        from rs_wb_bj b
-        where sjly = '3'
+
+        /* 3. 微信小程序 */
+        SELECT
+        '微信小程序' "sqqdname",
+        '3' "sqqd",
+        (SELECT sxmc FROM rs_sx_config a WHERE a.sxbm = q.sbsx) "sxmc",
+        sbsx "sbsx",
+        COUNT(1) "ywl",
+        TO_CHAR(SUM(fcbmy)) "fcbmy",
+        TO_CHAR(SUM(bmy)) "bmy",
+        TO_CHAR(SUM(jbmy)) "jbmy",
+        TO_CHAR(SUM(my)) "my",
+        TO_CHAR(SUM(fcmy)) "fcmy",
+        TO_CHAR(ROUND(((SUM(fcbmy) + SUM(bmy)) / DECODE(COUNT(1), 0, 1, COUNT(1))) * 100, 1), 'fm9999990.0') || '%' "cpl",
+        TO_CHAR(ROUND(((SUM(jbmy) + SUM(my) + SUM(fcmy)) / DECODE(COUNT(1), 0, 1, COUNT(1))) * 100, 1), 'fm9999990.0') || '%' "hpl"
+        FROM (
+        SELECT
+        b.sbsx,
+        (SELECT COUNT(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS = '2' AND yhpj = '1') fcbmy,
+        (SELECT COUNT(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS = '2' AND yhpj = '2') bmy,
+        (SELECT COUNT(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS = '2' AND yhpj = '3') jbmy,
+        (SELECT COUNT(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS = '2' AND yhpj = '4') my,
+        (SELECT COUNT(1) FROM RS_JK_HCP WHERE rs_wb_bj_lsh = b.rs_wb_bj_lsh AND EVALPROCESS = '2' AND yhpj = '5') fcmy
+        FROM rs_wb_bj b
+        WHERE sjly = '3'
         <if test="dto.sqrqc != null and dto.sqrqc != ''">
-            and SUBSTR(cjsj,0,10) &gt;= #{dto.sqrqc}
+            AND SUBSTR(cjsj, 1, 10) &gt;= #{dto.sqrqc}
         </if>
         <if test="dto.sqrqz != null and dto.sqrqz != ''">
-            and SUBSTR(cjsj,0,10) &lt;= #{dto.sqrqz}
+            AND SUBSTR(cjsj, 1, 10) &lt;= #{dto.sqrqz}
         </if>
-        and sqzt not in ('0')
-        ) q group by sbsx
+        AND sqzt NOT IN ('0')
+        ) q
+        GROUP BY sbsx
+
         UNION ALL
-        select * from (select '自助一体机' "sqqdname",'4' "sqqd", llyw "sxmc",'000' "sbsx",count(1) "ywl",
-        '-' "fcbmy",'-' "bmy",'-' "jbmy",'-' "my",'-' "fcmy",'-' "cpl",'-' "hpl"
-        from rs_zzzd_log
+
+        /* 4. 自助一体机 */
+        SELECT
+        '自助一体机' "sqqdname",
+        '4' "sqqd",
+        llyw "sxmc",
+        '000' "sbsx",
+        COUNT(1) "ywl",
+        '-' "fcbmy",
+        '-' "bmy",
+        '-' "jbmy",
+        '-' "my",
+        '-' "fcmy",
+        '-' "cpl",
+        '-' "hpl"
+        FROM rs_zzzd_log
         <where>
             <if test="dto.sqrqc != null and dto.sqrqc != ''">
-                and cjsj &gt;= #{dto.sqrqc}
+                AND cjsj &gt;= #{dto.sqrqc}
             </if>
             <if test="dto.sqrqz != null and dto.sqrqz != ''">
-                and cjsj &lt;= #{dto.sqrqz}
+                AND cjsj &lt;= #{dto.sqrqz}
             </if>
         </where>
-        group by llyw)
-        ) where "sxmc" IS NOT NULL
+        GROUP BY llyw
+        )
+        WHERE "sxmc" IS NOT NULL
         <if test="dto.sqqd != null and dto.sqqd != ''">
-            and "sqqd" = #{dto.sqqd}
+            AND "sqqd" = #{dto.sqqd}
         </if>
     </select>
 

zjrs-service-backend/src/main/resources/application.yaml

@@ -26,7 +26,8 @@ spring:
         ggfw-dict: { expireTime: 3600, cacheNullValues: true, keyPrefix: dict, usePrefix: true }
         ggfw-rmfw: { expireTime: 3600, cacheNullValues: true, keyPrefix: rmfw, usePrefix: true }
         ggfw-rmsx: { expireTime: 3600, cacheNullValues: true, keyPrefix: rmsx, usePrefix: true }
-        ggfw-xzqh: { expireTime: 3600, cacheNullValues: true, keyPrefix: rmsx, usePrefix: true }
+        ggfw-xzqh: { expireTime: 3600, cacheNullValues: true, keyPrefix: xzqh, usePrefix: true }
+        rlzy-zyxxlist: { expireTime: 3600, cacheNullValues: true, keyPrefix: zyxx, usePrefix: true }
 
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource