报告复核通过后，项目不可操作

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/domain/CwProjectRecords.java

@@ -108,4 +108,9 @@ public class CwProjectRecords extends BaseEntity {
      */
     private String reportType;
 
+    /**
+     * 报告复核 1：已开始复核/已完成复核
+     */
+    private String reportReview;
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/mapper/xml/CwProjectRecordsMapper.xml

@@ -43,6 +43,7 @@
         <result property="reportType" column="report_type" jdbcType="VARCHAR"/>
         <result property="memberCount" column="member_count" jdbcType="VARCHAR"/>
         <result property="realHeaderName" column="real_header_name" jdbcType="VARCHAR"/>
+        <result property="reportReview" column="report_review" jdbcType="VARCHAR"/>
         <collection property="cwProjectClientInfoDTOList" ofType="com.jeeplus.test.cw.workClientInfo.service.dto.CwWorkClientBaseDTO" column="id" select="getProjectClient"></collection>
         <collection property="workAttachmentDtoList" ofType="com.jeeplus.test.workContract.service.dto.WorkAttachmentDto" column="id" select="getFileList"></collection>
         <collection property="cwProjectClientContactDTOList" ofType="com.jeeplus.test.cw.projectRecords.service.dto.CwProjectClientContactDTO" column="id" select="getContact"></collection>
@@ -87,7 +88,8 @@
         a.business_type,
         a.risk_level,
         a.real_header,
-        a.report_type
+        a.report_type,
+        a.report_review
     </sql>
     <sql id="File_Column_List">
         wa.id,

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/dto/CwProjectRecordsDTO.java

@@ -225,4 +225,9 @@ public class CwProjectRecordsDTO extends BaseDTO {
      */
     private String memberCount;
 
+    /**
+     * 报告复核 1：已开始复核/已完成复核
+     */
+    private String reportReview;
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportReviewService.java

@@ -88,14 +88,11 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
         //根据id找到报告id，然后根据报告id找到projectid，然后根据projectId修改状态
         String projectId = mapper.getProjectIdByReportId(data.getId());
 
-        //将关联的项目信息的状态改为5
-        CwProjectRecordsDTO recordsDTO = recordsMapper.queryById(projectId);
-        CwProjectRecords records = new CwProjectRecords();
-        BeanUtils.copyProperties(recordsDTO, records);
-        records.setStatus("5");
-        records.setUpdateBy(userDTO.getId());
-        records.setUpdateDate(new Date());
-        recordsMapper.updateById(records);
+        //将关联的项目信息的状态改为已开始/已复核完成
+//        CwProjectRecords records = new CwProjectRecords();
+//        records.setId(projectId);
+//        records.setReportReview("0");
+//        recordsMapper.updateById(records);
         CwProjectReportData reviewData = mapper.selectByPortId(data.getId());
         //对复核数据进行持久化操作
         if (CollectionUtils.isNotEmpty(data.getDetails())) {
@@ -250,14 +247,12 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
             }
         }
         mapper.updateById(review);
-        //将关联的项目信息的状态改为6
-        CwProjectRecordsDTO recordsDTO = recordsMapper.queryById(reportData.getProjectId());
-        CwProjectRecords records = new CwProjectRecords();
-        BeanUtils.copyProperties(recordsDTO, records);
-        records.setUpdateBy(userDTO.getId());
-        records.setUpdateDate(new Date());
-        records.setStatus("6");
-        recordsMapper.updateById(records);
+        if ("5".equals(review.getReviewStatus())) {
+            CwProjectRecords records = new CwProjectRecords();
+            records.setId(reportData.getProjectId());
+            records.setReportReview("1"); // 已开始报告复核
+            recordsMapper.updateById(records);
+        }
         //对复核数据进行持久化操作
         if (CollectionUtils.isNotEmpty(reportData.getDetails())) {
             for (CwProofreadDetail detail1:reportData.getDetails()) {
@@ -314,12 +309,10 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
         info.setUpdateDate(new Date());
         info.setReportId(dto.getId());
         mapper.insert(info);
-        //将关联的项目信息的状态改为6
-        CwProjectRecordsDTO recordsDTO = recordsMapper.queryById(dto.getProjectId());
-        CwProjectRecords records = new CwProjectRecords();
-        BeanUtils.copyProperties(recordsDTO, records);
-        records.setStatus("6");
-        recordsMapper.updateById(records);
+//        CwProjectRecords records = new CwProjectRecords();
+//        records.setId(dto.getProjectId());
+//        records.setReportReview("1"); // 已开始报告复核
+//        recordsMapper.updateById(records);
         //明细表相关信息
         if (CollectionUtils.isNotEmpty(dto.getDetails())) {
             for (CwProofreadDetail detail:dto.getDetails()) {