1

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

@@ -279,19 +279,19 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
         if (model.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) {
             if (unitLevel.equals(1)) {
                 if (auditMethod.equals(CommonEnum.auditMethod.audit.getCode())) {
-//                    if (model.getAuditType().equals(CommonEnum.auditType.project.getCode())) {
-                    ComProjectAudit auditNote = this.getAudit(auditObjectId, auditUnitId, auditType, CommonEnum.auditMethod.last.getCode(), null);
-                    if (null != auditNote) {
-                        // 更新上级单位上报记录
-                        this.updateAudit(auditNote.getId(), CommonEnum.auditResult.waitAudit.getCode(), "", index + 1, SecurityUserHolder.getPersonId(), new Date(), null, null, null, null);
-                    } else {
-                        //插入上报表
-                        this.insertAudit(reportYear, auditType, auditObjectId, CommonEnum.auditMethod.last.getCode(), auditUnitId, null, CommonEnum.auditResult.waitAudit.getCode(), null, unitLevel, index + 1, SecurityUserHolder.getPersonId());
+                    if (!model.getAuditType().equals(CommonEnum.auditType.task.getCode())) {
+                        ComProjectAudit auditNote = this.getAudit(auditObjectId, auditUnitId, auditType, CommonEnum.auditMethod.last.getCode(), null);
+                        if (null != auditNote) {
+                            // 更新上级单位上报记录
+                            this.updateAudit(auditNote.getId(), CommonEnum.auditResult.waitAudit.getCode(), "", index + 1, SecurityUserHolder.getPersonId(), new Date(), null, null, null, null);
+                        } else {
+                            //插入上报表
+                            this.insertAudit(reportYear, auditType, auditObjectId, CommonEnum.auditMethod.last.getCode(), auditUnitId, null, CommonEnum.auditResult.waitAudit.getCode(), null, unitLevel, index + 1, SecurityUserHolder.getPersonId());
+                        }
+                        // 插入审核记录表
+                        comProjectAuditNoteService.insertAuditNote(reportYear, auditType, auditObjectId, CommonEnum.auditMethod.last.getCode(), auditUnitId, null, CommonEnum.auditResult.waitAudit.getCode(), null, unitLevel, index + 1, SecurityUserHolder.getPersonId());
+                        unitId = auditUnitId;
                     }
-                    // 插入审核记录表
-                    comProjectAuditNoteService.insertAuditNote(reportYear, auditType, auditObjectId, CommonEnum.auditMethod.last.getCode(), auditUnitId, null, CommonEnum.auditResult.waitAudit.getCode(), null, unitLevel, index + 1, SecurityUserHolder.getPersonId());
-                    unitId = auditUnitId;
-//                    }
                 }
             } else {
                 // 获取上级单位

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

@@ -67,8 +67,9 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
     private ComProjectKpitService comProjectKpitService;
     @Autowired
     private SystemParameterService systemParameterService;
+
     @Autowired
-    private ComBatchService comBatchService;
+    private ComProjectAuditNoteService comProjectAuditNoteService;
 
     @Override
     protected void setCriteriaForQuery(ComProjectTaskQueryVO vo, QueryWrapper<ComProjectTaskQueryVO> criteria) {
@@ -306,6 +307,11 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
             fileList = ComFileService.getListByObjectId(dto.getProjId(), CommonEnum.fileType.project.getCode());
         fileList = configureFileList(fileList);
         dto.setFileList(fileList);
+
+        //审核记录列表
+        List<ComProjectAuditNoteDTO> auditList = comProjectAuditNoteService.getListByObjectId(dto.getId());
+        dto.setAuditList(auditList);
+
         return dto;
     }
 

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

@@ -41,7 +41,7 @@
     </select>
     <select id="getTaskAuditListByPage"  resultType="com.yiboshi.science.param.dto.ComProjectAuditDTO">
         SELECT
-        a.*,c.id proj_id,c.proj_name,c.proj_no,c.version_no,c.app_no,c.proj_class,c.start_date,c.end_date,c.proj_state,d.unit_name app_unit_name,e.person_name app_person_name
+        a.*,c.id proj_id,c.proj_name,c.proj_no,c.version_no,c.app_no,c.proj_class,b.start_date,b.end_date,c.proj_state,d.unit_name app_unit_name,e.person_name app_person_name
         FROM com_project_audit a
         left join com_project_task b on a.audit_object_id=b.id
         left join com_project c on b.proj_id=c.id