1

science-admin/src/main/java/com/yiboshi/science/enumeration/CommonEnum.java

@@ -635,9 +635,9 @@ public class CommonEnum {
         projectAssign("projectAssign", "项目分配"),
         assignDelete("assignDelete", "删除评分记录"),
 
-        taskBookSave("taskBookSave", "合同书保存"),
-        taskBookReport("taskBookReport", "合同书上报"),
-        taskBookAudit("taskBookAudit", "合同书审核"),
+        taskSave("taskBookSave", "合同书保存"),
+        taskReport("taskBookReport", "合同书上报"),
+        taskAudit("taskBookAudit", "合同书审核"),
 
         conclusionSave("conclusionSave", "结题信息保存"),
         conclusionReport("conclusionReport", "结题上报"),

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

@@ -99,7 +99,7 @@ public class ComProjectTaskController extends BaseController<ComProjectTaskServi
     @ApiOperation(value = "保存任务书信息", httpMethod = "POST", notes = "保存任务书信息")
     @PostMapping
     @RequestMapping("/save")
-    @Logs(value = CommonEnum.logType.taskBookSave)
+    @Logs(value = CommonEnum.logType.taskSave)
     public ResponseDataModel<String> save(@RequestBody ComProjectTaskDTO dto) {
         return ResponseDataModel.ok(ComProjectTaskService.save(dto));
     }
@@ -110,7 +110,7 @@ public class ComProjectTaskController extends BaseController<ComProjectTaskServi
     @ApiOperation(value = "项目/任务书/中期考核表上报", httpMethod = "POST", notes = "项目/任务书/中期考核表上报")
     @PostMapping
     @RequestMapping("/report")
-    @Logs(value = CommonEnum.logType.taskBookReport)
+    @Logs(value = CommonEnum.logType.taskReport)
     public ResponseDataModel<String> report(@RequestBody ComProjectAudit comProjectAudit) {
         ComProjectTaskService.report(comProjectAudit, SecurityUserHolder.getUnitId(), SecurityUserHolder.getUnitCode());
         return ResponseDataModel.ok("上报成功");
@@ -122,7 +122,7 @@ public class ComProjectTaskController extends BaseController<ComProjectTaskServi
     @ApiOperation(value = "项目/任务书/中期考核表审核", httpMethod = "POST", notes = "项目/任务书/中期考核表审核")
     @PostMapping
     @RequestMapping("/audit")
-    @Logs(value = CommonEnum.logType.taskBookAudit)
+    @Logs(value = CommonEnum.logType.taskAudit)
     public ResponseDataModel<String> audit(@RequestBody ComProjectAudit comProjectAudit) {
         ComProjectTaskService.audit(comProjectAudit, SecurityUserHolder.getUnitId(), SecurityUserHolder.getUnitCode());
         return ResponseDataModel.ok("审核成功");

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

@@ -130,14 +130,12 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
         return new Pagination<>(dtoList, page.getTotal(), vo.getPageSize());
     }
 
-    @Override
     public DataStatisticsDTO getCount(ComProjectTaskQueryVO e) {
         QueryWrapper criteria = new QueryWrapper();
         setCriteriaForQuery(e, criteria);
         return ComProjectTaskDAO.getCount(criteria);
     }
 
-    @Override
     public void updateState(String id, Integer state) {
         ComProjectTask ComProjectTask = new ComProjectTask();
         ComProjectTask.setId(id);
@@ -146,11 +144,37 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
     }
 
     public ComProjectTaskDTO getTaskByProjId(String projId) {
-        ComProjectTaskDTO dto =ComProjectTaskDAO.getByProjId(projId);
+        ComProjectTaskDTO dto = ComProjectTaskDAO.getByProjId(projId);
         //申报单位
         ComUnitDTO comUnitDTO = comUnitService.getUnitById(dto.getAppUnitId());
         if (null != comUnitDTO) {
             dto.setAppUnitName(comUnitDTO.getUnitName());
+            if (Objects.isNull(dto.getOrganizationCode()))
+                dto.setOrganizationCode(comUnitDTO.getOrganizationCode());
+            if (Objects.isNull(dto.getUnitAddress()))
+                dto.setUnitAddress(comUnitDTO.getUnitAddress());
+            if (Objects.isNull(dto.getRegisteredAddress()))
+                dto.setRegisteredAddress(comUnitDTO.getRegisteredAddress());
+            if (Objects.isNull(dto.getPostCode()))
+                dto.setPostCode(comUnitDTO.getPostCode());
+
+            if (Objects.isNull(dto.getLegalPerson()))
+                dto.setLegalPerson(comUnitDTO.getLegalPerson());
+            if (Objects.isNull(dto.getWorkforce()))
+                dto.setWorkforce(comUnitDTO.getWorkforce());
+            if (Objects.isNull(dto.getSpecializedPersonnel()))
+                dto.setSpecializedPersonnel(comUnitDTO.getSpecializedPersonnel());
+            if (Objects.isNull(dto.getResearchPersonnel()))
+                dto.setResearchPersonnel(comUnitDTO.getResearchPersonnel());
+
+            if (Objects.isNull(dto.getDepositBank()))
+                dto.setDepositBank(comUnitDTO.getDepositBank());
+            if (Objects.isNull(dto.getBankAccount()))
+                dto.setBankAccount(comUnitDTO.getBankAccount());
+            if (Objects.isNull(dto.getDepositBankAddress()))
+                dto.setDepositBankAddress(comUnitDTO.getDepositBankAddress());
+            if (Objects.isNull(dto.getInterbankNumber()))
+                dto.setInterbankNumber(comUnitDTO.getInterbankNumber());
         }
         // 申报人
         ComPersonDTO comPersonDTO = comPersonService.getPersonById(dto.getAppPersonId());
@@ -174,14 +198,25 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
         dto.setEmail(comPersonDTO.getEmail());
     }
 
-    @Override
+    @Transactional
     public String save(ComProjectTaskDTO dto) {
-        ComProjectTaskDTO task = ComProjectTaskDAO.getByProjId(dto.getProjId());
-        return dto.getId();
+        if (dto.getTaskState().equals(CommonEnum.taskState.noWrite.getCode()))
+            dto.setTaskState(CommonEnum.taskState.draft.getCode());
+        String id = "";
+        ComProjectTask task = new ComProjectTask();
+        task.setProjId(dto.getProjId());
+        task = this.getEntity(task);
+        if (null == task) {
+            task = convert2Entity(dto);
+            id = this.insert(task);
+        } else {
+            task = convert2Entity(dto);
+            id = this.update(task);
+        }
+        return id;
     }
 
     @Transactional
-    @Override
     public void report(ComProjectAudit model, String unitId, String treeCode) {
         ComProjectTask ComProjectTask = this.entityById(model.getAuditObjectId());
         if (null == ComProjectTask)
@@ -194,19 +229,18 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
     }
 
     @Transactional
-    @Override
     public void audit(ComProjectAudit comProjectAudit, String unitId, String treeCode) {
         // false 报上级或返回下一级  true报到最高级或返回个人
         int state = 0;
         ComProjectTask test = new ComProjectTask();
         test.setId(comProjectAudit.getAuditObjectId());
         if (comProjectAudit.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) {
-            if (state==0) {
+            if (state == 0) {
                 test.setTaskState(CommonEnum.taskState.pass.getCode());
                 comProjectCheckService.insertCheckListByTestId(test.getId());
             }
         } else if (comProjectAudit.getAuditResult().equals(CommonEnum.auditResult.returnModify.getCode())) {
-            if (state==0)
+            if (state == 0)
                 test.setTaskState(CommonEnum.taskState.returnModify.getCode());
         } else {
             test.setTaskState(CommonEnum.taskState.failed.getCode());

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

@@ -31,7 +31,7 @@
     </select>
     <select id="getByProjId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectTaskDTO">
         SELECT ifnull(pt.task_state,0) task_state,
-               pt.report_year,pt.start_date,pt.end_date,pt.unit_type,pt.organization_code,pt.unit_address,pt.registered_address,pt.post_code,
+               pt.id,pt.report_year,pt.start_date,pt.end_date,pt.unit_type,pt.organization_code,pt.unit_address,pt.registered_address,pt.post_code,
                pt.legal_person,pt.workforce,pt.specialized_personnel,pt.research_personnel,
                pt.deposit_bank,pt.bank_account,pt.deposit_bank_address,pt.interbank_number,
                pt.key_areas,pt.proj_work,pt.telephone,pt.fax,