财务-报告复核修改

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

@@ -644,7 +644,14 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             }
             //根据报告类型查询下一节点用户
             List<ReviewUser> stringList = new ArrayList<>();
-            if (reportData.getReportType().equals("1")) {
+            //如果是苏州分部，这里写死
+            if (reportData.getOfficeId().equals("1612359500104769538")){
+                reportData.setReviewBy("1612978455072804866");
+                ReviewUser reviewUser = new ReviewUser();
+                reviewUser.setName("薛庆霞");
+                reviewUser.setSysUserId("1612978455072804866");
+                stringList.add(reviewUser);
+            }else if (reportData.getReportType().equals("1")) {
                 stringList = reportMapper.getReviewByS("1");
             } else {
                 stringList = reportMapper.getReviewByS("2");
@@ -783,7 +790,14 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                     }
                     //根据报告类型查询下一节点用户
                     List<ReviewUser> stringList = new ArrayList<>();
-                    if (reportData.getReportType().equals("1")) {
+                    //如果是苏州分部，这里写死
+                    if (reportData.getOfficeId().equals("1612359500104769538")){
+                        reportData.setReviewBy("1612978455072804866");
+                        ReviewUser reviewUser = new ReviewUser();
+                        reviewUser.setName("薛庆霞");
+                        reviewUser.setSysUserId("1612978455072804866");
+                        stringList.add(reviewUser);
+                    }else if (reportData.getReportType().equals("1")) {
                         stringList = reportMapper.getReviewByS("1");
                     } else {
                         stringList = reportMapper.getReviewByS("2");
@@ -956,7 +970,14 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             }
             //根据报告类型查询下一节点用户
             List<ReviewUser> stringList = new ArrayList<>();
-            if (reportData.getReportType().equals("1")) {
+            //如果是苏州分部，这里写死
+            if (reportData.getOfficeId().equals("1612359500104769538")){
+                reportData.setReviewBy("1612978455072804866");
+                ReviewUser reviewUser = new ReviewUser();
+                reviewUser.setName("薛庆霞");
+                reviewUser.setSysUserId("1612978455072804866");
+                stringList.add(reviewUser);
+            }else if (reportData.getReportType().equals("1")) {
                 stringList = reportMapper.getReviewByS("1");
             } else {
                 stringList = reportMapper.getReviewByS("2");
@@ -1095,7 +1116,14 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                     }
                     //根据报告类型查询下一节点用户
                     List<ReviewUser> stringList = new ArrayList<>();
-                    if (reportData.getReportType().equals("1")) {
+                    //如果是苏州分部，这里写死
+                    if (reportData.getOfficeId().equals("1612359500104769538")){
+                        reportData.setReviewBy("1612978455072804866");
+                        ReviewUser reviewUser = new ReviewUser();
+                        reviewUser.setName("薛庆霞");
+                        reviewUser.setSysUserId("1612978455072804866");
+                        stringList.add(reviewUser);
+                    }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 {