修改sql

Signed-off-by: tangsong <86121657@qq.com>

base-server/src/main/resources/bootstrap-devmysql.yml

@@ -14,7 +14,7 @@ spring:
     restart:
       enabled: false
   datasource:
-#    type: com.alibaba.druid.pool.DruidDataSource
+    type: com.alibaba.druid.pool.DruidDataSource
     url: jdbc:mysql://172.16.0.46:3306/base?useUnicode=true&characterEncoding=UTF-8&useSSL=true&serverTimezone=GMT%2b8
 #    url: jdbc:mysql://101.36.160.140:10311/base?useUnicode=true&characterEncoding=UTF-8&useSSL=true&serverTimezone=GMT%2b8
     username: root

base-server/src/main/resources/mybatis/mapper/TzSlqyMapper.xml

@@ -161,12 +161,12 @@
             (select first 1 pj.pjjg
                 from qyxypjdc pj
                 where pj.ztmc = tz.qymc
-                and to_date(pj.pjyxq
-                , 'yyyy-MM-dd') >= to_date((select sysdate from dual)
-                , 'yyyy-MM-dd')
-                and to_date(pj.pjrq
-                , 'yyyy-MM-dd') <= to_date((select sysdate from dual)
-                , 'yyyy-MM-dd')
+                and DATE_FORMAT(pj.pjyxq
+                , '%Y-%m-%d') >= DATE_FORMAT(now()
+                , '%Y-%m-%d')
+                and DATE_FORMAT(pj.pjrq
+                , '%Y-%m-%d') <= DATE_FORMAT(now()
+                , '%Y-%m-%d')
                 and zt = '已提交'
                 order by pj.pjnd desc) x) as pjjg
         from
@@ -289,10 +289,10 @@
 
     <!--	根据统一社会信用代码获取企业相关信息-->
     <select id="getqyxxBytyshxydm" parameterType="java.lang.String" resultMap="BaseResultMap">
-		SELECT qymc, fddbr, create_date,refresh_time,zcr,
-        (select distinct p.provin_name from usercenter.BAS_AREA p where p.provin_code= txprovince) ||
-	    (select distinct p.county_name from usercenter.BAS_AREA p where p.county_code= txcity) ||
-         (select distinct p.city_name from usercenter.BAS_AREA p where p.city_code= txcity) || qytxdz as qytxdz
+    SELECT qymc, fddbr, create_date,refresh_time,zcr,
+        concat((select distinct p.provin_name from usercenter.BAS_AREA p where p.provin_code= txprovince),
+	    (select distinct p.county_name from usercenter.BAS_AREA p where p.county_code= txcity) ,
+         (select distinct p.city_name from usercenter.BAS_AREA p where p.city_code= txcity) , qytxdz) as qytxdz
         FROM TZ_SLQY
 		WHERE tyshxydm = #{kddm}
 	</select>
@@ -1393,9 +1393,9 @@
     <select id="getCompanyBytyshxydm" parameterType="java.lang.String" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List_common"></include>
-        ,(select nvl(count(0),0) from base.d_kdxxsjy where tyshxydm=tz.tyshxydm and status=1) as kqsl
-        ,(select nvl(count(distinct(gfcfdm)),0) from base.d_cfxxsjy where tyshxydm=tz.tyshxydm and status=1 and sfba=5) as cfsl
-        ,(select nvl(count(0),0) from base.d_ygxxsjy where tyshxydm=tz.tyshxydm and status=1 and sfba=5 ) as ygsl
+        ,(select ifnull(count(0),0) from base.d_kdxxsjy where tyshxydm=tz.tyshxydm and status=1) as kqsl
+        ,(select ifnull(count(distinct(gfcfdm)),0) from base.d_cfxxsjy where tyshxydm=tz.tyshxydm and status=1 and sfba=5) as cfsl
+        ,(select ifnull(count(0),0) from base.d_ygxxsjy where tyshxydm=tz.tyshxydm and status=1 and sfba=5 ) as ygsl
         from
         TZ_SLQY tz
         <where>
@@ -1405,7 +1405,8 @@
     </select>
 
     <select id="selectMaxId" resultType="java.lang.Integer">
-  	    SELECT MAX(CAST(ID AS INT)) AS ID FROM TZ_SLQY
+  	    SELECT MAX(ID) AS ID FROM TZ_SLQY
+--   	    SELECT MAX(CAST(ID AS INT)) AS ID FROM TZ_SLQY
   </select>
 
     <select id="selectByEntity" resultMap="BaseResultMap">
@@ -1482,7 +1483,7 @@
   </select>
 
     <select id="selectQyjg" resultType="com.unis.base.common.vo.TzQyjgVO">
-        SELECT * FROM TZ_QYJG  WHERE status＝１
+        SELECT * FROM TZ_QYJG  WHERE status ＝１
     </select>
 
     <select id="selectKdxx" resultType="com.unis.base.common.vo.DKdxxsjyVO">
@@ -1685,7 +1686,7 @@
             SELECT DISTINCT(tz.id)
             from TZ_SLQY tz
             left join TZ_QYLX q on tz.id = q.qyid
-            WHERE tz.status = 1 AND decode(tz.qyjd, null, 0, 1)  =1 and decode(tz.qywd, null, 0, 1) = 1
+            WHERE tz.status = 1 AND if(tz.qyjd = null, 0, 1)  =1 and if(tz.qywd =null, 0, 1) = 1
             <!-- 企业类型 -->
             <if test="qylxbh != null and qylxbh != ''">
                 and q.qylxbh LIKE concat(CONCAT('%',#{qylxbh,jdbcType=VARCHAR}) ,'%')
@@ -2063,7 +2064,7 @@
     <!--根据实体的唯一属性查询数量-->
     <select id='selectCountById' resultType='java.lang.Integer'>
         SELECT
-        COUNT(*)
+        COUNT(1)
         FROM TZ_SLQY
         <where>
             <if test='id !=null and id != ""'>
@@ -2077,9 +2078,9 @@
     <select id="getCompanyByqymc" resultType="com.unis.base.server.entity.TzSlqyDO">
         SELECT
         <include refid="Base_Column_List_common"></include>
-        ,(select nvl(count(0),0) from base.d_kdxxsjy where tyshxydm=tz.tyshxydm and status=1) as kqsl
-        ,(select nvl(count(distinct(gfcfdm)),0) from base.d_cfxxsjy where tyshxydm=tz.tyshxydm and status=1 and sfba=5) as cfsl
-        ,(select nvl(count(0),0) from base.d_ygxxsjy where tyshxydm=tz.tyshxydm and status=1 and sfba=5 ) as ygsl
+        ,(select ifnull(count(0),0) from base.d_kdxxsjy where tyshxydm=tz.tyshxydm and status=1) as kqsl
+        ,(select ifnull(count(distinct(gfcfdm)),0) from base.d_cfxxsjy where tyshxydm=tz.tyshxydm and status=1 and sfba=5) as cfsl
+        ,(select ifnull(count(0),0) from base.d_ygxxsjy where tyshxydm=tz.tyshxydm and status=1 and sfba=5 ) as ygsl
         from
         TZ_SLQY tz
         <where>
@@ -2531,7 +2532,7 @@
         update TZ_SLQY
         set
             <if test="sjcr != null">
-                sjcr = (select nvl(sum(sjcr),0)
+                sjcr = (select ifnull(sum(sjcr),0)
                         from (select a.sjcr,
                                 row_number() over(partition by a.gfcfdm order by a.refresh_time desc) as rn
                               from  base.D_CFXXSJY a
@@ -2539,7 +2540,7 @@
                               and a.sfba = '5'
                               and tyshxydm = #{tyshxydm,jdbcType=VARCHAR})
                         where rn=1),
-                zcr = (select nvl(sum(dczlrj),0)
+                zcr = (select ifnull(sum(dczlrj),0)
                         from (select a.dczlrj,
                                  row_number() over(partition by a.gfcfdm order by a.refresh_time desc) as rn
                               from  base.D_CFXXSJY a
@@ -2549,7 +2550,7 @@
                         where rn=1),
             </if>
             <if test="gr != null">
-                gr = (select nvl(sum(sjgr),0)
+                gr = (select ifnull(sum(sjgr),0)
                      from d_ygxxsjy
                      where sfba = '5'
                      and tyshxydm = #{tyshxydm,jdbcType=VARCHAR}),

base-server/src/main/resources/mybatis/mapper/XzqhMapper.xml

@@ -202,7 +202,7 @@
   <!--根据实体的某些属性查询数量-->
   <select id='selectCountByEntity' resultType='java.lang.Integer'>
     SELECT 
-    COUNT(*) 
+    COUNT(1)
     FROM TY_XZQHB
     <where>
       <!--自定义配置的检索条件-->
@@ -234,7 +234,7 @@
   <!--根据实体的唯一属性查询数量-->
   <select id='selectCountById' resultType='java.lang.Integer'>
     SELECT 
-    COUNT(*) 
+    COUNT(1)
     FROM TY_XZQHB
     <where>
       <if test='qhid !=null and qhid != ""'>
@@ -246,7 +246,7 @@
   <!--根据实体的业务唯一属性(且非指定主键数据)判断是否存在-->
   <select id='selectExistsByEntity' resultType='java.lang.Integer'>
     SELECT
-    COUNT(*) 
+    COUNT(1)
     FROM TY_XZQHB
     <where>
       <if test='qhid !=null and qhid != ""'>