Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/bean/ItfTblWorkOrderCollection0Bean.java

@@ -13,6 +13,6 @@ public class ItfTblWorkOrderCollection0Bean extends ItfTblWorkOrderCollection {
     private List<ItfTblCollectionRepair> collectionRepairList;
     private List<ItfTblCollectionRepairPart> collectionRepairPartList;
     private List<ItfTblCollectionRepairProject> collectionRepairProjectList;
-    private List<ItfTblCollectionRepair> collectionRepairSymptomReasonList;
+    private List<ItfTblCollectionRepairSymptomReason> collectionRepairSymptomReasonList;
 
 }

mall-server-api/src/main/java/com/gree/mall/manager/controller/letter/LetterController.java

@@ -205,7 +205,7 @@ public class LetterController {
     }
 
     @PostMapping("/addConfig")
-    @ApiOperation("所属科室列表新增")
+    @ApiOperation("考核涵配置修改")
     public ResponseHelper addConfig(
             @RequestBody LeConfig leConfig,
             HttpServletRequest request

mall-server-api/src/main/java/com/gree/mall/manager/logic/SyncOrderInfoLogic.java

@@ -191,6 +191,9 @@ public class SyncOrderInfoLogic {
     ItfTblWorkOrderStatusService itfTblWorkOrderStatusService;
 
     @Autowired
+    ItfTblCollectionRepairSymptomReasonService itfTblCollectionRepairSymptomReasonService;
+
+    @Autowired
     SyncMapper syncMapper;
 
 
@@ -390,7 +393,7 @@ public class SyncOrderInfoLogic {
             List<ItfTblCollectionRepair> collectionRepairList = new ArrayList<>();
             List<ItfTblCollectionRepairPart> collectionRepairPartList = new ArrayList<>();
             List<ItfTblCollectionRepairProject> collectionRepairProjectList = new ArrayList<>();
-            List<ItfTblCollectionRepair> collectionRepairSymptomReasonList = new ArrayList<>();
+            List<ItfTblCollectionRepairSymptomReason> collectionRepairSymptomReasonList = new ArrayList<>();
             List<ItfTblWorkOrderDetail> tblWorkOrderDetailList = new ArrayList<>();
 
             List<ItfTblWorkOrder> itfTblWorkOrders = new ArrayList<>();
@@ -516,7 +519,7 @@ public class SyncOrderInfoLogic {
             collectionRepairProjectList.stream().forEach(item -> item.setDownloadBatchNo(batch));
             itfTblCollectionRepairProjectService.saveBatch(collectionRepairProjectList);
             collectionRepairSymptomReasonList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblCollectionRepairService.saveBatch(collectionRepairSymptomReasonList);
+            itfTblCollectionRepairSymptomReasonService.saveBatch(collectionRepairSymptomReasonList);
 
 
             itfTblWorkOrderService.saveBatch(itfTblWorkOrders);

mall-server-api/src/main/java/com/gree/mall/manager/logic/common/WxPubNoticeLogic.java

@@ -126,7 +126,7 @@ public class WxPubNoticeLogic {
             Map<String, String> map = new HashMap<>();
             map.put("short_thing2", orderType);//工单类型
             map.put("character_string6", orderBaseId);//工单编号
-            map.put("time4", sdf.format(time));//派工时间
+            map.put("time4", sdf.format(new Date()));//派工时间
             map.put("phrase8", getPhrase(content));//需求名称
             map.put("thing16", getThing(address));//服务地址