财务-报告修改

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

@@ -444,7 +444,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
@@ -472,4 +472,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

@@ -645,12 +645,9 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             //根据报告类型查询下一节点用户
             List<ReviewUser> stringList = new ArrayList<>();
             //如果是苏州分部，这里写死
-            if (reportData.getOfficeId().equals("1612359500104769538")){
-                reportData.setReviewBy("1612978455072804866");
-                ReviewUser reviewUser = new ReviewUser();
-                reviewUser.setName("薛庆霞");
-                reviewUser.setSysUserId("1612978455072804866");
-                stringList.add(reviewUser);
+            String officeId = reportMapper.getOfficeId("苏州分部");
+            if (reportData.getOfficeId().equals(officeId)){
+                stringList = reportMapper.getReviewByS("13");
             }else if (reportData.getReportType().equals("1")) {
                 stringList = reportMapper.getReviewByS("1");
             } else {
@@ -791,12 +788,9 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                     //根据报告类型查询下一节点用户
                     List<ReviewUser> stringList = new ArrayList<>();
                     //如果是苏州分部，这里写死
-                    if (reportData.getOfficeId().equals("1612359500104769538")){
-                        reportData.setReviewBy("1612978455072804866");
-                        ReviewUser reviewUser = new ReviewUser();
-                        reviewUser.setName("薛庆霞");
-                        reviewUser.setSysUserId("1612978455072804866");
-                        stringList.add(reviewUser);
+                    String officeId = reportMapper.getOfficeId("苏州分部");
+                    if (reportData.getOfficeId().equals(officeId)){
+                        stringList = reportMapper.getReviewByS("13");
                     }else if (reportData.getReportType().equals("1")) {
                         stringList = reportMapper.getReviewByS("1");
                     } else {
@@ -971,12 +965,9 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             //根据报告类型查询下一节点用户
             List<ReviewUser> stringList = new ArrayList<>();
             //如果是苏州分部，这里写死
-            if (reportData.getOfficeId().equals("1612359500104769538")){
-                reportData.setReviewBy("1612978455072804866");
-                ReviewUser reviewUser = new ReviewUser();
-                reviewUser.setName("薛庆霞");
-                reviewUser.setSysUserId("1612978455072804866");
-                stringList.add(reviewUser);
+            String officeId = reportMapper.getOfficeId("苏州分部");
+            if (reportData.getOfficeId().equals(officeId)){
+                stringList = reportMapper.getReviewByS("13");
             }else if (reportData.getReportType().equals("1")) {
                 stringList = reportMapper.getReviewByS("1");
             } else {
@@ -1117,12 +1108,9 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                     //根据报告类型查询下一节点用户
                     List<ReviewUser> stringList = new ArrayList<>();
                     //如果是苏州分部，这里写死
-                    if (reportData.getOfficeId().equals("1612359500104769538")){
-                        reportData.setReviewBy("1612978455072804866");
-                        ReviewUser reviewUser = new ReviewUser();
-                        reviewUser.setName("薛庆霞");
-                        reviewUser.setSysUserId("1612978455072804866");
-                        stringList.add(reviewUser);
+                    String officeId = reportMapper.getOfficeId("苏州分部");
+                    if (reportData.getOfficeId().equals(officeId)){
+                        stringList = reportMapper.getReviewByS("13");
                     }else if (reportData.getReportType().equals("1")) {
                         stringList = reportMapper.getReviewByS("1");
                     } else {