Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/CwProjectReportMapper.java

@@ -138,4 +138,6 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      * @return
      */
     String getServedUnitName(String id);
+
+    String getOfficeId(String name);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -447,7 +447,7 @@
         ${ew.customSqlSegment}
     </select>
     <select id="getReviewByS" resultType="com.jeeplus.test.cw.projectReport.domain.ReviewUser">
-        select name,id,sys_user_id from cw_project_report_review_user where parent_id = #{parentId} ORDER BY name
+        select name,id,sys_user_id from cw_project_report_review_user where parent_id = #{parentId} and del_flag = 0 ORDER BY name
     </select>
     <select id="findDtos" resultType="com.jeeplus.test.workContract.service.dto.WorkAttachmentDto">
         SELECT
@@ -475,4 +475,7 @@
         left join cw_work_client_base b on a.client_contacts = b.id
         where cw_pro.id = #{id}
     </select>
+    <select id="getOfficeId" resultType="java.lang.String">
+        select id from sys_office where name = #{name}
+    </select>
 </mapper>

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

@@ -165,7 +165,7 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
             FlowNode currentTask = flowTaskService.getCurrentTask(detail.getProcInsId());
             if(null != currentTask && StringUtils.isNotBlank(currentTask.getName())) {
                 if ("二级复核".equals(currentTask.getName())) {
-//设置报告文号、报告流水号
+                    //设置报告文号、报告流水号
                     CwProjectInfoData infoData = new CwProjectInfoData();
                     //报告文号生成
                     String documentNo = "";

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

@@ -656,7 +656,11 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             }
             //根据报告类型查询下一节点用户
             List<ReviewUser> stringList = new ArrayList<>();
-            if (reportData.getReportType().equals("1")) {
+            //如果是苏州分部，这里写死
+            String officeId = reportMapper.getOfficeId("苏州分部");
+            if (reportData.getOfficeId().equals(officeId)){
+                stringList = reportMapper.getReviewByS("13");
+            }else if (reportData.getReportType().equals("1")) {
                 stringList = reportMapper.getReviewByS("1");
             } else {
                 stringList = reportMapper.getReviewByS("2");
@@ -795,7 +799,11 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                     }
                     //根据报告类型查询下一节点用户
                     List<ReviewUser> stringList = new ArrayList<>();
-                    if (reportData.getReportType().equals("1")) {
+                    //如果是苏州分部，这里写死
+                    String officeId = reportMapper.getOfficeId("苏州分部");
+                    if (reportData.getOfficeId().equals(officeId)){
+                        stringList = reportMapper.getReviewByS("13");
+                    }else if (reportData.getReportType().equals("1")) {
                         stringList = reportMapper.getReviewByS("1");
                     } else {
                         stringList = reportMapper.getReviewByS("2");
@@ -968,7 +976,11 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             }
             //根据报告类型查询下一节点用户
             List<ReviewUser> stringList = new ArrayList<>();
-            if (reportData.getReportType().equals("1")) {
+            //如果是苏州分部，这里写死
+            String officeId = reportMapper.getOfficeId("苏州分部");
+            if (reportData.getOfficeId().equals(officeId)){
+                stringList = reportMapper.getReviewByS("13");
+            }else if (reportData.getReportType().equals("1")) {
                 stringList = reportMapper.getReviewByS("1");
             } else {
                 stringList = reportMapper.getReviewByS("2");
@@ -1107,7 +1119,11 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                     }
                     //根据报告类型查询下一节点用户
                     List<ReviewUser> stringList = new ArrayList<>();
-                    if (reportData.getReportType().equals("1")) {
+                    //如果是苏州分部，这里写死
+                    String officeId = reportMapper.getOfficeId("苏州分部");
+                    if (reportData.getOfficeId().equals(officeId)){
+                        stringList = reportMapper.getReviewByS("13");
+                    }else if (reportData.getReportType().equals("1")) {
                         stringList = reportMapper.getReviewByS("1");
                     } else {
                         stringList = reportMapper.getReviewByS("2");

jeeplus-plugins/jeeplus-wps/target/generated-sources/annotations/com/jeeplus/office/service/mapstruct/DocCategoryWrapperImpl.java

@@ -11,8 +11,8 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2022-03-20T22:29:54+0800",
-    comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_221 (Oracle Corporation)"
+    date = "2023-01-11T17:54:56+0800",
+    comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_211 (Oracle Corporation)"
 )
 @Component
 public class DocCategoryWrapperImpl implements DocCategoryWrapper {
@@ -106,6 +106,9 @@ public class DocCategoryWrapperImpl implements DocCategoryWrapper {
         docCategoryDTO.setUpdateDate( dto.getUpdateDate() );
         docCategoryDTO.setUpdateBy( dto.getUpdateBy() );
         docCategoryDTO.setDelFlag( dto.getDelFlag() );
+        docCategoryDTO.setTaskId( dto.getTaskId() );
+        docCategoryDTO.setProcInsId( dto.getProcInsId() );
+        docCategoryDTO.setProcessDefinitionId( dto.getProcessDefinitionId() );
         docCategoryDTO.setParent( copyDTO( dto.getParent() ) );
         List<DocCategoryDTO> list = dto.getChildren();
         if ( list != null ) {

jeeplus-plugins/jeeplus-wps/target/generated-sources/annotations/com/jeeplus/office/service/mapstruct/DocTemplateWrapperImpl.java

@@ -13,8 +13,8 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2022-03-20T22:29:56+0800",
-    comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_221 (Oracle Corporation)"
+    date = "2023-01-11T17:54:56+0800",
+    comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_211 (Oracle Corporation)"
 )
 @Component
 public class DocTemplateWrapperImpl implements DocTemplateWrapper {