fix: 达梦适配+接口报错修改

zjrs-service-backend/pom.xml

@@ -441,6 +441,19 @@
                 </executions>
             </plugin>
         </plugins>
+        <!-- 将XML打包编译 -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
     </build>
 
 </project>

zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/blo/impl/CommBLOImpl.java

@@ -93,9 +93,9 @@ public class CommBLOImpl extends BLOImpl implements CommBLO {
     		queryWrapper.like("sxmc", dto.getSxmc());
     	}
         //服务对象
-        if(StringUtils.isNotBlank(dto.getFwdx())) {
-    		queryWrapper.like("fwdx", dto.getFwdx());
-    	}
+//        if(StringUtils.isNotBlank(dto.getFwdx())) {
+//    		queryWrapper.like("fwdx", dto.getFwdx());
+//    	}
         //到现场次数
         if(StringUtils.isNotBlank(dto.getDxccs())) {
         	Object[] dxccs = dto.getDxccs().split(",");

zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/dto/SxQueryDTO.java

@@ -28,8 +28,8 @@ public class SxQueryDTO extends PageDTO implements java.io.Serializable {
     @Schema(description = "业务主题")
     private String ywzt;
     
-    @Schema(description = "服务对象")
-    private String fwdx;
+//    @Schema(description = "服务对象")
+//    private String fwdx;
 
 	@Schema(description = "是否一件事事项")
 	private String isyjs;
@@ -82,13 +82,13 @@ public class SxQueryDTO extends PageDTO implements java.io.Serializable {
 		this.ywzt = ywzt;
 	}
 
-	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 getIsyjs() {
 		return isyjs;

zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/po/VGgfwDict.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_GGFW_DICT")
-public class VGgfwDict {
+public class VGgfwDict implements Serializable {
+    private static final long serialVersionUID = 1L;
 	
 	@TableId(value = "ID", type = IdType.ASSIGN_UUID)
     private String id;

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/zwnw/dbgl/blo/impl/DbrwglCommimplPLO.java

@@ -155,7 +155,7 @@ public class DbrwglCommimplPLO extends BLOImpl implements DbrwglCommPLO {
         dto.setUserid(userid);
         Page<Map<String, Object>> page = new Page<>(dto.getPagenum(), dto.getPagesize());
         Page<Map<String, Object>> pageResult = null;
-        PageResult result = PageUtil.PageResult(pageResult);
+        PageResult result = PageUtil.PageResult(page);
         return result;
     }
 

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

@@ -91,6 +91,11 @@ public class CommonBLOimpl extends BLOImpl implements CommonBLO {
     public Map<String, Object> getNums() {
         Map<String, Object> numMap = new HashMap<>();
         CurrentUser currentUser = getCurrentUser();
+        // 安全获取用户ID
+        if (currentUser == null || StringUtils.isBlank(currentUser.getUserid())) {
+            numMap.put("rc", "0");
+            return numMap;
+        }
         String userid = currentUser.getUserid();
         //待办事项个数
         int grdb = VSSgDictMapper.getDnnums(userid);
@@ -101,28 +106,30 @@ public class CommonBLOimpl extends BLOImpl implements CommonBLO {
         // 获取操作人的组织机构，行政区划
         VRsSyOrgAreaPO orgareapo = vRsSyOrgAreaMapper.selectOne(new QueryWrapper<VRsSyOrgAreaPO>()
                 .eq("user_id", userid));
-        String orgid = orgareapo.getOrgid();
-        String areaid = orgareapo.getAreaid();
-        long totalcnt = 0;
-        // 日程个数--个人日程
-        if (StringUtils.isNotBlank(userid)) {
-            long grrccnt = vRsSyRcglMapper.selectCount(new QueryWrapper<VRsSyRcglPO>()
-                     .apply("to_date(rcsj,'YY-MM-DD HH24:MI:SS')>sysdate"));
-            totalcnt = totalcnt + grrccnt;
-        }
-        if (StringUtils.isNotBlank(orgid)) {
-            // 日程个数--同科室
-            long ksrccnt = vSsSyRcglOrgMapper.selectCount(new QueryWrapper<VSsSyRcglOrgPO>()
-                    .apply("to_date(rcsj,'YY-MM-DD HH24:MI:SS')>sysdate"));
-            totalcnt = totalcnt + ksrccnt;
-        }
-        if (StringUtils.isNotBlank(areaid)) {
-            // 日程个数--全局
-            long qjrccnt = vRrsSyRcglAreaMapper.selectCount(new QueryWrapper<VRrsSyRcglAreaPO>()
-                    .apply("to_date(rcsj,'YY-MM-DD HH24:MI:SS')>sysdate"));
-            totalcnt = totalcnt + qjrccnt;
+        if (orgareapo != null) {
+            String orgid = orgareapo.getOrgid();
+            String areaid = orgareapo.getAreaid();
+            long totalcnt = 0;
+            // 日程个数--个人日程
+            if (StringUtils.isNotBlank(userid)) {
+                long grrccnt = vRsSyRcglMapper.selectCount(new QueryWrapper<VRsSyRcglPO>()
+                        .apply("to_date(rcsj,'YY-MM-DD HH24:MI:SS')>sysdate"));
+                totalcnt = totalcnt + grrccnt;
+            }
+            if (StringUtils.isNotBlank(orgid)) {
+                // 日程个数--同科室
+                long ksrccnt = vSsSyRcglOrgMapper.selectCount(new QueryWrapper<VSsSyRcglOrgPO>()
+                        .apply("to_date(rcsj,'YY-MM-DD HH24:MI:SS')>sysdate"));
+                totalcnt = totalcnt + ksrccnt;
+            }
+            if (StringUtils.isNotBlank(areaid)) {
+                // 日程个数--全局
+                long qjrccnt = vRrsSyRcglAreaMapper.selectCount(new QueryWrapper<VRrsSyRcglAreaPO>()
+                        .apply("to_date(rcsj,'YY-MM-DD HH24:MI:SS')>sysdate"));
+                totalcnt = totalcnt + qjrccnt;
+            }
+            numMap.put("rc", totalcnt + "");
         }
-        numMap.put("rc", totalcnt + "");
         return numMap;
     }
 

zjrs-service-backend/src/main/java/com/zjrs/zwnw/rlzysc/blo/impl/JxgwBLOimpl.java

@@ -138,7 +138,7 @@ public class JxgwBLOimpl extends BLOImpl implements JxgwBLO {
         dictDTO.setDictArr(new String[]{"RS_RLZY_JXGW_SFYQ"});
         Map<String, Object> dictMap = this.commBLO.getDicts(dictDTO);
         Map<String, List> dictListMap = (Map<String, List>)dictMap.get("code_detail");
-        List<Map<String, Object>> sfyqList = dictListMap.get("RS_RLZY_JXGW_SFYQ");
+//        List<Map<String, Object>> sfyqList = dictListMap.get("RS_RLZY_JXGW_SFYQ");
         //字典转换
         List<JxgwDTO> list = pageResult.getRecords();
         for(JxgwDTO jxgw: list){

zjrs-service-backend/src/main/java/com/zjrs/zwnw/rlzysc/entity/VRsRlzyZphglMapper.xml

@@ -17,11 +17,13 @@
         isyy：该招聘会下是否有预约，如有预约，则在取消发布操作弹出确认框：该招聘会已有预约，是否确认取消发布
         zphzt字段：1为手动结束，0为未设置手动结束
         -->
-        select v.zphbh as "zphbh",
+        select
+        v.zphbh as "zphbh",
         v.zphmc as "zphmc",
         v.jbcs as "jbcs",
         v.zphjs as "zphjs",
-        v.jbrqc||' '||v.kssj || '~' || v.jbrqz||' '||v.jssj as "jbrq",
+        -- 尝试用 CONCAT 函数代替 || 拼接，或者在拼接前后加空格
+        (v.jbrqc || ' ' || v.kssj || '~' || v.jbrqz || ' ' || v.jssj) as "jbrq",
         v.jbrqc as "jbrqc",
         v.jbrqz as "jbrqz",
         v.uzphzt as "zphzt",
@@ -29,23 +31,17 @@
         v.zphjblx as "zphjblx",
         v.bmzt as "bmzt",
         v.bae001 as "ssdq",
-        v.zdzt as "zdzt",
-<!--        (select decode(count(a.rs_rlzy_zphgl_lsh),0,'0','1')-->
-<!--        from v_rs_rlzy_zphgl a,v_rs_rlzy_hcgl b,v_rs_rlzy_zwgl c-->
-<!--        where a.rs_rlzy_zphgl_lsh = b.rs_rlzy_zphgl_lsh-->
-<!--        and b.rs_rlzy_hcgl_lsh = c.rs_rlzy_hcgl_lsh-->
-<!--        and a.ts_yxbz = '1' and b.ts_yxbz = '1' and c.ts_yxbz = '1'-->
-<!--        and a.rs_rlzy_zphgl_lsh = v.rs_rlzy_zphgl_lsh) as "havezw",-->
-<!--        (select decode(count(a.rs_rlzy_zphgl_lsh),0,'0','1')-->
-<!--        from v_rs_rlzy_zwwzyysh a-->
-<!--        where a.rs_rlzy_zphgl_lsh = v.rs_rlzy_zphgl_lsh and a.shjg = '1' ) as "isyy",-->
-        rs_rlzy_zphgl_lsh as "rsrlzyzphgllsh"
-        from (select g.*,
-        (case when (g.zphzt = '0' and to_date(g.jbrqc||' '||g.kssj,'YYYY-MM-DD HH24:MI:SS') > sysdate) then '1'
-        when (g.zphzt = '0' and ((to_date(g.jbrqz||' '||g.jssj,'YYYY-MM-DD HH24:MI:SS') > sysdate) and (sysdate >to_date(g.jbrqc||' '||g.kssj,'YYYY-MM-DD HH24:MI:SS')))) then '2'
-        when (g.zphzt = '1' or sysdate > to_date(g.jbrqz||' '||g.jssj,'YYYY-MM-DD HH24:MI:SS')) then '3'
-        else '' end) uzphzt
-        from v_rs_rlzy_zphgl g ) v where 1=1
+        v.zdzt as "zdzt",  v.rs_rlzy_zphgl_lsh as "rsrlzyzphgllsh"
+        from (
+            select g.*,
+                (case
+                when (g.zphzt = '0' and to_date(g.jbrqc || ' ' || g.kssj, 'YYYY-MM-DD HH24:MI:SS') > sysdate) then '1'
+                when (g.zphzt = '0' and (to_date(g.jbrqz || ' ' || g.jssj, 'YYYY-MM-DD HH24:MI:SS') > sysdate and sysdate > to_date(g.jbrqc || ' ' || g.kssj, 'YYYY-MM-DD HH24:MI:SS'))) then '2'
+                when (g.zphzt = '1' or sysdate > to_date(g.jbrqz || ' ' || g.jssj, 'YYYY-MM-DD HH24:MI:SS')) then '3'
+                else ''
+                end) as uzphzt  from v_rs_rlzy_zphgl g
+            ) v
+        where 1=1
         <include refid="zphfbList_where" />
         order by v.zphbh desc
     </select>

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

@@ -23,6 +23,10 @@ spring:
         authoritiesinfo: { expireTime: 14400, cacheNullValues: false, keyPrefix: authorities, usePrefix: true }
         authenticationcode: { expireTime: 600, cacheNullValues: false, keyPrefix: authenticationcode, usePrefix: true }
         leafcache_security: { expireTime: 1800, cacheNullValues: false, keyPrefix: leafcache_security, usePrefix: true }
+        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 }
 
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
@@ -32,7 +36,7 @@ spring:
 #    username: ZJRS_YWXT
 #    password: Bowin123456
     driver-class-name: dm.jdbc.driver.DmDriver
-    url: jdbc:dm://192.168.0.56:5236?schema=ZJZHRS&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&uppercaseAttributeName=false&columnNameUpperCase=false&lobAsString=true
+    url: jdbc:dm://192.168.0.56:5236?schema=ZJRS_YWXT&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&uppercaseAttributeName=false&columnNameUpperCase=false&lobAsString=true
     username: ZJRS_YWXT
     password: Bowin123456
     druid:

zjrs-service-backend/src/test/java/com/zjrs/ZjrsServiceBackendApplicationTests.java

@@ -1,4 +1,4 @@
-package com.zjrs;
+package com.zjrs;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;