Преглед изворни кода

fix: ggfw模块sql语句替换为达梦语法

zhangying пре 1 недеља
родитељ
комит
d2f1975dbc
21 измењених фајлова са 119 додато и 117 уклоњено
  1. 2 2
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/entity/EMSMapper.xml
  2. 1 1
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/entity/RsCommMapper.xml
  3. 1 1
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/entity/VRsSxblFjMapper.xml
  4. 2 2
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/entity/VRsSyXxlxMapper.xml
  5. 4 4
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/entity/VRsWbBjListForGrMapper.xml
  6. 8 8
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/entity/VRsWbBjListMapper.xml
  7. 10 9
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/GxygMapper.xml
  8. 1 1
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/JlxxMapper.xml
  9. 4 4
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/PbszMapper.xml
  10. 3 4
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/QyxxMapper.xml
  11. 7 7
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/RsRlzyRcssqMapper.xml
  12. 9 8
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/RsRlzyZwssqMapper.xml
  13. 3 3
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/VRsRlzyJxgwMapper.xml
  14. 1 1
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/VRsRlzyMsglMapper.xml
  15. 3 3
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/YgbadwMapper.xml
  16. 3 3
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/ZphYdMapper.xml
  17. 41 41
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/ZphglMapper.xml
  18. 4 4
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/ZwxxMapper.xml
  19. 9 9
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/ZzzdMapper.xml
  20. 2 1
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/sggfw/entity/GrJbxxMapper.xml
  21. 1 1
      zjrs-service-backend/src/main/java/com/zjrs/ggfw/sggfw/entity/RsrlzyJkIddzMapper.xml

+ 2 - 2
zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/entity/EMSMapper.xml

@@ -39,7 +39,7 @@
     </select>
 
     <select id="queryOrderXx" resultType="com.zjrs.ggfw.portal.dto.EMSORderXxDTO">
-        select to_char(to_date(a.paytime, 'yyyymmddhh24miss'), 'yyyy-mm-dd hh24:mi:ss') as paytime,
+        select TO_CHAR(TO_DATE(a.paytime, 'YYYYMMDDHH24MISS'), 'YYYY-MM-DD HH24:MI:SS') as paytime,
                a.custOrderId,
                a.orderStatus,
                a.sllsh,
@@ -47,7 +47,7 @@
                a.postfee,
                a.xdsj,
                b.sjrxm                                                                  as tcontactor,
-               decode(length(b.sjrsj), 11, b.sjrsj, b.SBRSJ)                               tcustmobile,
+               CASE WHEN LENGTH(b.sjrsj) = 11 THEN b.sjrsj ELSE b.SBRSJ END                tcustmobile,
                b.sjrdz                                                                  as tcustaddress,
                b.tcustProvince                                                          as tcustProvinceCode,
                b.tcustCity                                                              as tcustCityCode,

+ 1 - 1
zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/entity/RsCommMapper.xml

@@ -3,6 +3,6 @@
 <mapper namespace="com.zjrs.ggfw.portal.entity.RsCommMapper">
 
     <select id="getCurrenttime" resultType="String">
-		select to_char(sysdate,'yyyy-mm-dd hh24:mi:ss')
+        select TO_CHAR(SYSDATE, 'YYYY-MM-DD HH24:MI:SS')
     </select>
 </mapper>

+ 1 - 1
zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/entity/VRsSxblFjMapper.xml

@@ -6,7 +6,7 @@
         SELECT a.tycc_lsh tyccid, b.wjm wjmc, b.ts_cjsj cjsj
         FROM RS_APPCOMM_FILE A,
              rs_wj B
-        WHERE A.TYCC_LSH = B.RS_WJ_LSH || B.KZM
+        WHERE A.TYCC_LSH = CONCAT(B.RS_WJ_LSH, B.KZM)
           AND B.TS_YXBZ = '1'
           and a.ywlsh = #{ sllsh }
         order by b.ts_cjsj desc

+ 2 - 2
zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/entity/VRsSyXxlxMapper.xml

@@ -12,8 +12,8 @@
                                                             from (
                                                                 select a.aaa102, a.aaa103, (select count (1) from v_rs_sy_xxlx where xxlx='1'
                                                                 and fbqd like '%4%' and fbzt='1' and ts_yxbz='1'
-                                                                and ','||ywzt||',' like '%,'||a.aaa102||',%') cnt
+                                                                and CONCAT(',', CONCAT(ywzt, ',')) like CONCAT('%,', CONCAT(a.aaa102, ',%')) cnt
                                                                 from v_ggfw_dict a where a.aaa100='RS_SX_CONFIG_YWZT'))
-        order by pxh desc, to_number(aaa102)
+                                                            order by pxh desc, CAST (aaa102 AS INT)
     </select>
 </mapper>

+ 4 - 4
zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/entity/VRsWbBjListForGrMapper.xml

@@ -10,10 +10,10 @@
         LEFT JOIN RS_SLXX_EMS_ORDER C ON A.SLLSH = C.SLLSH
         WHERE A.YHID = #{dto.yhid}
         <if test="dto.slbh != null and dto.slbh != ''">
-            and A.slbh LIKE '%'||#{dto.slbh}||'%'
+            and A.slbh LIKE CONCAT('%',#{dto.slbh},'%')
         </if>
         <if test="dto.sxmc != null and dto.sxmc != ''">
-            and A.sxmc LIKE '%'||#{dto.sxmc}||'%'
+            and A.sxmc LIKE CONCAT('%',#{dto.sxmc},'%')
         </if>
         <if test="dto.sqzt != null and dto.sqzt != ''">
             and A.sqzt in
@@ -22,10 +22,10 @@
             </foreach>
         </if>
         <if test="dto.sqrqq != null and dto.sqrqq != ''">
-            and A.sqsj &gt;= #{dto.sqrqq} ||' 00:00:00'
+            and A.sqsj &gt;= CONCAT(#{dto.sqrqq},' 00:00:00')
         </if>
         <if test="dto.sqrqz != null and dto.sqrqz != ''">
-            and A.sqsj &lt;= #{dto.sqrqz} ||' 23:59:59'
+            and A.sqsj &lt;= CONCAT(#{dto.sqrqz},' 23:59:59')
         </if>
         <if test="dto.pjzt != null and dto.pjzt != ''">
             and A.sqzt &gt;= '1'

+ 8 - 8
zjrs-service-backend/src/main/java/com/zjrs/ggfw/portal/entity/VRsWbBjListMapper.xml

@@ -10,16 +10,16 @@
             and a.sxmc = #{dto.sxmc}
         </if>
         <if test="dto.bjrqc != null and dto.bjrqc != ''">
-            and a.bjsj &gt; #{dto.bjrqc} ||' 00:00:00'
+            and a.bjsj &gt; CONCAT(#{dto.bjrqc},' 00:00:00')
         </if>
         <if test="dto.bjrqz != null and dto.bjrqz != ''">
-            and a.bjsj &lt; #{dto.bjrqz} ||' 23:59:59'
+            and a.bjsj &lt; CONCAT(#{dto.bjrqz},' 23:59:59')
         </if>
         <if test="dto.sqrqq != null and dto.sqrqq != ''">
-            and a.sqsj &gt; #{dto.sqrqq} ||' 00:00:00'
+            and a.sqsj &gt; CONCAT(#{dto.sqrqq},' 00:00:00')
         </if>
         <if test="dto.sqrqz != null and dto.sqrqz != ''">
-            and a.sqsj &lt; #{dto.sqrqz} ||' 23:59:59'
+            and a.sqsj &lt; CONCAT(#{dto.sqrqz},' 23:59:59')
         </if>
     </sql>
 
@@ -50,10 +50,10 @@
         LEFT JOIN RS_SLXX_EMS_ORDER C ON A.SLLSH = C.SLLSH
         WHERE A.YHID = #{dto.yhid}
         <if test="dto.slbh != null and dto.slbh != ''">
-            and A.slbh LIKE '%'||#{dto.slbh}||'%'
+            and A.slbh LIKE CONCAT('%',#{dto.slbh},'%')
         </if>
         <if test="dto.sxmc != null and dto.sxmc != ''">
-            and A.sxmc LIKE '%'||#{dto.sxmc}||'%'
+            and A.sxmc LIKE CONCAT('%',#{dto.sxmc},'%')
         </if>
         <if test="dto.sqzt != null and dto.sqzt != ''">
             and A.sqzt in
@@ -62,10 +62,10 @@
             </foreach>
         </if>
         <if test="dto.sqrqq != null and dto.sqrqq != ''">
-            and A.sqsj &gt;= #{dto.sqrqq} ||' 00:00:00'
+            and A.sqsj &gt;= CONCAT(#{dto.sqrqq},' 00:00:00')
         </if>
         <if test="dto.sqrqz != null and dto.sqrqz != ''">
-            and A.sqsj &lt;= #{dto.sqrqz} ||' 23:59:59'
+            and A.sqsj &lt;= CONCAT(#{dto.sqrqz},' 23:59:59')
         </if>
         <if test="dto.pjzt != null and dto.pjzt != ''">
             and A.sqzt &gt;= '1'

+ 10 - 9
zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/GxygMapper.xml

@@ -13,16 +13,16 @@
         WHERE a.rs_rlzy_qyxx_lsh = b.rs_rlzy_qyxx_lsh
         and b.rs_yhlsh = #{dto.rsyhlsh}
         <if test="dto.qymc != null and dto.qymc != ''">
-            and  b.gsmc like '%'||#{dto.qymc}||'%'
+            and b.gsmc like CONCAT('%',#{dto.qymc})
         </if>
         <if test="dto.qyygqk != null and dto.qyygqk != ''">
             and a.qyygqk = #{dto.qyygqk}
         </if>
         <if test="dto.gxrs != null and dto.gxrs != ''">
-            and a.gxrs like '%'||#{dto.gxrs}||'%'
+            and a.gxrs like CONCAT('%',#{dto.gxrs})
         </if>
         <if test="dto.gxyy != null and dto.gxyy != ''">
-            and a.gxyy like '%'||#{dto.gxyy}||'%'
+            and a.gxyy like CONCAT('%',#{dto.gxyy})
         </if>
         <if test="dto.fbzt != null and dto.fbzt != ''">
             and a.fbzt = #{dto.fbzt}
@@ -48,7 +48,8 @@
         </if>
 
         <if test="dto.cxzt != null and dto.cxzt != ''">
-            and gxkssj <![CDATA[ <= ]]> to_char(sysdate,'YYYY-MM-DD') and gxjssj <![CDATA[ <= ]]> to_char(sysdate,'YYYY-MM-DD')
+            and gxkssj <![CDATA[ >= ]]> TO_CHAR(SYSDATE, 'YYYY-MM-DD') and gxjssj <![CDATA[ <= ]]> TO_CHAR(SYSDATE,
+            'YYYY-MM-DD')
         </if>
         and a.ts_yxbz = '1'
         order by gxkssj desc
@@ -64,16 +65,16 @@
         FROM v_rs_rlzy_gxyg a, v_rs_rlzy_qyxx b
         WHERE a.rs_rlzy_qyxx_lsh = b.rs_rlzy_qyxx_lsh
         <if test="dto.qymc != null and dto.qymc != ''">
-            and  b.gsmc like '%'||#{dto.qymc}||'%'
+            and b.gsmc like CONCAT('%',#{dto.qymc})
         </if>
         <if test="dto.qyygqk != null and dto.qyygqk != ''">
             and a.qyygqk = #{dto.qyygqk}
         </if>
         <if test="dto.gxrs != null and dto.gxrs != ''">
-            and a.gxrs like '%'||#{dto.gxrs}||'%'
+            and a.gxrs like CONCAT('%',#{dto.gxrs})
         </if>
         <if test="dto.gxyy != null and dto.gxyy != ''">
-            and a.gxyy like '%'||#{dto.gxyy}||'%'
+            and a.gxyy like CONCAT('%',#{dto.gxyy})
         </if>
         <if test="dto.fbzt != null and dto.fbzt != ''">
             and a.fbzt = #{dto.fbzt}
@@ -103,10 +104,10 @@
         </if>-->
         and a.ts_yxbz = '1'
         and a.zxzt = '1'
-        and a.gxjssj <![CDATA[ >= ]]> to_char(sysdate, 'yyyy-MM-dd')
+        and a.gxjssj <![CDATA[ >= ]]> TO_CHAR(SYSDATE, 'YYYY-MM-DD')
         AND EXISTS (SELECT c.RS_RLZY_QYXX_LSH FROM v_rs_rlzy_qyxx c, v_rs_rlzy_gxyg d WHERE
         c.rs_rlzy_qyxx_lsh = d.rs_rlzy_qyxx_lsh and c.rs_yhlsh = #{dto.rsyhlsh} and d.fbzt = '1'
-        and d.gxjssj <![CDATA[ >= ]]> to_char(sysdate, 'yyyy-MM-dd'))
+        and d.gxjssj <![CDATA[ >= ]]> TO_CHAR(SYSDATE, 'YYYY-MM-DD'))
         order by a.gxkssj desc
     </select>
 

+ 1 - 1
zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/JlxxMapper.xml

@@ -117,7 +117,7 @@
             (select a.rs_rlzy_qyxx_lsh from rs_rlzy_qyxx a where a.rs_yhlsh = #{dto.rsyhlsh}))
         </if>
         <if test="dto.keyword != null and dto.keyword != ''">
-            and (b.JLMC LIKE '%'||#{dto.keyword}||'%' or c.QWZW LIKE '%'||#{dto.keyword}||'%')
+            and (b.JLMC LIKE CONCAT('%',#{dto.keyword}) or c.QWZW LIKE CONCAT('%',#{dto.keyword}))
         </if>
         <if test="dto.rq != null and dto.rq != ''">
             <choose>

+ 4 - 4
zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/PbszMapper.xml

@@ -11,7 +11,7 @@
         a.rs_yhlsh rsyhlsh,
         a.ts_cjsj tscjsj,
         b.gsmc,
-        decode(a.rs_yhlsh,null,'0','1') pbzt
+        DECODE(a.rs_yhlsh, NULL, '0', '1') AS pbzt
         from v_RS_RLZY_QYXX b left join (select * from v_RS_RLZY_PBSZ where rs_yhlsh= #{dto.rsyhlsh}) a on
         a.rs_rlzy_qyxx_lsh = b.rs_rlzy_qyxx_lsh
         where b.qyxx_shzt = '1'
@@ -20,12 +20,12 @@
         and e.fwdx = '2'
         and e.ztid = g.ztid
         <if test="dto.gsmc != null and dto.gsmc != ''">
-            and d.gsmc like '%' || #{dto.gsmc} || '%'
+            and d.gsmc like CONCAT('%',#{dto.gsmc})
         </if>
         <if test="dto.lxr != null and dto.lxr != ''">
-            and g.aae004 like '%' || #{dto.lxr} || '%'
+            and g.aae004 like CONCAT('%',#{dto.lxr})
         </if>
-        order by d.tscjsj desc nulls last
+        order by d.tscjsj desc
         ) where 1=1
         <if test="dto.pbzt != null and dto.pbzt != ''">
             and pbzt = #{dto.pbzt}

+ 3 - 4
zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/QyxxMapper.xml

@@ -209,7 +209,7 @@
         from v_ggfw_dict
         where aaa100 = 'RS_RLZY_XL'
         and aaa102 = v.whcd) as "whcd",
-        to_char(to_date(v.tsxgsj, 'yyyy-mm-dd hh24:mi:ss'), 'yyyy-mm-dd') as "tsxgsj",
+        to_char(TO_DATE(v.tsxgsj, 'YYYY-MM-DD HH24:MI:SS'), 'YYYY-MM-DD') as "tsxgsj",
         (select aaa103
         from v_ggfw_dict
         where aaa100 = 'RS_RLZY_ZPDQ'
@@ -256,14 +256,13 @@
             and v.zpgz = #{dto.zwxx}
         </if>
         <if test="dto.keyword != null and dto.keyword != ''">
-            and v.zwmc like '%'||#{dto.keyword}||'%'
+            and v.zwmc like CONCAT('%',#{dto.keyword})
         </if>
     </select>
 
     <select id="validateQyxx" parameterType="com.zjrs.ggfw.rlzysc.dto.QyxxDTO" resultType="HashMap">
         select * from (select * from v_rs_rlzy_qyxx where aab004 = #{dto.aab004}
-                                                       or aab998 = #{dto.aab998})
-        where rownum &lt;= 1
+                                                       or aab998 = #{dto.aab998}) LIMIT 1
     </select>
 
 </mapper>

+ 7 - 7
zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/RsRlzyRcssqMapper.xml

@@ -8,11 +8,11 @@
 
     <select id="getRcssqDsq" resultType="com.zjrs.ggfw.rlzysc.po.RsRlzyRcssqPO">
         select v.*
-        from (select mod((trunc(sysdate) -
-        trunc(to_date(a.dsqzxsj, 'yyyy-mm-dd hh24:mi:ss'))),
-        to_number(a.fszq)) iszx,
-        (trunc(sysdate) -
-        trunc(to_date(a.dsqzxsj, 'yyyy-mm-dd hh24:mi:ss'))) istoday,
+        from (select mod((trunc(SYSDATE) -
+                          trunc(TO_DATE(a.dsqzxsj, 'YYYY-MM-DD HH24:MI:SS'))),
+                         CAST(a.fszq AS INT))                             iszx,
+                     (trunc(SYSDATE) -
+                      trunc(TO_DATE(a.dsqzxsj, 'YYYY-MM-DD HH24:MI:SS'))) istoday,
         a.*,
         b.qyxx_shzt qyxxshzt,
         decode((select count(rs_rlzy_hmdgl_lsh)
@@ -69,10 +69,10 @@
             and v.qwxz = #{map.qwxz}
         </if>
         <if test="map.fbrq != null and map.fbrq != ''">
-            and to_char(to_date(ts_cjsj,'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd') >= #{map.fbrq}
+            and TO_CHAR(TO_DATE(ts_cjsj,'YYYY-MM-DD HH24:MI:SS'),'YYYY-MM-DD') >= #{map.fbrq}
         </if>
         <if test="map.fszws != null and map.fszws != ''">
-            and rownum <![CDATA[ <= ]]> to_number(#{map.fszws})
+            and rownum <![CDATA[ <= ]]> CAST(#{map.fszws} AS INT)
         </if>
 
         <!--        select * from (select v.aac003 as "aac003", v.jlmc as "jlmc"-->

+ 9 - 8
zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/RsRlzyZwssqMapper.xml

@@ -3,12 +3,12 @@
 <mapper namespace="com.zjrs.ggfw.rlzysc.entity.RsRlzyZwssqMapper">
     <select id="queryZwssq" resultType="com.zjrs.ggfw.rlzysc.po.ZyssqPO">
         select v.*
-        from (select mod((trunc(sysdate) -
-        trunc(to_date(a.dsqzxsj,
-        'yyyy-mm-dd hh24:mi:ss'))),
-        to_number(a.fszq)) iszx,
-        (trunc(sysdate) -
-        trunc(to_date(a.dsqzxsj, 'yyyy-mm-dd hh24:mi:ss'))) istoday,
+        from (select mod((trunc(SYSDATE) -
+                          trunc(TO_DATE(a.dsqzxsj,
+                                        'YYYY-MM-DD HH24:MI:SS'))),
+                         CAST(a.fszq AS INT))                             iszx,
+                     (trunc(SYSDATE) -
+                      trunc(TO_DATE(a.dsqzxsj, 'YYYY-MM-DD HH24:MI:SS'))) istoday,
         a.*,
         c.aac003 as "xm",
         c.aac004 as "sex",
@@ -100,10 +100,11 @@
             and v.xz = #{map.qwxz}    <!-- 期望薪资,暂时取最低薪资-->
         </if>
         <if test="map.fbrq != null and map.fbrq != ''">
-            and to_char(to_date(ts_cjsj,'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd') >= #{map.fbrq} <!-- 发布日期,取职位的发布时间早于搜索器的发布日期-->
+            and TO_CHAR(TO_DATE(ts_cjsj,'YYYY-MM-DD HH24:MI:SS'),'YYYY-MM-DD') >=
+            #{map.fbrq} <!-- 发布日期,取职位的发布时间早于搜索器的发布日期-->
         </if>
         <if test="map.fszws != null and map.fszws != ''">
-            and rownum <![CDATA[ <= ]]> to_number(#{map.fszws})   <!-- 发送职位数,限制条数-->
+            and rownum <![CDATA[ <= ]]> CAST(#{map.fszws} AS INT)   <!-- 发送职位数,限制条数-->
         </if>
     </select>
 </mapper>

+ 3 - 3
zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/VRsRlzyJxgwMapper.xml

@@ -29,8 +29,8 @@
         from v_rs_rlzy_jxgw v
         where v.ts_yxbz='1' and v.fbzt='1'
         <if test="dto.keyword != null and dto.keyword != ''">
-            and (v.dwmc LIKE '%'||#{dto.keyword}||'%' OR v.xxgzdz LIKE '%'||#{dto.keyword}||'%' OR v.jxgw LIKE
-            '%'||#{dto.keyword}||'%')
+            and (v.dwmc LIKE CONCAT('%',#{dto.keyword}) OR v.xxgzdz LIKE CONCAT('%',#{dto.keyword}) OR v.jxgw LIKE
+            CONCAT('%',#{dto.keyword}))
         </if>
         <if test="dto.gzddxzqh != null and dto.gzddxzqh != ''">
             and v.gzddxzqh = #{dto.gzddxzqh}
@@ -46,7 +46,7 @@
             and v.bmzt = #{dto.bmzt}
         </if>
 
-        order by  v.fbsj desc nulls last
+        order by v.fbsj desc
     </select>
 
 

+ 1 - 1
zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/VRsRlzyMsglMapper.xml

@@ -13,7 +13,7 @@
         v.rs_yhlsh         as "rsyhlsh",
         v.rs_rlzy_qyxx_lsh as "rsrlzyqyxxlsh",
         v.rs_rlzy_gwxx_lsh as "rsrlzyzwxxlsh",
-        (case when to_date(v.msrq||' '||v.jssj,'YYYY-MM-DD HH24:MI:SS') > sysdate then '0'
+        (case when to_date(CONCAT(v.msrq,CONCAT(' ',v.jssj)),'YYYY-MM-DD HH24:MI:SS') > SYSDATE then '0'
         else '1' end ) as "gqzt",
         v.rs_rlzy_msgl_lsh as "rsrlzymsgllsh",
         v.mssm             as "mssm"

+ 3 - 3
zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/YgbadwMapper.xml

@@ -74,7 +74,7 @@
         from v_rs_rlzy_ygbayg_yw v
         where v.ts_yxbz='1' and v.rs_rlzy_ygbadw_lsh=#{dto.rsrlzyygbadwlsh}
         <if test="dto.xm != null and dto.xm != ''">
-            and v.xm LIKE '%'||#{dto.xm}||'%'
+            and v.xm LIKE CONCAT('%',#{dto.xm})
         </if>
         <if test="dto.zjlx != null and dto.zjlx != ''">
             and v.zjlx = #{dto.zjlx}
@@ -102,11 +102,11 @@
             and v.rzsj <![CDATA[ <= ]]> #{dto.rzsjEnd}
         </if>
         <if test="dto.bae005Start != null and dto.bae005Start != ''">
-            and v.bae005 <![CDATA[ >= ]]> #{dto.bae005Start}||' 00:00:00'
+            and v.bae005 <![CDATA[ >= ]]> CONCAT(#{dto.bae005Start},' 00:00:00')
         </if>
 
         <if test="dto.bae005End != null and dto.bae005End != ''">
-            and v.bae005 <![CDATA[ <= ]]> #{dto.bae005End}||' 23:59:59'
+            and v.bae005 <![CDATA[ <= ]]> CONCAT(#{dto.bae005End},' 23:59:59')
         </if>
 
         order by  v.bae005 desc

+ 3 - 3
zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/ZphYdMapper.xml

@@ -7,7 +7,7 @@
         ydzt              as "ydzt",
         zphbh             as "zphbh",
         zphmc             as "zphmc",
-        jbrqc||' '||kssj||' ~ '||jbrqz||' ' ||jssj            as "cxsj",
+        jbrqc||' '||kssj||' ~ '||jbrqz||' '||jssj as "cxsj",
         jbrqc             as "jbrqc",
         jbcs              as "jbcs",
         cs                as "cs",
@@ -202,14 +202,14 @@
         from v_rs_rlzy_zwwzgl
         where rs_rlzy_zwgl_lsh = #{map.rsrlzyzwgllsh}
           and hsh = #{map.hsh}
-        order by to_number(lsh)
+        order by CAST(lsh AS INT)
     </select>
 
     <select id="getDixtinctHshList" parameterType="String" resultType="String">
         select distinct hsh
         from v_rs_rlzy_zwwzgl
         where rs_rlzy_zwgl_lsh = #{rsrlzyzwgllsh}
-        order by to_number(hsh)
+        order by CAST(hsh AS INT)
     </select>
 
     <select id="getzyxxList" parameterType="String" resultType="HashMap">

+ 41 - 41
zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/ZphglMapper.xml

@@ -18,19 +18,19 @@
         a.cbdw,
                (case
                     when (a.zphzt = '0' and
-                          to_date(a.jbrqc || ' ' || a.kssj, 'YYYY-MM-DD HH24:MI:SS') >
-                          sysdate) then
+                          to_date(CONCAT(a.jbrqc, CONCAT(' ', a.kssj)), 'YYYY-MM-DD HH24:MI:SS') >
+                          SYSDATE) then
                         '1'
                     when (zphzt = '0' and
-                          ((to_date(a.jbrqz || ' ' || a.jssj,
-                                    'YYYY-MM-DD HH24:MI:SS') > sysdate) and
-                           (sysdate >
-                            to_date(a.jbrqc || ' ' || a.kssj,
+                          ((to_date(CONCAT(a.jbrqz, CONCAT(' ', a.jssj)),
+                                    'YYYY-MM-DD HH24:MI:SS') > SYSDATE) and
+                           (SYSDATE >
+                            to_date(CONCAT(a.jbrqc, CONCAT(' ', a.kssj)),
                                     'YYYY-MM-DD HH24:MI:SS')))) then
                         '2'
                     when (a.zphzt = '1' or
-                          sysdate >
-                          to_date(a.jbrqz || ' ' || a.jssj, 'YYYY-MM-DD HH24:MI:SS')) then
+                          SYSDATE >
+                          to_date(CONCAT(a.jbrqz, CONCAT(' ', a.jssj)), 'YYYY-MM-DD HH24:MI:SS')) then
                         '3'
                     else
                         ''
@@ -53,19 +53,19 @@
         a.bmzt,
         (case
         when (a.zphzt = '0' and
-        to_date(a.jbrqc || ' ' || a.kssj, 'YYYY-MM-DD HH24:MI:SS') >
-        sysdate) then
+        to_date(CONCAT(a.jbrqc,CONCAT(' ',a.kssj)), 'YYYY-MM-DD HH24:MI:SS') >
+        SYSDATE) then
         '1'
         when (zphzt = '0' and
-        ((to_date(a.jbrqz || ' ' || a.jssj,
-        'YYYY-MM-DD HH24:MI:SS') > sysdate) and
-        (sysdate >
-        to_date(a.jbrqc || ' ' || a.kssj,
+        ((to_date(CONCAT(a.jbrqz,CONCAT(' ',a.jssj)),
+        'YYYY-MM-DD HH24:MI:SS') > SYSDATE) and
+        (SYSDATE >
+        to_date(CONCAT(a.jbrqc,CONCAT(' ',a.kssj)),
         'YYYY-MM-DD HH24:MI:SS')))) then
         '2'
         when (a.zphzt = '1' or
-        sysdate >
-        to_date(a.jbrqz || ' ' || a.jssj, 'YYYY-MM-DD HH24:MI:SS')) then
+        SYSDATE >
+        to_date(CONCAT(a.jbrqz,CONCAT(' ',a.jssj)), 'YYYY-MM-DD HH24:MI:SS')) then
         '3'
         else
         ''
@@ -88,7 +88,7 @@
         <if test="zphjblx != null and zphjblx != ''">
             and a.zphjblx = #{zphjblx}
         </if>
-        order by a.ZDSJ desc nulls last,a.jbrqc)d where d.zphztu !='3'
+        order by a.ZDSJ desc,a.jbrqc)d where d.zphztu !='3'
     </select>
 
 
@@ -107,19 +107,19 @@
    from (select a.*,
         (case
         when (a.zphzt = '0' and
-        to_date(a.jbrqc || ' ' || a.kssj, 'YYYY-MM-DD HH24:MI:SS') >
-        sysdate) then
+        to_date(CONCAT(a.jbrqc,CONCAT(' ',a.kssj)), 'YYYY-MM-DD HH24:MI:SS') >
+        SYSDATE) then
         '1'
         when (zphzt = '0' and
-        ((to_date(a.jbrqz || ' ' || a.jssj,
-        'YYYY-MM-DD HH24:MI:SS') > sysdate) and
-        (sysdate >
-        to_date(a.jbrqc || ' ' || a.kssj,
+        ((to_date(CONCAT(a.jbrqz,CONCAT(' ',a.jssj)),
+        'YYYY-MM-DD HH24:MI:SS') > SYSDATE) and
+        (SYSDATE >
+        to_date(CONCAT(a.jbrqc,CONCAT(' ',a.kssj)),
         'YYYY-MM-DD HH24:MI:SS')))) then
         '2'
         when (a.zphzt = '1' or
-        sysdate >
-        to_date(a.jbrqz || ' ' || a.jssj, 'YYYY-MM-DD HH24:MI:SS')) then
+        SYSDATE >
+        to_date(CONCAT(a.jbrqz,CONCAT(' ',a.jssj)), 'YYYY-MM-DD HH24:MI:SS')) then
         '3'
         else
         ''
@@ -147,19 +147,19 @@
         a.jbrqc,a.jbrqz,a.kssj,a.jssj,a.jbcs,
                (case
                     when (a.zphzt = '0' and
-                          to_date(a.jbrqc || ' ' || a.kssj, 'YYYY-MM-DD HH24:MI:SS') >
-                          sysdate) then
+                          to_date(CONCAT(a.jbrqc, CONCAT(' ', a.kssj)), 'YYYY-MM-DD HH24:MI:SS') >
+                          SYSDATE) then
                         '1'
                     when (zphzt = '0' and
-                          ((to_date(a.jbrqz || ' ' || a.jssj,
-                                    'YYYY-MM-DD HH24:MI:SS') > sysdate) and
-                           (sysdate >
-                            to_date(a.jbrqc || ' ' || a.kssj,
+                          ((to_date(CONCAT(a.jbrqz, CONCAT(' ', a.jssj)),
+                                    'YYYY-MM-DD HH24:MI:SS') > SYSDATE) and
+                           (SYSDATE >
+                            to_date(CONCAT(a.jbrqc, CONCAT(' ', a.kssj)),
                                     'YYYY-MM-DD HH24:MI:SS')))) then
                         '2'
                     when (a.zphzt = '1' or
-                          sysdate >
-                          to_date(a.jbrqz || ' ' || a.jssj, 'YYYY-MM-DD HH24:MI:SS')) then
+                          SYSDATE >
+                          to_date(CONCAT(a.jbrqz, CONCAT(' ', a.jssj)), 'YYYY-MM-DD HH24:MI:SS')) then
                         '3'
                     else
                         ''
@@ -180,19 +180,19 @@
    from (select a.*,
                 (case
                      when (a.zphzt = '0' and
-                           to_date(a.jbrqc || ' ' || a.kssj, 'YYYY-MM-DD HH24:MI:SS') >
-                           sysdate) then
+                           to_date(CONCAT(a.jbrqc, CONCAT(' ', a.kssj)), 'YYYY-MM-DD HH24:MI:SS') >
+                           SYSDATE) then
                          '1'
                      when (zphzt = '0' and
-                           ((to_date(a.jbrqz || ' ' || a.jssj,
-                                     'YYYY-MM-DD HH24:MI:SS') > sysdate) and
-                            (sysdate >
-                             to_date(a.jbrqc || ' ' || a.kssj,
+                           ((to_date(CONCAT(a.jbrqz, CONCAT(' ', a.jssj)),
+                                     'YYYY-MM-DD HH24:MI:SS') > SYSDATE) and
+                            (SYSDATE >
+                             to_date(CONCAT(a.jbrqc, CONCAT(' ', a.kssj)),
                                      'YYYY-MM-DD HH24:MI:SS')))) then
                          '2'
                      when (a.zphzt = '1' or
-                           sysdate >
-                           to_date(a.jbrqz || ' ' || a.jssj, 'YYYY-MM-DD HH24:MI:SS')) then
+                           SYSDATE >
+                           to_date(CONCAT(a.jbrqz, CONCAT(' ', a.jssj)), 'YYYY-MM-DD HH24:MI:SS')) then
                          '3'
                      else
                          ''

+ 4 - 4
zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/ZwxxMapper.xml

@@ -77,7 +77,7 @@
         and a.sftjnwsh = '1' and a.fbzt = '1' and a.zwzt = '1' and a.shjg = '1' and a.ts_yxbz = '1'
         and b.qyxx_shzt = '1'
         <if test="dto.keyword != null and dto.keyword != ''">
-            and (a.ZWMC LIKE '%'||#{dto.keyword}||'%' OR b.GSMC LIKE '%'||#{dto.keyword}||'%')
+            and (a.ZWMC LIKE CONCAT('%',#{dto.keyword}) OR b.GSMC LIKE CONCAT('%',#{dto.keyword}))
         </if>
         <if test="dto.rq != null and dto.rq != ''">
             <choose>
@@ -90,7 +90,7 @@
             </choose>
         </if>
         <if test="dto.hylb != null and dto.hylb != ''">
-            and a.ZPGZ like '%'||#{dto.hylb}||'%'
+            and a.ZPGZ like CONCAT('%',#{dto.hylb})
         </if>
         <if test="dto.zygz != null and dto.zygz != ''">
             and a.ZPGZ = #{dto.zygz}
@@ -309,7 +309,7 @@
         and a.sftjnwsh = '1' and a.fbzt = '1' and a.zwzt = '1' and a.shjg = '1' and a.ts_yxbz = '1'
         and b.qyxx_shzt = '1'
         <if test="dto.keyword != null and dto.keyword != ''">
-            and (a.ZWMC LIKE '%'||#{dto.keyword}||'%' OR b.GSMC LIKE '%'||#{dto.keyword}||'%')
+            and (a.ZWMC LIKE CONCAT('%',#{dto.keyword}) OR b.GSMC LIKE CONCAT('%',#{dto.keyword}))
         </if>
         <if test="dto.rq != null and dto.rq != ''">
             <choose>
@@ -322,7 +322,7 @@
             </choose>
         </if>
         <if test="dto.hylb != null and dto.hylb != ''">
-            and a.ZPGZ like '%'||#{dto.hylb}||'%'
+            and a.ZPGZ like CONCAT('%',#{dto.hylb})
         </if>
         <if test="dto.zygz != null and dto.zygz != ''">
             and a.ZPGZ = #{dto.zygz}

+ 9 - 9
zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/entity/ZzzdMapper.xml

@@ -16,20 +16,20 @@
         from (select g.*,
         (case
         when (g.zphzt = '0' and
-        to_date(g.jbrqc || ' ' || g.kssj,
-        'YYYY-MM-DD HH24:MI:SS') > sysdate) then
+        to_date(CONCAT(g.jbrqc,CONCAT(' ',g.kssj)),
+        'YYYY-MM-DD HH24:MI:SS') > SYSDATE) then
         '1'
         when (g.zphzt = '0' and
-        ((to_date(g.jbrqz || ' ' || g.jssj,
+        ((to_date(CONCAT(g.jbrqz,CONCAT(' ',g.jssj)),
         'YYYY-MM-DD HH24:MI:SS') >
-        sysdate) and
-        (sysdate >
-        to_date(g.jbrqc || ' ' || g.kssj,
+        SYSDATE) and
+        (SYSDATE >
+        to_date(CONCAT(g.jbrqc,CONCAT(' ',g.kssj)),
         'YYYY-MM-DD HH24:MI:SS')))) then
         '2'
         when (g.zphzt = '1' or
-        sysdate >
-        to_date(g.jbrqz || ' ' || g.jssj,
+        SYSDATE >
+        to_date(CONCAT(g.jbrqz,CONCAT(' ',g.jssj)),
         'YYYY-MM-DD HH24:MI:SS')) then
         '3'
         else
@@ -121,7 +121,7 @@
         c.aae006 as "lxdz",
         b.czhm as "czhm",
         d.hcmc as "hcmc",
-        (select to_char(count(rs_zwwz_lsh))
+               (select TO_CHAR(count(rs_zwwz_lsh))
         from v_rs_rlzy_zwwzyysh t1
         where t1.rs_rlzy_qyxx_lsh = a.rs_rlzy_qyxx_lsh and t1.rs_rlzy_hcgl_lsh = a.rs_rlzy_hcgl_lsh) as "zws"
         from v_rs_rlzy_zwwzyysh a, v_rs_rlzy_qyxx b, v_tyrz_user_dwjbxx c, v_rs_rlzy_hcgl d

+ 2 - 1
zjrs-service-backend/src/main/java/com/zjrs/ggfw/sggfw/entity/GrJbxxMapper.xml

@@ -48,7 +48,8 @@
                substr(AAC301, 1, 6)   as                 AAF016,
                b.xgsj
         from ac01 a,
-             RS_RLZY_SJSB_PUSHDATAS b,RS_RLZY_SJSB_IDDZ c
+             RS_RLZY_SJSB_PUSHDATAS b,
+             RS_RLZY_SJSB_IDDZ c
         where b.datatype = '07'
           and a.ztid = b.sid
           and c.sid = b.sid

+ 1 - 1
zjrs-service-backend/src/main/java/com/zjrs/ggfw/sggfw/entity/RsrlzyJkIddzMapper.xml

@@ -8,7 +8,7 @@
     </insert>
 
     <select id="getTId" resultType="String">
-            select SEQ_RS_RLZY_SJSB_IDDZ.Nextval
+        select SEQ_RS_RLZY_SJSB_IDDZ.NEXTVAL
     </select>
 
 </mapper>