pruple_boy hace 9 meses
padre
commit
e9707ee761

+ 3 - 1
mjava-hake/src/main/java/com/malk/hake/controller/HKController.java

@@ -66,7 +66,9 @@ public class HKController {
 
         Map data = UtilServlet.getParamMap(request);
         log.info("审批回调, {}", JSON.toJSONString(data));
-        hkClient.callbackProcess(data);
+        if (!"Y".equals(data.get("Status"))) { // 询价\报价
+            hkClient.callbackProcess(data);
+        }
         return McR.success();
     }
 

+ 2 - 1
mjava/src/main/java/com/malk/server/aliwork/YDConf.java

@@ -71,8 +71,9 @@ public class YDConf {
      */
     public enum FORM_OPERATION {
         create,
-        delete,             // 传入为body, 文档为param
+        delete,                     // 传入为body, 文档为param
         update,
+        upsert,                     // fixme: 不支持新增字段更新, 若有可先更新版本后执行 [无版本和更新json参数]
         multi_create,               // 批量操作
         delete_batch,               // 批量删除
         multi_update,               // 批量更新

+ 3 - 0
mjava/src/main/java/com/malk/service/aliwork/impl/YDClientImpl.java

@@ -62,6 +62,9 @@ public class YDClientImpl implements YDClient {
             case update:
                 ddr_new = (DDR_New) UtilHttp.doPut(getRequestUrl("/forms/instances"), ddClient.initTokenHeader(), bodys, DDR_New.class);
                 break;
+            case upsert:
+                ddr_new = (DDR_New) UtilHttp.doPost(this.getRequestUrl("/forms/instances/insertOrUpdate"), this.ddClient.initTokenHeader(), bodys, DDR_New.class);
+
             case delete:
                 ddr_new = (DDR_New) UtilHttp.doDelete(getRequestUrl("/forms/instances"), ddClient.initTokenHeader(), bodys, DDR_New.class);
                 break;

+ 15 - 0
mjava/src/main/java/com/malk/test/TmpController.java

@@ -0,0 +1,15 @@
+package com.malk.test;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Profile;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@Profile({"dev", "test"})
+@RestController
+@RequestMapping("/tmp")
+public class TmpController {
+    
+
+}