approve

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

@@ -106,7 +106,7 @@ public class TestController {
         Map<String, Object> map = new HashMap<>();
         try {
             connection = dataSource.getConnection();
-//            connection.setAutoCommit(false);
+            connection.setAutoCommit(false);
             map.put("isHaveContract", 0);
             map.put("projectIdBegin", 1);
             List<Purchase> list = jdbcClient.getJdbcList(map, Purchase.class, connection);
@@ -142,9 +142,9 @@ public class TestController {
                 }
             }
 
-//            connection.commit();
+            connection.commit();
         } catch (Exception e) {
-//            connection.commit();
+            connection.rollback();
             throw e;
         } finally {
             jdbcClient.finallyExecute(connection);

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

@@ -69,7 +69,7 @@ public class JobTask {
             connection.commit();
         } catch (Exception e) {
             connection.rollback();
-            throw new BizException(e.getMessage());
+            throw e;
         } finally {
             jdbcClient.finallyExecute(connection);
         }
@@ -95,7 +95,7 @@ public class JobTask {
             connection.commit();
         } catch (Exception e) {
             connection.rollback();
-            throw new BizException(e.getMessage());
+            throw e;
         } finally {
             jdbcClient.finallyExecute(connection);
         }
@@ -155,7 +155,7 @@ public class JobTask {
             connection.commit();
         } catch (Exception e) {
             connection.rollback();
-            throw new BizException(e.getMessage());
+            throw e;
         } finally {
             jdbcClient.finallyExecute(connection);
         }
@@ -181,7 +181,7 @@ public class JobTask {
             connection.commit();
         } catch (Exception e) {
             connection.rollback();
-            throw new BizException(e.getMessage());
+            throw e;
         } finally {
             jdbcClient.finallyExecute(connection);
         }
@@ -223,15 +223,15 @@ 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();
         } catch (Exception e) {
             connection.rollback();
-            throw new BizException(e.getMessage());
+            throw e;
         } finally {
             jdbcClient.finallyExecute(connection);
         }

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

@@ -94,7 +94,6 @@ public class GLDCostService {
     public List<GLDContract> getContractList(Long projectId, 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;
@@ -125,13 +124,13 @@ public class GLDCostService {
             }
             GLDContract contract = JSONObject.parseObject(object.toJSONString(), GLDContract.class);
 
-            JSONArray attachmentInfoList = object.getJSONArray("extAttachmentInfoList");
-            for (Object attach : attachmentInfoList) {
-                JSONObject attachObj = (JSONObject) attach;
-                contract.setObjectId(attachObj.getString("objectId"));
-                contract.setFileName(attachObj.getString("name"));
+//            JSONArray attachmentInfoList = object.getJSONArray("extAttachmentInfoList");
+//            for (Object attach : attachmentInfoList) {
+//                JSONObject attachObj = (JSONObject) attach;
+//                contract.setObjectId(attachObj.getString("objectId"));
+//                contract.setFileName(attachObj.getString("name"));
                 list.add(contract);
-            }
+//            }
         }
         return list;
     }