1

mjava-kuaikeli/src/main/java/com/malk/kuaikeli/controller/SupplierMaterialController.java

@@ -7,14 +7,19 @@ import com.malk.kuaikeli.entity.SupplierMaterial;
 import com.malk.kuaikeli.listener.SupplierMaterialDataListener;
 import com.malk.kuaikeli.mapper.SupplierMaterialMapper;
 import com.malk.kuaikeli.service.SupplierMaterialService;
+import com.malk.server.aliwork.YDConf;
+import com.malk.server.aliwork.YDParam;
+import com.malk.server.aliwork.YDSearch;
 import com.malk.server.common.McR;
 import com.malk.server.common.Page;
+import com.malk.service.aliwork.YDClient;
 import com.malk.utils.PublicUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -27,6 +32,9 @@ public class SupplierMaterialController {
 
     @Autowired
     private SupplierMaterialService supplierMaterialService;
+    @Autowired
+    private YDClient ydClient;
+
 
     @PostMapping("/upload")
     public McR upload(@RequestParam(value="file")MultipartFile file) throws IOException {
@@ -62,5 +70,14 @@ public class SupplierMaterialController {
         return supplierMaterialService.getList(current,size);
     }
 
+    @GetMapping("/getYcl")
+    public McR getYcl(@RequestParam() String yclId){
+        YDSearch ydSearch=new YDSearch("textField_llkb7kd2",yclId,"原材料编号", YDSearch.Type.TEXT_FIELD,YDSearch.Operator.EQ);
+        List<Map> list2=(List<Map>) ydClient.queryData(YDParam.builder().formUuid("FORM-E6766M811CKD2PIXEAKOM9S2DKBM2PBQU1MLL5").searchCondition(JSONObject.toJSONString(
+                Arrays.asList(ydSearch)
+        )).build(), YDConf.FORM_QUERY.retrieve_list).getData();
+        return McR.success(list2);
+    }
+
 
 }

mjava-kuaikeli/src/test/java/com/malk/kuaikeli/DdTest.java

@@ -7,6 +7,7 @@ import com.malk.kuaikeli.service.KKLService;
 import com.malk.kuaikeli.service.SupplierMaterialService;
 import com.malk.server.aliwork.YDConf;
 import com.malk.server.aliwork.YDParam;
+import com.malk.server.aliwork.YDSearch;
 import com.malk.service.aliwork.YDClient;
 import com.malk.utils.UtilMap;
 import lombok.extern.slf4j.Slf4j;
@@ -112,4 +113,14 @@ public class DdTest {
             }
         }
     }
+
+
+    @Test
+    public void getYdData(){
+        YDSearch ydSearch=new YDSearch("textField_llkb7kd2","XKL184","原材料编号", YDSearch.Type.TEXT_FIELD,YDSearch.Operator.EQ);
+        List<Map> list2=(List<Map>) ydClient.queryData(YDParam.builder().formUuid("FORM-E6766M811CKD2PIXEAKOM9S2DKBM2PBQU1MLL5").searchCondition(JSONObject.toJSONString(
+                Arrays.asList(ydSearch)
+        )).build(), YDConf.FORM_QUERY.retrieve_list).getData();
+        log.info("list2:{}",list2);
+    }
 }

mjava-pake/src/main/java/com/malk/pake/controller/DingAlibtripController.java

@@ -43,7 +43,7 @@ public class DingAlibtripController {
         }catch (Exception e){
             e.printStackTrace();
         }
-        create(param.getString("projectName"),param.getString("projectId"),param.getString("userId"));
+        create(param.getString("projectName"),param.getString("projectId"),String.valueOf(param.getJSONArray("userId")));
         return McR.success(result);
     }
 

mjava-pake/src/test/java/com/malk/pake/DingTest.java

@@ -89,6 +89,15 @@ public class DingTest {
         }while (i<t);
     }
 
+    @Test
+    public void  ttt(){
+        String aa="{\"projectName\":\"安徽电信华视网聚内容运营支撑\",\"projectId\":\"XY-DY-2024024\",\"userId\":[\"01254038076338840748\"]}";
+
+        JSONObject param=JSONObject.parseObject(aa);
+        // {"projectName":"安徽电信华视网聚内容运营支撑","projectId":"XY-DY-2024024","userId":["01254038076338840748"]}
+        create(param.getString("projectName"),param.getString("projectId"),param.getString("userId"));
+    }
+
     private void create(String name,String id,String userId){
         ddClient_workflow.doProcessInstances(ddClient.getAccessToken(),"17104651870654620","PROC-27EE84F7-EA7E-460C-B9F4-21D54DFD11AA", Arrays.asList(
                 dataName(name),dataId(id),dataPeople(userId)