add

src/main/java/com/zfire/jiasm/syncdata/service/OLDSystemService.java

@@ -13,4 +13,6 @@ public interface OLDSystemService {
 	
 	public void successUpdate(String tableName,String synTaskNo);
 
+	public List<Map<String, Object>> getRequeststest(String tableName,int type);
+
 }

src/main/java/com/zfire/jiasm/syncdata/service/impl/OLDSystemServiceImpl.java

@@ -35,7 +35,7 @@ public class OLDSystemServiceImpl implements OLDSystemService {
 	@Override
 	public List<Map<String, Object>> getRequests(String tableName, int type) {
 		List<Map<String, Object>> result;
-		
+
 		if(type==1) {
 			//家用空调、热水器
 			result = jdbcTemplate.queryForList(
@@ -62,6 +62,19 @@ public class OLDSystemServiceImpl implements OLDSystemService {
 	}
 
 	@Override
+	public List<Map<String, Object>> getRequeststest(String tableName, int type) {
+		List<Map<String, Object>> result;
+
+		//维修
+		result = jdbcTemplate.queryForList(
+				"SELECT * FROM " + tableName + " where worker_order_no= ? order by syn_req_time,stat ",
+				new Object[] {"B474759509881157"});
+
+		return result;
+	}
+
+
+	@Override
 	public List<Map<String, Object>> getTableDatasJoinParent(String tableName, String synTaskNo, String parentTableName,
 			String parentId, String childeIdName) {
 		if (childeIdName == null || childeIdName.trim().length() == 0) {
@@ -77,7 +90,7 @@ public class OLDSystemServiceImpl implements OLDSystemService {
 		if(tableName.trim().equalsIgnoreCase("itf_tblazwgmxsykttmmxls")
 				|| tableName.trim().equalsIgnoreCase("itf_tblazwgmxsyktfj")
 				|| tableName.trim().equalsIgnoreCase("itf_tblazwgmxjyktFj")
-				|| tableName.trim().equalsIgnoreCase("itf_tblAzWgmxQitaFj")
+				|| tableName.trim().equalsIgnoreCase("itf_tblazwgmxqitafj")
 				) {
 			log.info("SELECT a.* FROM " + tableName + " a," + parentTableName
 					+ " b where a.syn_task_no=b.syn_task_no and a.syn_task_no="+synTaskNo+" and a." + childeIdName + "="+parentId);

src/main/java/com/zfire/jiasm/syncdata/service/impl/RepairProduceDataUploadServiceImpl.java

@@ -181,7 +181,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                 List<OutJiasmToGreeUploadTaskList> result = outJiasmToGreeUploadTaskListService.lambdaQuery()
                         .eq(OutJiasmToGreeUploadTaskList::getSynStatus,0)
                         .eq(OutJiasmToGreeUploadTaskList::getUploadTaskType,uploadTaskType)
-                        // .eq(OutJiasmToGreeUploadTaskList::getSynReqId,2812L)// 测试用
+                        // .eq(OutJiasmToGreeUploadTaskList::getSynReqId,59142L)// 测试用
                         .orderByAsc(OutJiasmToGreeUploadTaskList::getSynReqId).list();
                 // 相同任务类型的数据逐个处理
                 for (OutJiasmToGreeUploadTaskList row: result){
@@ -872,7 +872,11 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                 .eq(OrderRepairDetailReason::getOrderRepairDetailId, item.getId()).list();
         for (OrderRepairDetailReason r : reasons){
             // 父级故障现象数据忽略上传
-            if (StringUtils.isEmpty(r.getRepairBugParentId()) || StringUtils.isEmpty(r.getNumber())){
+            /*if (StringUtils.isEmpty(r.getRepairBugParentId()) || StringUtils.isEmpty(r.getNumber())){
+                continue;
+            }*/
+
+            if (StringUtils.isEmpty(r.getNumber())){
                 continue;
             }
             // 修改 维修现象主键、维修明细主键

src/main/java/com/zfire/jiasm/syncdata/upload/settlement/SettlementInstallRepair.java

@@ -29,9 +29,9 @@ public class SettlementInstallRepair {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         log.info("开始维修结算数据同步: \uF0B7{}",sdf.format(new Date()));
 
-        oldSystemTask.process("维修", "itf_tblwxjsjykt", "tblWxjsJykt", new Object[] { "itf_tblwxjsjykt", "tblWxjsJykt",
-                        new String[] { "itf_tblwxjsfjjykt", "itf_tblwxjswxxmjykt", "itf_tblwxjsxxyyjykt",
-                                "itf_tblwxjspjmxjykt" },
+        oldSystemTask.process("维修", "itf_tblwxjsjykt", "tblWxjsJykt",
+                new Object[] { "itf_tblwxjsjykt", "tblWxjsJykt",
+                        new String[] { "itf_tblwxjsfjjykt", "itf_tblwxjswxxmjykt", "itf_tblwxjsxxyyjykt","itf_tblwxjspjmxjykt" },
                         new String[] { "tblWxjsFjJykt", "tblWxjsWxxmJykt", "tblWxjsXxyyJykt", "tblWxjsPjmxJykt" }, "", "", "" },
                 new Object[] { "itf_tblwxjsjykt", "tblWxjsJykt", new String[] {}, new String[] {}, "", "", "" }, false,
                 4, "id");

src/main/java/com/zfire/jiasm/syncdata/utils/OLDSystemUtil.java

@@ -40,6 +40,9 @@ public class OLDSystemUtil {
 
 		List<Map<String, Object>> result = oldSystemService.getRequests(requestTable, type);
 
+		// 测试
+		// List<Map<String, Object>> result = oldSystemService.getRequeststest(requestTable, type);
+
 		try {
 			Token token = tokenCenter.getCurrentToken();
 			for (Map<String, Object> row : result) {

src/main/resources/bootstrap-prdt.properties

@@ -402,7 +402,7 @@ tmscc=FALSE
 azuploadyscc=FALSE
 azuploadscc=FALSE
 #维修工单上传  生成需要上传的数据、生成上传任务清单列表
-wxuploadyscc=FALSE
+wxuploadyscc=TRUE
 wxuploadscc=FALSE
 #以旧换新 鉴定单、生成条码、条码上传
 yjhxjddc=FALSE
@@ -414,7 +414,7 @@ hsgdcjtmc=FALSE
 #工单数据向上同步
 datauploadc=FALSE
 #安装、维修工单入本地表
-installinc=TRUE
+installinc=FALSE
 repairinc=FALSE
 smsinselfc=FALSE
 #完工评价短信格力总部发送，自建工单联通发送，查看评价短信回复信息，自建完工评价短信联通发送，派服务人员格力发送

src/main/resources/mapper/ItfTblazwgmxqitafjCJMapper.xml

@@ -3,19 +3,19 @@
 <mapper namespace="com.zfire.jiasm.syncdata.dao.mapper.ItfTblazwgmxqitafjCJMapper">
 
     <update id="updateType" parameterType="com.zfire.jiasm.syncdata.parameter.InstallDetail">
-        update itf_tblazwgmxqitaFj set type = 13
+        update itf_tblazwgmxqitafj set type = 13
         where worker_order_no = #{request.orderNo}
           and syn_task_no = #{request.id} and type > 1 and type &lt; 5
     </update>
 
     <update id="updateType1" parameterType="com.zfire.jiasm.syncdata.parameter.InstallDetail">
-        update itf_tblazwgmxqitaFj set type = 20
+        update itf_tblazwgmxqitafj set type = 20
         where worker_order_no = #{request.orderNo}
           and syn_task_no = #{request.id} and type = 5
     </update>
 
     <update id="updateType2" parameterType="com.zfire.jiasm.syncdata.parameter.InstallDetail">
-        update itf_tblazwgmxqitaFj set fjname = '整机安装效果图'
+        update itf_tblazwgmxqitafj set fjname = '整机安装效果图'
         where worker_order_no = #{request.orderNo}
           and syn_task_no = #{request.id} and type = 20  and fjindex = 0
     </update>