Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-business/src/main/java/com/zjugis/business/bean/response/ProjectReportResp.java

@@ -27,6 +27,9 @@ public class ProjectReportResp {
     @Schema(description = "项目名称")
     private String xmmc;
 
+    @Schema(description = "项目部门")
+    private String xmbm;
+
     @Schema(description = "项目经理")
     private String xmjl;
 

zjugis-business/src/main/java/com/zjugis/business/converter/projectreport/ProjectReportConvert.java

@@ -34,4 +34,9 @@ public interface ProjectReportConvert {
     ProjectReport convert01(ProjectReportRequest entity);
 
     List<ProjectReportResp> convertList01(List<ProjectReport> list);
+
+    @Mappings({
+            @Mapping(source = "id", target = "reportId")
+    })
+    ProjectReportResp convert02(ProjectReport entity);
 }

zjugis-business/src/main/java/com/zjugis/business/service/impl/ProjectReportServiceImpl.java

@@ -107,6 +107,9 @@ public class ProjectReportServiceImpl implements ProjectReportService {
     @Override
     public void commit(String id) {
         ProjectReport projectReport = projectReportMapper.selectById(id);
+        if (ObjectUtil.isNotNull(projectReport)) {
+            throw exception(REPORT_IS_EXISTS);
+        }
         String createWorker = projectReport.getCreateWorker();
         AdminUserRespDTO userLeader = adminUserApi.getUserLeader(createWorker).getCheckedData();
         projectReport.setReportStatus(ProjectReportStatusEnum.AUDIT.getValue());
@@ -124,6 +127,9 @@ public class ProjectReportServiceImpl implements ProjectReportService {
     @Override
     public void pass(ProjectReportAuditPassRequest reqVO) {
         ProjectReport projectReport = projectReportMapper.selectById(reqVO.getReportId());
+        if (ObjectUtil.isNotNull(projectReport)) {
+            throw exception(REPORT_IS_EXISTS);
+        }
         String createWorker = projectReport.getCreateWorker();
         AdminUserRespDTO userLeader = adminUserApi.getUserLeader(createWorker).getCheckedData();
         String loginUserId = SecurityFrameworkUtils.getLoginUserId();
@@ -151,6 +157,9 @@ public class ProjectReportServiceImpl implements ProjectReportService {
     @Override
     public void reject(ProjectReportAuditRejectRequest reqVO) {
         ProjectReport projectReport = projectReportMapper.selectById(reqVO.getReportId());
+        if (ObjectUtil.isNotNull(projectReport)) {
+            throw exception(REPORT_IS_EXISTS);
+        }
         projectReport.setReportAuditorId("");
         projectReport.setReportStatus(ProjectReportStatusEnum.REJECT.getValue());
         projectReport.setLatestModifyTime(null);