contract

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

@@ -131,8 +131,11 @@ public class ApiController {
     @RequestMapping(value = "/contract/push")
     public Object pushContract(@RequestBody ContractVo vo) throws Exception {
         String token = vo.getToken();
+        Map<String, Object> result = new HashMap<>();
+        result.put("code", 0);
         if (!TOKEN.equals(token)) {
-            return new ResponseEntity<>("no auth", HttpStatus.OK);
+            result.put("message", "no auth");
+            return new ResponseEntity<>(result, HttpStatus.OK);
         }
         Connection connection = null;
         try {
@@ -140,13 +143,15 @@ public class ApiController {
             if (StringUtil.isEmpty(vo.getPurchaseId())) {
 
                 if (StringUtil.isEmpty(vo.getPurchaseNo())) {
-                    throw new BizException("采购编号purchaseNo无效");
+                    result.put("message", "采购编号purchaseNo无效");
+                    return new ResponseEntity<>(result, HttpStatus.OK);
                 }
                 Purchase purchase = new Purchase();
                 purchase.setPurchaseNo(vo.getPurchaseNo());
                 purchase = jdbcClient.getJdbcModel(purchase, connection);
                 if (StringUtil.isEmpty(purchase.getId())) {
-                    throw new BizException("采购编号purchaseNo无效");
+                    result.put("message", "采购编号purchaseNo无效");
+                    return new ResponseEntity<>(result, HttpStatus.OK);
                 }
                 vo.setPurchaseId(purchase.getId());
             }
@@ -165,7 +170,8 @@ public class ApiController {
             supplier.setSupplierName(vo.getSupplierName());
             supplier = jdbcClient.getJdbcModel(supplier, connection);
             if (StringUtil.isEmpty(supplier.getId())) {
-                throw new BizException("供应商名称无效");
+                result.put("message", "供应商名称无效");
+                return new ResponseEntity<>(result, HttpStatus.OK);
             }
             vo.setSupplierId(supplier.getId());
             vo.setSupplierName(supplier.getSupplierName());
@@ -185,9 +191,12 @@ public class ApiController {
             contract.setSupplierNo(vo.getSupplierNo());
             jdbcClient.jdbcInsert(contract, connection);
 
-            return new ResponseEntity<>(contract, HttpStatus.OK);
+            result.put("message", "success");
+            result.put("code", 1);
+            return new ResponseEntity<>(result, HttpStatus.OK);
         } catch (Exception e) {
-            throw new BizException(e.getMessage());
+            result.put("message", "fail" + e.getMessage());
+            return new ResponseEntity<>(result, HttpStatus.OK);
         } finally {
             jdbcClient.finallyExecute(connection);
         }

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

@@ -87,7 +87,7 @@ public class GLDApproveService {
 
     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=11200743&taskType=APPROVAL";
+        String url = "http://218.201.101.181:14780/task/11200297/tasks?ids=11201008&taskType=APPROVAL";
         Map<String, String> header = new HashMap<>();
         header.put("X-CORAL-TENANT", "5600003");
         header.put("Authorization", "Basic YlFvc0tIeWJkSlZUZGtMcXA0U1VIMlE0ejNZQjc5eVA6b1ZmaU5zR1c1NVZzSW5ITTlDOVI3c2g0SHlpVGMxY2w=");