77

science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java

@@ -319,25 +319,22 @@ public class ComProjectDTO extends BaseDTO {
     private List<ComProjectCooperativeUnitsDTO> cooperativeUnits;
     /** 项目主要参与单位 */
     private List<ComProjectCooperativeUnitsDTO> participateUnits;
-
     /** 项目组成员 */
     private List<ComProjectMembersDTO> members;
     /** 经费表 */
     private List<ComProjectBudgetDTO> budget;
     /** 年度用款计划 */
     private List<ComProjectFundPlanDTO> fundPlan;
-    /** 项目绩效目标表 */
-    private ProjectKPIStatisticDTO projectKPI;
-    /** 购置设备预算明细表 */
-    private List<ComProjectEquipmentDTO> equipments;
     /** 购置设备预算明细表 */
     private List<ComProjectEquipmentDTO> deviceList;
+    /** 试制设备预算明细表 */
+    private List<ComProjectManufactureDTO> manufacture;
+    /** 项目绩效目标表 */
+    private ProjectKPIStatisticDTO projectKPI;
     /** 项目安排及阶段目标 */
     private List<ComProjectStageGoalDTO> stageGoals;
     /** 项目课颖设置表 */
     private List<ComProjectSubDTO> projectSubList;
-    /** 试制设备预算明细表 */
-    private List<ComProjectManufactureDTO> manufacture;
     /** 附件列表 */
     private List<ComFileDTO> fileList;
     /** 审核列表 */

science-admin/src/main/java/com/yiboshi/science/service/ComProjectService.java

@@ -28,7 +28,7 @@ public interface ComProjectService extends BaseService<ComProjectQueryVO, ComPro
      *
      * @return
      */
-    void updateState(String id, Integer state, String versionNo);
+    void updateStateOrNo(String id, Integer state, String versionNo);
 
     /**
      * 获取新的版本号

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectConclusionServiceImpl.java

@@ -193,7 +193,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
         modal.setId(conclusion.getId());
         modal.setState(CommonEnum.conclusionState.report.getCode());
         modal.setThesisState(CommonEnum.thesisState.pass.getCode());
-        comProjectService.updateState(conclusion.getProjId(), CommonEnum.projState.report.getCode(), null);
+        comProjectService.updateStateOrNo(conclusion.getProjId(), CommonEnum.projState.report.getCode(), null);
         comProjectAuditService.report(DateUtils.getYear(), conclusion.getId(), 4, auditUnitId, treeCode);
         return this.update(modal);
     }
@@ -210,7 +210,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
         Integer state = null;
         if (e.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) {
             state = CommonEnum.conclusionState.pass.getCode();
-            comProjectService.updateState(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null);
+            comProjectService.updateStateOrNo(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null);
         } else if (e.getAuditResult().equals(CommonEnum.auditResult.returnModify.getCode())) {
             state = CommonEnum.conclusionState.returnModify.getCode();
         } else {
@@ -236,7 +236,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
         Integer state = null;
         if (e.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) {
             state = CommonEnum.thesisState.pass.getCode();
-            comProjectService.updateState(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null);
+            comProjectService.updateStateOrNo(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null);
         } else if (e.getAuditResult().equals(CommonEnum.auditResult.returnModify.getCode())) {
             state = CommonEnum.thesisState.returnModify.getCode();
         } else {
@@ -307,7 +307,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
             c.setThesisState(CommonEnum.thesisState.unFilled.getCode());
             this.update(c);
         }
-        comProjectService.updateState(projId, CommonEnum.projState.conclusion.getCode(), null);
+        comProjectService.updateStateOrNo(projId, CommonEnum.projState.conclusion.getCode(), null);
 
         comProjectAuditService.insertAudit(comProject.getReportYear(), 4, id, CommonEnum.auditMethod.audit.getCode(),
                 auditUnitId, null, CommonEnum.auditResult.pass.getCode(), new Date(), 1, 1, SecurityUserHolder.getPersonId());