审计金额 报备类型 sql条件更改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/mapper/xml/CwWorkClientBaseMapper.xml

@@ -405,13 +405,13 @@
             invoice.billing_date
         FROM
             cw_project_report_archive AS arc
-                LEFT JOIN cw_finance_invoice_base AS base ON base.program_id = arc.project_id
-                LEFT JOIN cw_finance_invoice_base AS base1 ON base1.invoice_id = base.invoice_id
-                LEFT JOIN cw_project_records AS records ON records.id = base1.program_id
-                LEFT JOIN cw_finance_invoice AS invoice ON invoice.id = base1.invoice_id
-                LEFT JOIN cw_finance_invoice_detail AS detail ON detail.invoice_id = base1.invoice_id
-                LEFT JOIN cw_project_report AS report ON report.id = arc.report_id
-                LEFT JOIN cw_project_report_new_line AS line ON line.report_id=report.id
+                LEFT JOIN cw_finance_invoice_base AS base ON base.program_id = arc.project_id and base.del_flag = '0'
+                LEFT JOIN cw_finance_invoice_base AS base1 ON base1.invoice_id = base.invoice_id and base1.del_flag = '0'
+                LEFT JOIN cw_project_records AS records ON records.id = base1.program_id and records.del_flag = '0'
+                LEFT JOIN cw_finance_invoice AS invoice ON invoice.id = base1.invoice_id and invoice.del_flag = '0'
+                LEFT JOIN cw_finance_invoice_detail AS detail ON detail.invoice_id = base1.invoice_id and detail.del_flag = '0'
+                LEFT JOIN cw_project_report AS report ON report.id = arc.report_id and report.del_flag = '0'
+                LEFT JOIN cw_project_report_new_line AS line ON line.report_id=report.id and line.del_flag = '0'
             ${ew.customSqlSegment}
     </select>
 
@@ -424,10 +424,10 @@
         line.create_date
         FROM
         cw_project_report_archive AS arc
-        LEFT JOIN cw_project_records AS records ON records.id = arc.project_id
-        LEFT JOIN cw_project_report AS report ON report.id = arc.report_id
-        LEFT JOIN cw_project_report_new_line AS line ON line.report_id = report.id
-        LEFT JOIN sys_user AS USER ON USER.id = line.create_by
+        LEFT JOIN cw_project_records AS records ON records.id = arc.project_id and records.del_flag = '0'
+        LEFT JOIN cw_project_report AS report ON report.id = arc.report_id and report.del_flag = '0'
+        LEFT JOIN cw_project_report_new_line AS line ON line.report_id = report.id and line.del_flag = '0'
+        LEFT JOIN sys_user AS USER ON USER.id = line.create_by and USER.del_flag = '0'
             ${ew.customSqlSegment}
     </select>
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/service/CwWorkClientService.java

@@ -80,8 +80,7 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
      */
     public IPage<AuditFindDto> auditFindListBy(AuditFindDto auditFindDto, Page<AuditFindDto> page) throws Exception {
         QueryWrapper<AuditFindDto> queryWrapper = QueryWrapperGenerator.buildQueryCondition (auditFindDto, AuditFindDto.class);
-       // queryWrapper.eq("arc.id", auditFindDto.getReportId()).ne("report.audit_fees",null).ne("report.audit_fees",0);
-        queryWrapper.eq("arc.id", auditFindDto.getReportId());
+        queryWrapper.eq("arc.id", auditFindDto.getReportId()).ne("report.audit_fees",null).ne("report.audit_fees",0);
 
         IPage<AuditFindDto> list = cwWorkClientBaseMapper.auditFindListBy(page, queryWrapper);
         return list;
@@ -93,7 +92,7 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
     public IPage<AuditFindDto> auditFindList(AuditFindDto auditFindDto, Page<AuditFindDto> page) throws Exception {
          QueryWrapper<AuditFindDto> queryWrapper = QueryWrapperGenerator.buildQueryCondition (auditFindDto, AuditFindDto.class);
 
-        queryWrapper.eq("arc.id", auditFindDto.getReportId());
+        queryWrapper.eq("arc.id", auditFindDto.getReportId()).eq("arc.static", 5);
 
         if (ObjectUtil.isNotEmpty(auditFindDto)) {
             if (StringUtils.isNotBlank(auditFindDto.getNumber())){