Merge remote-tracking branch 'origin/master'

mjava-fenggefushi/src/main/java/com/malk/fenggefushi/controller/HeiHuOrderController.java

@@ -96,7 +96,7 @@ public class HeiHuOrderController {
     /*todo：定时抓取采购订单*/
     @SneakyThrows
     @PostMapping("/test12")
-//    @Scheduled(cron = "0 */5 * * * ?")
+    @Scheduled(cron = "0 */5 * * * ?")
     McR purchaseSchedule(){
         List<Map<String, Object>> dataList = huOrderService.queryAllPurchase();
 

mjava-fenggefushi/src/main/java/com/malk/fenggefushi/service/Impl/HeiHuOrderServiceImpl.java

@@ -1404,7 +1404,8 @@ public class HeiHuOrderServiceImpl implements HeiHuOrderService {
                                     List<Map> sonList = ydService.queryDetails(YDParam.builder()
                                             .appType(ydConf.getAppType()).systemToken(ydConf.getSystemToken())
                                             .formInstanceId(UtilMap.getString(oldDataList.get(0),"textField_mmx9gycu"))
-                                            .formUuid("FORM-6B1ADCF1439442448E90B9D46548319440Y5")
+                                            .formUuid("FORM-3A54B12BE3D241218A75242B935F2987YWV2")
+//                                            .formUuid("FORM-6B1ADCF1439442448E90B9D46548319440Y5")
                                             .tableFieldId("tableField_ml6g7k5d")
                                             .build());
                                     if (ObjectUtil.isNotNull(sonList) && sonList.size() > 0){
@@ -1419,7 +1420,8 @@ public class HeiHuOrderServiceImpl implements HeiHuOrderService {
                                     List<Map> sonFaxList = ydService.queryDetails(YDParam.builder()
                                             .appType(ydConf.getAppType()).systemToken(ydConf.getSystemToken())
                                             .formInstanceId(UtilMap.getString(oldDataList.get(0),"textField_mmx9gycu"))
-                                            .formUuid("FORM-6B1ADCF1439442448E90B9D46548319440Y5")
+                                            .formUuid("FORM-3A54B12BE3D241218A75242B935F2987YWV2")
+//                                            .formUuid("FORM-6B1ADCF1439442448E90B9D46548319440Y5")
                                             .tableFieldId("tableField_ml7ch2pj")
                                             .build());
                                     if (ObjectUtil.isNotNull(sonFaxList) && sonFaxList.size() > 0){
@@ -1466,7 +1468,8 @@ public class HeiHuOrderServiceImpl implements HeiHuOrderService {
                             String userId = getDDToken(purchaserName);
                             ydClient.operateData(YDParam.builder()
                                     .appType(ydConf.getAppType()).systemToken(ydConf.getSystemToken())
-                                    .formUuid("FORM-6B1ADCF1439442448E90B9D46548319440Y5")  // 高毛利率使用原表单
+                                    .formUuid("FORM-3A54B12BE3D241218A75242B935F2987YWV2")  // 高毛利率使用原表单
+//                                    .formUuid("FORM-6B1ADCF1439442448E90B9D46548319440Y5")  // 高毛利率使用原表单
                                     .userId(userId)
                                     .formDataJson(JSON.toJSONString(formdataHigh))
                                     .build(), YDConf.FORM_OPERATION.start).toString();
@@ -1509,7 +1512,8 @@ public class HeiHuOrderServiceImpl implements HeiHuOrderService {
                             // ========== 修改点9：如果低毛利率需要不同表单，可以在这里修改formUuid ==========
                             ydClient.operateData(YDParam.builder()
                                     .appType(ydConf.getAppType()).systemToken(ydConf.getSystemToken())
-                                    .formUuid("FORM-6B1ADCF1439442448E90B9D46548319440Y5")  // 如果需要不同流程，替换这里的UUID
+                                    .formUuid("FORM-3A54B12BE3D241218A75242B935F2987YWV2")  // 如果需要不同流程，替换这里的UUID
+//                                    .formUuid("FORM-6B1ADCF1439442448E90B9D46548319440Y5")  // 如果需要不同流程，替换这里的UUID
                                     .userId(userId)
                                     .formDataJson(JSON.toJSONString(formdataLow))
                                     .build(), YDConf.FORM_OPERATION.start).toString();

mjava-zhongche/src/main/java/com/malk/zhongche/service/impl/ZhongcheServiceImpl.java

@@ -340,6 +340,7 @@ public class ZhongcheServiceImpl implements ZhongcheService {
 
     @Override
     public McR finishTask(Map map) {
+        log.info("审批通过推送TB：{}",JSONObject.toJSONString(map));
         MDC.put("MDC_KEY_PID","1002");
 
         String formInstId = UtilMap.getString(map, "formInstId");
@@ -460,6 +461,7 @@ public class ZhongcheServiceImpl implements ZhongcheService {
                         String tfsId = UtilMap.getString(tfsMap, "id");
                         //完成tb任务
                         tbClient.updateTaskFlowStatus(taskId, tbOperatorId, tfsId,null);
+                        log.info("推送成功：{}",JSONObject.toJSONString(map));
                     }
                 }
             }

mjava-zhongche/src/main/resources/application-dev.yml

@@ -29,7 +29,7 @@ aliwork:
 teambition:
   AppID: 6a98d68e9122a8bf6f8c5dfe
   AppSecret: ElXVfDIyOJiktuDhWoFHhvmiftAfrjsj
-  OperatorId: 622ee3450cf3bb5e1a486f1f
+  OperatorId: 67ce737aaec2f7379c7bbf6f
   TenantId: 658a6467d87ead477d2d3f9d
 
 file:

mjava-zhongche/src/main/resources/application-prod.yml

@@ -34,7 +34,7 @@ aliwork:
 teambition:
   AppID: 6a98d68e9122a8bf6f8c5dfe
   AppSecret: ElXVfDIyOJiktuDhWoFHhvmiftAfrjsj
-  OperatorId: 622ee3450cf3bb5e1a486f1f
+  OperatorId: 67ce737aaec2f7379c7bbf6f
   TenantId: 658a6467d87ead477d2d3f9d
 
 file: