修改sql

inspectiontask-server/inspectiontask-server.iml

@@ -9,6 +9,14 @@
         <webroots />
       </configuration>
     </facet>
+    <facet type="jpa" name="JPA">
+      <configuration>
+        <setting name="validation-enabled" value="true" />
+        <setting name="provider-name" value="Hibernate" />
+        <datasource-mapping />
+        <naming-strategy-map />
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
@@ -31,7 +39,7 @@
     <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" level="project" />
     <orderEntry type="module" module-name="inspectiontask-common" />
-    <orderEntry type="library" name="Maven: com.unis.springcloud:common:1.0.0" level="project" />
+    <orderEntry type="module" module-name="common (1) (com.unis.springcloud)" />
     <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.1.0.Final" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
@@ -67,7 +75,7 @@
     <orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.8" level="project" />
     <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.1" level="project" />
     <orderEntry type="library" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.12" level="project" />
-    <orderEntry type="module" module-name="inspectionplan-common" />
+    <orderEntry type="library" name="Maven: com.unis.inspectionplan:inspectionplan-common:0.0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.3.RELEASE" level="project" />

inspectiontask-server/src/main/resources/mybatis/mapper/CheckCensusMapper.xml

@@ -6,7 +6,7 @@
   <select id="getInfo" parameterType="com.unis.inspectiontask.common.vo.CheckCensusQueryVO" resultType="com.unis.inspectiontask.common.vo.CheckCensusVO">
 
 		select distinct jcdw_id,
-		(select count(*) from t_jczzy
+		(select count(1) from t_jczzy
 		where jcz_id in 
 		(select t.id 
 			from t_jcz t,t_jcrw r
@@ -16,7 +16,7 @@
 			<foreach collection="rwids" item="name" index="index" open="(" close=")" separator=",">
 			    #{name}
 			</foreach>)) as rcjcrc,
-		(select count(*) from t_jczzy
+		(select count(1) from t_jczzy
 		where jcz_id in 
 		(select t.id 
 			from t_jcz t,t_jcrw r
@@ -25,7 +25,7 @@
 			and r.jcdw_id = #{dwDm} and t.rw_id in <foreach collection="rwids" item="name" index="index" open="(" close=")" separator=",">
 			    #{name}
 			</foreach>)) as fxjcrc,
-		(select count(*) from t_jczzy
+		(select count(1) from t_jczzy
 		where jcz_id in 
 		(select t.id 
 			from t_jcz t,t_jcrw r

inspectiontask-server/src/main/resources/mybatis/mapper/PerformanceMapper.xml

@@ -54,7 +54,7 @@
   <!-- 检查次数 -->
   <select id="getPerformanceSum" parameterType="com.unis.inspectiontask.common.vo.PersonnelPerformanceQueryVO" resultType="java.lang.Integer">
     SELECT
-      NVL(SUM(DECODE(nr.JCNR_ID,#{dictCode},1,0)),0)
+    COALESCE(SUM(IF(nr.JCNR_ID = #{dictCode}, 1, 0)), 0)
     FROM  T_JCNR nr
     <where>
       nr.STATUS = 1

inspectiontask-server/src/main/resources/mybatis/mapper/TFileMapper.xml

@@ -214,7 +214,7 @@
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.unis.inspectiontask.server.example.TFileExample" resultType="java.lang.Integer" >
-    select count(*) from T_FILE
+    select count(1) from T_FILE
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>

inspectiontask-server/src/main/resources/mybatis/mapper/TJczzyMapper.xml

@@ -343,7 +343,7 @@
 	</insert>
 	
 	<insert id="batchUpdateOrSave" parameterType="java.util.List">
-	    MERGE INTO T_JCZZY zy
+	<!--    MERGE INTO T_JCZZY zy
 	    USING (
 	      <foreach collection="list" item="item" index="index" separator="union" >
 	        select 
@@ -377,7 +377,36 @@
 				zy.REFRESH_TIME = t.REFRESH_TIME
 	    	WHEN NOT MATCHED THEN
 	      	INSERT ( zy.JCZ_ID, zy.ZY_ID,zy.ZY_NAME,zy.ZYKS,zy.ZYDW,zy.ZYLX,zy.IS_CZ,zy.STATUS,zy.REFRESHER,zy.REFRESHER_CODE,zy.REFRESH_TIME)
-	      	VALUES ( t.JCZ_ID, t.ZY_ID,t.ZY_NAME,t.ZYKS,t.ZYDW,t.ZYLX,t.IS_CZ,t.STATUS,t.REFRESHER, t.REFRESHER_CODE,t.REFRESH_TIME)
+	      	VALUES ( t.JCZ_ID, t.ZY_ID,t.ZY_NAME,t.ZYKS,t.ZYDW,t.ZYLX,t.IS_CZ,t.STATUS,t.REFRESHER, t.REFRESHER_CODE,t.REFRESH_TIME)-->
+		<foreach collection="list" item="item" index="index">
+			INSERT INTO T_JCZZY (ID, JCZ_ID, ZY_ID, ZY_NAME, ZYKS, ZYDW, ZYLX, IS_CZ, STATUS, REFRESHER, REFRESHER_CODE, REFRESH_TIME)
+			VALUES (
+			#{item.id,jdbcType=INTEGER},
+			#{item.jczId,jdbcType=INTEGER},
+			#{item.zyId,jdbcType=VARCHAR},
+			#{item.zyName,jdbcType=VARCHAR},
+			#{item.zyks,jdbcType=VARCHAR},
+			#{item.zydw,jdbcType=VARCHAR},
+			#{item.zylx,jdbcType=INTEGER},
+			#{item.isCz,jdbcType=INTEGER},
+			#{item.status,jdbcType=INTEGER},
+			#{item.refresher,jdbcType=VARCHAR},
+			#{item.refresherCode,jdbcType=VARCHAR},
+			#{item.refreshTime,jdbcType=TIMESTAMP}
+			)
+			ON DUPLICATE KEY UPDATE
+			JCZ_ID = VALUES(JCZ_ID),
+			ZY_ID = VALUES(ZY_ID),
+			ZY_NAME = VALUES(ZY_NAME),
+			ZYKS = VALUES(ZYKS),
+			ZYDW = VALUES(ZYDW),
+			ZYLX = VALUES(ZYLX),
+			IS_CZ = VALUES(IS_CZ),
+			STATUS = VALUES(STATUS),
+			REFRESHER = VALUES(REFRESHER),
+			REFRESHER_CODE = VALUES(REFRESHER_CODE),
+			REFRESH_TIME = VALUES(REFRESH_TIME);
+		</foreach>
 	</insert>
 	<!-- 删除人员 -->
     <delete id="deleteByRwId" parameterType="com.unis.inspectiontask.server.entity.TJczzyDO">