1

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

@@ -41,6 +41,9 @@ public class ComProjectTaskDTO extends BaseDTO {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endDate;
 
+    /** 合同书状态  0 未 填,-10 起 草, 10 待提交,20 审核中,30 返回修改，40 审核不通过， 50 审核通过*/
+    private String taskStateName;
+
     /** 项目名称 */
     @ApiModelProperty(value = "项目名称", position = 1 )
     private String projName;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectController.java

@@ -143,15 +143,6 @@ public class ComProjectController extends BaseController<ComProjectService, ComP
         return ResponseDataModel.ok(comProjectService.save(comProjectDTO));
     }
 
-    @ApiOperation(value = "分步保存项目信息", httpMethod = "POST", notes = "分步保存项目信息")
-    @PostMapping
-    @RequestMapping("/saveByStep")
-    @PreAuthorize("hasAnyRole('REPORT','GOV','ADMIN')")
-    @Logs(value = CommonEnum.logType.projectSave)
-    public ResponseDataModel<String> saveByStep(@RequestBody ComProjectDTO comProjectDTO, BindingResult bindingResult) {
-        return ResponseDataModel.ok(comProjectService.saveByStep(comProjectDTO));
-    }
-
     /**
      * 保存项目信息
      *

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectTaskController.java

@@ -59,7 +59,7 @@ public class ComProjectTaskController extends BaseController<ComProjectTaskServi
         Pagination<ComProjectTaskDTO> page = ComProjectTaskService.getListByPage(vo);
         if (null != page && null != page.getDataList() && page.getDataList().size() != 0) {
             page.getDataList().forEach((e) -> {
-
+                e.setTaskStateName(CommonEnum.projState.getEnum(e.getTaskState()).getDescription());
             });
         }
         return ResponseDataModel.ok(page);
@@ -71,10 +71,10 @@ public class ComProjectTaskController extends BaseController<ComProjectTaskServi
     @ApiOperation(value = "获取统计数据", httpMethod = "GET", notes = "获取统计数据")
     @GetMapping
     @RequestMapping("/getCount")
-    public ResponseDataModel<DataStatisticsDTO> getCount(ComProjectTask e) {
-        ComProjectTaskQueryVO vo=new ComProjectTaskQueryVO();
+    public ResponseDataModel<DataStatisticsDTO> getCount(ComProjectTaskQueryVO vo) {
         vo.setAppPersonId(SecurityUserHolder.getPersonId());
-        vo.setReportYear(e.getReportYear());
+        vo.setProjState(CommonEnum.projState.pass.getCode());
+        vo.setReportYear(vo.getReportYear());
         return ResponseDataModel.ok(ComProjectTaskService.getCount(vo));
     }
 

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

@@ -39,20 +39,12 @@ public interface ComProjectService extends BaseService<ComProjectQueryVO, ComPro
      */
     String getVersionNo(String oldVersionNo);
 
-    /**
-     * 保存项目信息
-     *
-     * @param dto
-     * @return
-     */
-    String save(ComProjectDTO dto);
-
     /**
      * 分布保存项目信息
      * @param dto
      * @return
      */
-    String saveByStep(ComProjectDTO dto);
+    String save(ComProjectDTO dto);
 
     /**
      * 修改申报单位

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

@@ -762,85 +762,59 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         this.update(comProject);
     }
 
-    @Transactional
     public String save(ComProjectDTO dto) {
-        dto.setFileId(dto.getDownloadId());
-        if (Objects.nonNull(dto.getGovFunding())) {
-            if (dto.getGovFunding().compareTo(new BigDecimal(50)) > -1) {
-                dto.setProjClass(2);
-            } else {
-                dto.setProjClass(1);
-            }
-        }
-        if (Objects.isNull(dto.getId()))
-            dto.setId(projectInsert(dto));
-        else {
-            ComProject project = this.entityById(dto.getId());
-            if (null == project) {
-                dto.setId(projectInsert(dto));
-            } else
-                projectUpdate(dto);
-        }
-        return dto.getId();
-    }
-
-    public String saveByStep(ComProjectDTO dto) {
-        String ProjectID = "";
+        String id = "";
         switch (dto.getStep()) {
             case 0://项目基本信息
-                ProjectID = ProjectSaveStep0(dto);
+                id = projectSaveStep0(dto);
                 break;
             case 1://项目组成员及单位
-                ProjectID = ProjectSaveStep1(dto);
+                id = projectSaveStep1(dto);
                 break;
             case 2://经费预算及设备明细
-                ProjectID = ProjectSaveStep2(dto);
+                id = projectSaveStep2(dto);
                 break;
             case 3://阶段目标及课题设置
-                ProjectID = ProjectSaveStep3(dto);
+                id = projectSaveStep3(dto);
                 break;
             case 4://绩效指标
-                ProjectID = ProjectSaveStep4(dto);
+                id = projectSaveStep4(dto);
                 break;
             case 5://附件
-                ProjectID = ProjectSaveStep5(dto);
+                id = projectSaveStep5(dto);
                 break;
         }
-
-        return ProjectID;
+        return id;
     }
 
-    private String ProjectSaveStep0(ComProjectDTO dto) {
-        String ProjectID = "";
+    private String projectSaveStep0(ComProjectDTO dto) {
+        String id = "";
         dto.setFileId(dto.getDownloadId());
         if (Objects.isNull(dto.getId()))
-            ProjectID = InsertProjectBaseInfo(dto);
+            id = InsertProjectBaseInfo(dto);
         else {
             ComProject project = this.entityById(dto.getId());
             if (null == project) {
-                ProjectID = InsertProjectBaseInfo(dto);
+                id = InsertProjectBaseInfo(dto);
             } else
-                ProjectID = UpdateProjectBaseInfo(dto);
+                id = UpdateProjectBaseInfo(dto);
         }
-
-        return ProjectID;
+        return id;
     }
 
     @Transactional
-    public String ProjectSaveStep1(ComProjectDTO dto) {
+    public String projectSaveStep1(ComProjectDTO dto) {
         ComProject comProject = convert2Entity(dto);
         this.update(comProject);
-
         // 项目参加人员
         comProjectMembersService.insertList(dto.getMembers(), dto.getId());
         // 主要参与单位
         comProjectCooperativeUnitsService.insertList(dto.getParticipateUnits(), dto.getId(), 2);
-
         return dto.getId();
     }
 
     @Transactional
-    public String ProjectSaveStep2(ComProjectDTO dto) {
+    public String projectSaveStep2(ComProjectDTO dto) {
         if (Objects.nonNull(dto.getGovFunding())) {
             if (dto.getGovFunding().compareTo(new BigDecimal(50)) > -1) {
                 dto.setProjClass(2);
@@ -850,14 +824,11 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         }
         ComProject comProject = convert2Entity(dto);
         this.update(comProject);
-
         comProjectBasicService.insertOrUpdate(dto);
-
         // 经费预算
         comProjectBudgetService.insertBudgetList(dto.getBudget(), dto.getId());
         // 年度用款计划表
         comProjectFundPlanService.insertList(dto.getFundPlan(), dto.getId());
-
         if (null != dto.getDeviceList() && dto.getDeviceList().size() > 0) {
             // 购置设备预算明细表
             comProjectEquipmentService.insertEquipmentList(dto.getDeviceList(), dto.getId());
@@ -870,43 +841,36 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
             // 单位支出明细预算表
             comProjectUnitPaymentService.insertList(dto.getUnitPayment(), dto.getId());
         }
-
         return dto.getId();
     }
 
     @Transactional
-    public String ProjectSaveStep3(ComProjectDTO dto) {
+    public String projectSaveStep3(ComProjectDTO dto) {
         ComProject comProject = convert2Entity(dto);
         this.update(comProject);
-
         // 项目安排及阶段目标
         comProjectStageGoalService.insertList(dto.getStageGoals(), dto.getId());
-
         if (null != dto.getProjectSubList() && dto.getProjectSubList().size() > 0) {
             // 项目课颖设置表
             comProjectSubService.insertList(dto.getProjectSubList(), dto.getId());
         }
-
         return dto.getId();
     }
 
     @Transactional
-    public String ProjectSaveStep4(ComProjectDTO dto) {
+    public String projectSaveStep4(ComProjectDTO dto) {
         ComProject comProject = new ComProject();
         comProject.setId(dto.getId());
         comProject.setCompleteStatus(dto.getCompleteStatus());
         if (Objects.nonNull(dto.getManagerDept()))
             comProject.setManagerDept(dto.getManagerDept());
-
         this.update(comProject);
-
         ComProjectBasic comProjectBasic = new ComProjectBasic();
         comProjectBasic.setProjId(dto.getId());
         if (Objects.nonNull(dto.getProjAttribute()))
             comProjectBasic.setProjAttribute(dto.getProjAttribute());
         else
             comProjectBasic.setProjAttribute("5b9d6509-aece-11ef-b6cb-0c42a1380f01");//新增项目
-
         if (Objects.nonNull(dto.getYearTarget()))
             comProjectBasic.setYearTarget(dto.getYearTarget());
         if (Objects.nonNull(dto.getYear1Goal()))
@@ -915,25 +879,20 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
             comProjectBasic.setYear2Goal(dto.getYear2Goal());
         if (Objects.nonNull(dto.getYear3Goal()))
             comProjectBasic.setYear3Goal(dto.getYear3Goal());
-
         comProjectBasicService.insertOrUpdate(dto);
-
         if (null != dto.getProjectKPI().getKpiList() && dto.getProjectKPI().getKpiList().size() > 0) {
             // 项目绩效指标表
             comProjectKpitDetailService.insertList(dto.getProjectKPI().getKpiList(), dto.getId());
         }
-
         return dto.getId();
     }
 
     @Transactional
-    public String ProjectSaveStep5(ComProjectDTO dto) {
+    public String projectSaveStep5(ComProjectDTO dto) {
         ComProject comProject = convert2Entity(dto);
         this.update(comProject);
-
         // 附件
         ComFileService.insertList(dto.getFileList(), dto.getId(), CommonEnum.fileType.project.getCode());
-
         return dto.getId();
     }
 
@@ -967,43 +926,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         return this.update(comProject);
     }
 
-
-    @Transactional
-    //插入
-    public String projectInsert(ComProjectDTO dto) {
-        ComBatchDTO comBatchDTO = comBatchService.getCurrentBatch(dto.getProjType(), null);
-        ComProject comProject = convert2Entity(dto);
-        comProject.setAppNo(getAppNo());
-        comProject.setReportYear(comBatchDTO.getYear());
-        comProject.setBatch(comBatchDTO.getBatch());
-        dto.setSubjectScope("生物医药领域");
-        comProject.setCompleted(0);
-        comProject.setAssignState(0);
-        String id = this.insert(comProject);
-        dto.setId(id);
-        this.saveList(dto, id);
-        comProjectBasicService.insertOrUpdate(dto);
-        return id;
-    }
-
-    @Transactional
-    //更新
-    public String projectUpdate(ComProjectDTO dto) {
-        ComProject project = this.entityById(dto.getId());
-        if (null == project)
-            throw new BusinessException("项目不存在或已删除");
-        if (!StringUtil.isContainsRole(SecurityUserHolder.getRoles(), CommonEnum.systemRole.sys.getCode().toString())
-                && !StringUtil.isContainsRole(SecurityUserHolder.getRoles(), CommonEnum.systemRole.topGov.getCode().toString())
-                && !project.getProjState().equals(CommonEnum.projState.draft.getCode())
-                && !project.getProjState().equals(CommonEnum.projState.waitSubmit.getCode())
-                && !project.getProjState().equals(CommonEnum.projState.returnModify.getCode()))
-            throw new BusinessException("项目已上报！");
-        ComProject comProject = convert2Entity(dto);
-        this.saveList(dto, dto.getId());
-        comProjectBasicService.insertOrUpdate(dto);
-        return this.update(comProject);
-    }
-
     @Transactional
     public void saveList(ComProjectDTO dto, String id) {
         // 项目参加人员
@@ -1015,7 +937,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         // 年度用款计划表
         comProjectFundPlanService.insertList(dto.getFundPlan(), id);
 //        // 项目合作单位
-//        comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), id, 1);
+//      comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), id, 1);
         // 主要参与单位
         comProjectCooperativeUnitsService.insertList(dto.getParticipateUnits(), id, 2);
         // 购置设备预算明细表

science-admin/src/main/resources/mapper/ComProjectTaskDAO.xml

@@ -16,7 +16,7 @@
         from com_project c
         left join com_project_task b on b.proj_id=c.id
         left join com_unit d on c.app_unit_id=d.id
-        left join com_person e on c.app_person_id=e.id
+        left join com_person e on c.app_person_id=e.6
         <where>
             ${ew.sqlSegment}
         </where>