更新支付申请字段信息

mjava-jiuyousimu/src/main/java/com/malk/jiuyousimu/controller/DLController.java

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -62,7 +63,26 @@ public class DLController {
     McR testToken(@RequestParam("id") String processInstanceId) {
         String token = ddClient.getAccessToken(APP_EKY, APP_SECRET);
         Map processData = ddClient_workflow.getProcessInstanceId(token, processInstanceId);
-        documentService.saveCost(processData);
+        log.info("开始执行回调:{}",processInstanceId);
+
+        List<Map> formComponentValues = (List<Map>) processData.get("formComponentValues");
+        String type = "";
+        for (int i = 0; i < formComponentValues.size(); i++) {
+            Object componentType = formComponentValues.get(i).get("componentType");
+            if (!"TextNote".equals(componentType) && !"TableField".equals(componentType)){
+                String name = formComponentValues.get(i).get("name").toString();
+                String value = formComponentValues.get(i).get("value").toString();
+                if ("报销类型".equals(name)){
+                    type = value;
+                    break;
+                }
+            }
+        }
+        if ("差旅费报销".equals(type)){
+            documentService.saveTrip(processData);
+        } else if ("费用报销".equals(type)) {
+            documentService.saveCost(processData);
+        }
         return McR.success();
     }
 
@@ -120,7 +140,7 @@ public class DLController {
         Map header = UtilServlet.getHeaders(request);
         log.info("流程发起, {}, {}", data, header);
         McException.assertException(!"dingspvmfolrjzhak6ge".equals(header.get("authorization")), McREnum.NOT_AUTHORIZED);
-            return McR.success();
+        return McR.success();
     }
 
 }

mjava-jiuyousimu/src/main/java/com/malk/jiuyousimu/schedule/ScheduleTask.java

@@ -35,7 +35,7 @@ public class ScheduleTask {
 
     @Scheduled(cron = "0 0/5 * * * ?")
     void viewNotice(){
-        log.info("每30分钟获取供应商数据");
+        log.info("每5分钟获取同步付款数据");
         documentService.viewNotice();
     }
 

mjava-jiuyousimu/src/main/java/com/malk/jiuyousimu/service/Impl/DocumentServiceImpl.java

@@ -432,9 +432,9 @@ public class DocumentServiceImpl implements DocumentService {
                                     case "税率": costDetail.setFTaxRate(UtilMap.getDouble(jsonObject,"value"));break;
                                     case "发票类型": costDetail.setFInvoiceType(UtilMap.getString(jsonObject,"label"));break;
                                     case "税额": costDetail.setFTaxAmt(UtilMap.getDouble(jsonObject,"value"));break;
-                                    case "非税金额": costDetail.setFTaxSubmitAmt(UtilMap.getDouble(jsonObject,"value"));break;
+//                                    case "非税金额": costDetail.setFTaxSubmitAmt(UtilMap.getDouble(jsonObject,"value"));break;
                                     case "申请报销金额": costDetail.setFExpenseAmount(UtilMap.getDouble(jsonObject,"value"));
-//                                        costDetail.setFTaxSubmitAmt(UtilMap.getDouble(jsonObject,"value"));
+                                        costDetail.setFTaxSubmitAmt(UtilMap.getDouble(jsonObject,"value"));
                                     break;
                                 }
                             }

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

@@ -44,7 +44,7 @@ kingdee:
   # 第三方系统登录授权的应用密钥
   X-KDApi-AppSec: d1faa820433d4b42957300da869f1262
   # 服务Url地址(公有云统一走网关sdk底层已处理，无需传X-KDApi-ServerUrl,下面这行需要注释)
-  X-KDApi-ServerUrl: http://win-dokf98lkhoo.jiuyoufund.com:8085/k3cloud
+  X-KDApi-ServerUrl: http://kingdee.jiuyoufund.com:17863/k3cloud
   # 账套语系，默认2052
   # X-KDApi-LCID: 2052
   # 组织编码，启用多组织时配置对应的组织编码才有效