approve

easydo-chengfa/src/main/java/easydo/technology/controller/ApiController.java

@@ -13,6 +13,7 @@ import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.sql.DataSource;
 
+import easydo.technology.model.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -30,14 +31,6 @@ import easydo.technology.annotation.WebLog;
 import easydo.technology.components.JdbcClient;
 import easydo.technology.enums.ChengfaEnum;
 import easydo.technology.exception.BizException;
-import easydo.technology.model.Message;
-import easydo.technology.model.Purchase;
-import easydo.technology.model.PurchaseBidNotice;
-import easydo.technology.model.PurchaseContract;
-import easydo.technology.model.PurchasePlan;
-import easydo.technology.model.Supplier;
-import easydo.technology.model.SupplierBank;
-import easydo.technology.model.SysUser;
 import easydo.technology.model.vo.ContractVo;
 import easydo.technology.model.vo.GLDMessage;
 import easydo.technology.model.vo.MDMDept;
@@ -89,6 +82,7 @@ public class ApiController {
         }
     }
 
+    // TODO: 2024-9-25 projectId
     @WebLog
     @RequestMapping(value = "/bidNotice/getList")
     public Object getNoticeList(@RequestBody Map<String, Object> map) throws Exception {
@@ -103,7 +97,7 @@ public class ApiController {
             connection = dataSource.getConnection();
 
             map.put("status", ChengfaEnum.PURCHASE_STATUS_DONE.getValue());
-            map.put("projectIdBegin", 0);
+            map.put("gldProjectIdBegin", 1);
             list = jdbcClient.getJdbcList(map, PurchaseBidNotice.class, connection);
 
             for (PurchaseBidNotice model : list) {
@@ -118,6 +112,11 @@ public class ApiController {
                 plan = jdbcClient.getJdbcModelById(plan, connection);
                 model.setContractPlanCode(plan.getContractPlanCode());
                 model.setContractPlanName(plan.getContractPlanName());
+
+                ProjectInfo projectInfo = new ProjectInfo();
+                projectInfo.setId(model.getProjectId());
+                projectInfo = jdbcClient.getJdbcModelById(projectInfo, connection);
+                model.setProjectId(projectInfo.getGldProjectId());
             }
             return new ResponseEntity<>(list, HttpStatus.OK);
         } catch (Exception e) {

easydo-chengfa/src/main/java/easydo/technology/controller/PurchaseBidNoticeController.java

@@ -6,6 +6,7 @@ import easydo.technology.components.ZeroSpringFolderComponent;
 import easydo.technology.enums.ChengfaEnum;
 import easydo.technology.exception.BizException;
 import easydo.technology.model.BusApprove;
+import easydo.technology.model.ProjectInfo;
 import easydo.technology.model.Purchase;
 import easydo.technology.model.PurchaseBidNotice;
 import easydo.technology.model.vo.GLDApproveVo;
@@ -45,6 +46,11 @@ public class PurchaseBidNoticeController {
             connection.setAutoCommit(false);
 
             if (StringUtil.isEmpty(model.getId())) {
+                ProjectInfo projectInfo = new ProjectInfo();
+                projectInfo.setId(model.getProjectId());
+                projectInfo = jdbcClient.getJdbcModelById(projectInfo, connection);
+                model.setGldProjectId(projectInfo.getGldProjectId());
+
                 model.setBusinessNo(flowNoService.getFlowNo(ChengfaEnum.FLOWNO_TYPE_PURCHASE_BID_NOTICE.getValue(), connection));
                 jdbcClient.jdbcInsert(model, connection);
             } else {
@@ -71,6 +77,11 @@ public class PurchaseBidNoticeController {
             connection.setAutoCommit(false);
 
             if (StringUtil.isEmpty(model.getId())) {
+                ProjectInfo projectInfo = new ProjectInfo();
+                projectInfo.setId(model.getProjectId());
+                projectInfo = jdbcClient.getJdbcModelById(projectInfo,connection);
+                model.setGldProjectId(projectInfo.getGldProjectId());
+
                 model.setBusinessNo(flowNoService.getFlowNo(ChengfaEnum.FLOWNO_TYPE_PURCHASE_BID_NOTICE.getValue(), connection));
                 jdbcClient.jdbcInsert(model, connection);
             } else {

easydo-chengfa/src/main/java/easydo/technology/model/ProjectInfo.java

@@ -18,5 +18,5 @@ public class ProjectInfo {
     private String projectScale;
     private Integer projectMoney;
     private String remark;
-    private Long gldDeptId;
+    private Long gldProjectId;
 }

easydo-chengfa/src/main/java/easydo/technology/model/PurchaseBidNotice.java

@@ -39,6 +39,7 @@ public class PurchaseBidNotice extends ZeroSpringFolder<PurchaseBidNotice> {
     private String processTemplateId;
     private String bidAgency;
     private String bidPlatform;
+    private Long gldProjectId;
 
     @NotTableField
     private String templateId;

easydo-chengfa/src/main/java/easydo/technology/quartz/task/JobTask.java

@@ -108,6 +108,7 @@ public class JobTask {
         }
     }
 
+    // TODO: 2024-9-25 从广联达获取mdm项目
     protected void pullProjectFromGldMaster() throws Exception {
         Connection connection = null;
         try {
@@ -137,7 +138,7 @@ public class JobTask {
                 } else {
                     info.setProjectStatus("inactive");
                 }
-                info.setGldDeptId(model.getDeptId());
+                info.setGldProjectId(null);
                 GldDept gldDept = new GldDept();
                 gldDept.setId(model.getDeptId());
                 gldDept = jdbcClient.getJdbcModel(gldDept, connection);
@@ -204,7 +205,13 @@ public class JobTask {
             map.put("projectIdBegin", 1);
             List<Purchase> list = jdbcClient.getJdbcList(map, Purchase.class, connection);
             for (Purchase model : list) {
-                List<GLDContract> contractList = gldCostService.getContractList(model.getProjectId(),
+                ProjectInfo projectInfo = new ProjectInfo();
+                projectInfo.setId(model.getProjectId());
+                projectInfo = jdbcClient.getJdbcModelById(projectInfo, connection);
+                if (StringUtil.isEmpty(projectInfo.getProjectNo())) {
+                    continue;
+                }
+                List<GLDContract> contractList = gldCostService.getContractList(projectInfo.getProjectNo(),
                         model.getPurchaseNo());
                 if (!contractList.isEmpty()) {
                     PurchaseBidNotice bidNotice = new PurchaseBidNotice();

easydo-chengfa/src/main/java/easydo/technology/service/GLDApproveService.java

@@ -155,13 +155,35 @@ public class GLDApproveService {
         return vo;
     }
 
+//    public static void main(String[] args) {
+////        String url = "http://218.201.101.181:14780/task/tasks?targetId=89bfac89-7fd5-4c1f-a386-f2f36efafb1d&targetType=purchase_plan";
+//        String url = "http://218.201.101.181:14780/task/11200297/tasks?ids=22175528771584&taskType=APPROVAL";
+//        Map<String, String> header = new HashMap<>();
+//        header.put("X-CORAL-TENANT", "5600003");
+//        header.put("Authorization", "Basic YlFvc0tIeWJkSlZUZGtMcXA0U1VIMlE0ejNZQjc5eVA6b1ZmaU5zR1c1NVZzSW5ITTlDOVI3c2g0SHlpVGMxY2w=");
+//        JSONArray resArray = HttpClientUtil.sendGETWithHeader_Arr(url, header);
+//        log.info("查询审批流res========>" + resArray.toJSONString());
+//    }
+
     public static void main(String[] args) {
-//        String url = "http://218.201.101.181:14780/task/tasks?targetId=89bfac89-7fd5-4c1f-a386-f2f36efafb1d&targetType=purchase_plan";
-        String url = "http://218.201.101.181:14780/task/11200297/tasks?ids=22175528771584&taskType=APPROVAL";
         Map<String, String> header = new HashMap<>();
         header.put("X-CORAL-TENANT", "5600003");
         header.put("Authorization", "Basic YlFvc0tIeWJkSlZUZGtMcXA0U1VIMlE0ejNZQjc5eVA6b1ZmaU5zR1c1NVZzSW5ITTlDOVI3c2g0SHlpVGMxY2w=");
-        JSONArray resArray = HttpClientUtil.sendGETWithHeader_Arr(url, header);
-        log.info("查询审批流res========>" + resArray.toJSONString());
+//        String a = "{\"hiddenResubmit\":true,\"resubmitTaskId\":\"24965790957568\",\"startorId\":5600090,\"taskType\":\"APPROVAL\",\"startPosName\":\"第三方招采系统\",\"subject\":\"startPosName\",\"targetType\":\"purchase_plan\",\"templateId\":\"cfc7021f-76ec-11ef-8ce7-02429b7252f5\",\"startPos\":\"STD_Dcm_PROCUREMENT_SYSTEM\"}";
+        JSONObject object = new JSONObject();
+        object.put("subject", "startPosName");
+        object.put("startPos", "STD_Dcm_PROCUREMENT_SYSTEM");
+        object.put("startPosName", "第三方招采系统");
+        object.put("templateId", "cfc7021f-76ec-11ef-8ce7-02429b7252f5");
+        object.put("targetType", "purchase_plan");
+//        object.put("targetId", vo.getTargetId());
+        object.put("taskType", "APPROVAL");
+        object.put("hiddenResubmit", true);
+        object.put("startorId", 5600090);
+        object.put("resubmitTaskId", "24965790957568");
+        System.out.println(object.toJSONString());
+        JSONObject resObj = HttpClientUtil.sendPOSTWithHeader("http://218.201.101.181:14780/task/11200297/tasks/submit", object.toJSONString(), header);
+        System.out.println(resObj.toJSONString());
+
     }
 }

easydo-chengfa/src/main/java/easydo/technology/service/GLDCostService.java

@@ -91,9 +91,9 @@ public class GLDCostService {
         }
     }
 
-    public List<GLDContract> getContractList(Long projectId, String purchaseNo) {
+    public List<GLDContract> getContractList(String projectCode, String purchaseNo) {
         JSONObject data = new JSONObject();
-        data.put("projectId", projectId);
+        data.put("projectCode", projectCode);
         data.put("procurementApprovalCode", purchaseNo);
         data.put("queryDetail", true);
         String url = costHost + costContractPath;