财务-报告修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/mapper/xml/ReportCancellApplyMapper.xml

@@ -6,6 +6,7 @@
          case a.`status` WHEN '5' THEN '已完成' END as documentStatus,
          su3.name as reportSponsor,
         b.report_no,
+        cw_re.review_status,
         c.project_name,c.project_master_id,su.name as user_name,
         su2.name as project_master_name,
         b.id as report_new_line_id
@@ -14,6 +15,7 @@
         on a.id = b.report_id and b.del_flag = '0'
         LEFT JOIN cw_project_records c
         on a.project_id = c.id and c.del_flag = '0'
+        left join cw_project_report_review cw_re on a.id = cw_re.id and cw_re.del_flag = '0'
         left join sys_user su on su.id = a.create_by and su.del_flag = '0'
         left join sys_user su2 on su2.id = c.project_master_id and su2.del_flag = '0'
         left join sys_user su3 on su3.id = a.create_by and su3.del_flag = '0'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/service/ReportCancellApplyService.java

@@ -248,6 +248,8 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
         queryWrapper.eq("a.del_flag","0");
         queryWrapper.eq("a.status","5");
         queryWrapper.eq("b.delete_sign","0");
+//        queryWrapper.eq("cw_re.review_status","5");
+        queryWrapper.isNotNull("b.report_no");
         queryWrapper.orderByDesc("a.create_date");
         if (StringUtils.isNotEmpty(reportInfoDto.getProjectName())) {
             queryWrapper.like("c.project_name", reportInfoDto.getProjectName());