approve

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

@@ -102,53 +102,7 @@ public class TestController {
     @WebLog
     @RequestMapping(value = "/getPage")
     public Object getPage() throws Exception {
-        Connection connection = null;
-        Map<String, Object> map = new HashMap<>();
-        try {
-            connection = dataSource.getConnection();
-            connection.setAutoCommit(false);
-            map.put("isHaveContract", 0);
-            map.put("projectIdBegin", 1);
-            List<Purchase> list = jdbcClient.getJdbcList(map, Purchase.class, connection);
-            for (Purchase model : list) {
-                List<GLDContract> contractList = gldCostService.getContractList(model.getProjectId(),
-                        model.getPurchaseNo());
-                if (!contractList.isEmpty()) {
-                    PurchaseBidNotice bidNotice = new PurchaseBidNotice();
-                    bidNotice.setPurchaseId(model.getId());
-                    bidNotice = jdbcClient.getJdbcModel(bidNotice, connection);
-                    Supplier supplier = new Supplier();
-                    supplier.setId(bidNotice.getBidCompanyIds());
-                    supplier = jdbcClient.getJdbcModel(supplier, connection);
 
-                    for (GLDContract contract : contractList) {
-                        PurchaseContract purchaseContract = new PurchaseContract();
-                        purchaseContract.setPurchaseId(model.getId());
-                        purchaseContract.setProjectId(model.getProjectId());
-                        purchaseContract.setContractName(contract.getName());
-                        purchaseContract.setContractNo(contract.getCode());
-                        purchaseContract.setSignAmount(contract.getTaxAmount());
-                        purchaseContract.setCreateTime(contract.getCreateTime());
-                        purchaseContract.setEndTime(contract.getApprovedEndTime());
-                        purchaseContract.setObjectId(contract.getObjectId());
-                        purchaseContract.setFileName(contract.getFileName());
-                        purchaseContract.setSupplierId(supplier.getId());
-                        purchaseContract.setSupplierName(supplier.getSupplierName());
-                        purchaseContract.setSupplierNo(supplier.getSupplierNo());
-                        jdbcClient.jdbcInsert(purchaseContract, connection);
-                    }
-                    model.setIsHaveContract(true);
-                    jdbcClient.jdbcUpdateById(model, connection);
-                }
-            }
-
-            connection.commit();
-        } catch (Exception e) {
-            connection.rollback();
-            throw e;
-        } finally {
-            jdbcClient.finallyExecute(connection);
-        }
         return "success";
     }
 

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

@@ -206,7 +206,7 @@ public class JobTask {
                     Supplier supplier = new Supplier();
                     supplier.setId(bidNotice.getBidCompanyIds());
                     supplier = jdbcClient.getJdbcModel(supplier, connection);
-                
+
                     for (GLDContract contract : contractList) {
                         PurchaseContract purchaseContract = new PurchaseContract();
                         purchaseContract.setPurchaseId(model.getId());
@@ -223,9 +223,9 @@ public class JobTask {
                         purchaseContract.setSupplierNo(supplier.getSupplierNo());
                         jdbcClient.jdbcInsert(purchaseContract, connection);
                     }
+                    model.setIsHaveContract(true);
+                    jdbcClient.jdbcUpdateById(model, connection);
                 }
-                model.setIsHaveContract(true);
-                jdbcClient.jdbcUpdateById(model, connection);
             }
 
             connection.commit();