Merge branch 'dev' into pre-production

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java

@@ -200,6 +200,7 @@ public class DistributionDatarepair {
 			Long id = entries.getLong("singnforId");
 
 			Map<String, Object> map = distributionSignforClient.clerkCheckPushData(id);
+			log.info(">>> 推送失败  map :{}",map);
 			Boolean b = (Boolean) map.get("result");
 			if (b != null && b) {
 				warehouseMappingDataMapper.updateClearSignforStatus(id, entries.getLong("warehouseId"), 1);
@@ -225,6 +226,7 @@ public class DistributionDatarepair {
 		Map<String, Object> map = distributionSignforClient.clerkCheckPushData(Long.parseLong(params));
 		Long id = Long.parseLong(params);
 		Boolean b = (Boolean) map.get("result");
+		log.info(">>> 推送失败  map :{}",map);
 		if (b != null && b) {
 			warehouseMappingDataMapper.updateClearSignforStatusBysignforId(Long.parseLong(params), 1);
 			log.info(">>> 推送成功 {}", Long.parseLong(params));

blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml

@@ -356,8 +356,8 @@
     </update>
     <update id="updateClearSignforRemarks">
         update clear_singnfor_status_record
-        set  singnfor_id= #{singnforId}
-        where remarks = #{remarks}
+        set remarks = #{remarks}
+        where singnfor_id= #{singnforId}
     </update>
 
     <select id="findPackageTraysInfo" resultType="com.logpm.patch.vo.PackageTrayInfoVO">