实施计划变更

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java

@@ -571,9 +571,6 @@ public class PurchaseManage {
             Operation operation = operationService.getByBidId(purchase.getId());
             if (operation == null) {
                 operation = new Operation();
-                operation.setActualTestValidTime(req.getActualTime());
-                operation.setTestValidFiles(req.getFiles());
-                operation.setTestValidRemark(req.getRemark());
                 operation.setBidId(purchase.getId());
                 operation.setCreateBy(user.getUsername());
                 operation.setCreateOn(now);
@@ -582,6 +579,9 @@ public class PurchaseManage {
             }
             operation.setUpdateBy(user.getUsername());
             operation.setUpdateOn(now);
+            operation.setActualTestValidTime(req.getActualTime());
+            operation.setTestValidFiles(req.getFiles());
+            operation.setTestValidRemark(req.getRemark());
             operationService.saveOrUpdate(operation);
             saveProjectPurchaseInstCode(purchase.getId(), instanceId, project.getId(), instType);
         }
@@ -637,15 +637,15 @@ public class PurchaseManage {
             Operation operation = operationService.getByBidId(purchase.getId());
             if (operation == null) {
                 operation = new Operation();
-                operation.setActualSelfTestTime(req.getActualTime());
-                operation.setSelfTestFiles(req.getFiles());
-                operation.setSelfTestRemark(req.getRemark());
                 operation.setBidId(purchase.getId());
                 operation.setCreateBy(user.getUsername());
                 operation.setCreateOn(now);
                 operation.setProjectId(projectId);
                 operation.setProjectCode(project.getProjectCode());
             }
+            operation.setActualSelfTestTime(req.getActualTime());
+            operation.setSelfTestFiles(req.getFiles());
+            operation.setSelfTestRemark(req.getRemark());
             operation.setUpdateBy(user.getUsername());
             operation.setUpdateOn(now);
             operationService.saveOrUpdate(operation);
@@ -684,15 +684,15 @@ public class PurchaseManage {
             Operation operation = operationService.getByBidId(purchase.getId());
             if (operation == null) {
                 operation = new Operation();
-                operation.setActualAdaptionTime(req.getActualTime());
-                operation.setAdaptionFiles(req.getFiles());
-                operation.setAdaptionRemark(req.getRemark());
                 operation.setBidId(purchase.getId());
                 operation.setCreateBy(user.getUsername());
                 operation.setCreateOn(now);
                 operation.setProjectId(projectId);
                 operation.setProjectCode(project.getProjectCode());
             }
+            operation.setActualAdaptionTime(req.getActualTime());
+            operation.setAdaptionFiles(req.getFiles());
+            operation.setAdaptionRemark(req.getRemark());
             operation.setUpdateBy(user.getUsername());
             operation.setUpdateOn(now);
             operationService.saveOrUpdate(operation);