处理Sys_SAPreturnNo、HROCPeople、HROCJob数据量不一致的问题

src/main/java/com/huazheng/project/greenplum/service/impl/OtherJobServiceImpl.java

@@ -73,6 +73,12 @@ public class OtherJobServiceImpl {
 					String execute = redis1Template.execute(script, keys, item.getRowids().toString(), json.toString());
 					log.info("标记时间回写 --> " + execute);
 				});
+			} else { 
+				// 如果是空的，说明再源库中没有找到最新的数据
+				// 由于此表没有没有自增列，同时数据量不多，所以把新增流程重置
+				opsForValue.set("huazheng:PersonComp:sendcount", "0"); // 重置
+				opsForValue.set("huazheng:PersonComp:receivecount", "0"); // 重置
+				opsForValue.set("huazheng:PersonComp:rowids", "0"); // 重置
 			}
 		}
 	}

src/main/resources/mapper/mssql/CrmMapper_mssql.xml

@@ -22,7 +22,7 @@
 		from "Biz_销售预测流程" a
 			left join "Biz_销售预测流程_MX" b on a.SYS_INCIDENT = b.SYS_INCIDENT
 		where a.id > #{id} and b.id is not null
-		GROUP BY a.id, a.shenQingR, a.sys_Incstatus, a.sys_Processname, a.sys_Incident, a.shenQingRBM, a.yuCeLXt, a.kaiShiSJ, a.jieShuSJ, a.shenQingRLN
+		GROUP BY a.id, a.shenQingR, a.sys_Incstatus, a.sys_Processname, a.sys_Incident, a.shenQingRBM, a.yuCeLXt, a.kaiShiSJ, a.jieShuSJ, a.shenQingRLN, a.sys_updatetime
     </select>
     <select id="selectSampleApplicationProcessNew" parameterType="SampleApplicationProcess" resultType="SampleApplicationProcess">
 		select top 20 

src/main/resources/mapper/mssql2/HzcrmMapper_mssql2.xml

@@ -18,7 +18,7 @@
     </select>
     <select id="selectSysSAPreturnNoNew" parameterType="SysSAPreturnNo" resultType="SysSAPreturnNo">
 		select top 20 a.* from (
-			select ROW_NUMBER() OVER(ORDER BY id) as rowids,
+			select id as rowids,
 				id,processName,shiLiH,sapNo,chuangJianSJ
 			from Sys_SAPreturnNo
 		) a where a.rowids &gt; #{rowids}

src/main/resources/mapper/mssql3/Cinderellaw2Mapper_mssql3.xml

@@ -46,8 +46,14 @@
 			where a.orgstatus = '0'
 		) r1 on r.ParentID = r1.bid
 		<where>
-	    	<if test="uposnr != null  and uposnr != ''">r1.posnr = #{uposnr}</if>
-	    	<if test="dposnr != null  and dposnr != ''">and r.posnr = #{dposnr}</if>
+	    	<if test="uname != null and uname != ''">and r1.aname = #{uname}</if>
+	    	<if test="uposnr != null and uposnr != ''">and r1.posnr = #{uposnr}</if>
+	    	<if test="dname != null and dname != ''">and r.aname = #{dname}</if>
+	    	<if test="dposnr != null and dposnr != ''">and r.posnr = #{dposnr}</if>
+	    	<if test="uname == null">and r1.aname is null</if>
+	    	<if test="uposnr == null">and r1.posnr is null</if>
+	    	<if test="dname == null">and r.aname is null</if>
+	    	<if test="dposnr == null">and r.posnr is null</if>
     	</where>
     </select>