审计收费模块

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/controller/CwFinanceInvoiceController.java

@@ -384,4 +384,14 @@ public class CwFinanceInvoiceController {
 
         return flag;
     }
+
+
+
+
+
+
+
+
+
+
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/domain/CwFinanceInvoice.java

@@ -185,5 +185,16 @@ public class CwFinanceInvoice extends BaseEntity {
      */
     private String billingId;
 
+
+    /**
+     * 报备类型(其他)
+     */
+    private String reportType;
+    /**
+     * 报备类型
+     */
+    private String recordReportType;
+
+
     private static final long serialVersionUID = 1L;
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/mapper/xml/CwFinanceInvoiceMapper.xml

@@ -150,7 +150,8 @@
         fi.invalid_status,
         fi.receivables_date,
         fi.is_multiple,
-        fi.billing_id
+        fi.billing_id,
+        fi.report_type
     </sql>
 
     <sql id="File_Column_List">
@@ -227,23 +228,27 @@
         where fib.del_flag = '0' and fib.invoice_id = ${id}
     </select>
     <select id="findList" resultMap="BaseResultMap">
-        select
-        DISTINCT
+        SELECT
+        distinct
         <include refid="Base_Column_List"></include>,
+        fib.program_id,
         su.name as operator,
         so.name as operator_office,
         d.ID_ AS task_id,
         (select
         CASE
-        WHEN RIGHT( GROUP_CONCAT(case when program_id is null then 2 else 1 end),1) =2 THEN GROUP_CONCAT(concat('其他：',wipr1.program_name))
-        WHEN RIGHT( GROUP_CONCAT(case when program_id is null then 2 else 1 end),1) =1 THEN GROUP_CONCAT(rpr1.project_name)
+        WHEN RIGHT( GROUP_CONCAT(case when program_id is null then 2 else 1 end),1) =2 THEN '其他：'
+        WHEN RIGHT( GROUP_CONCAT(case when program_id is null then 2 else 1 end),1) =1 THEN rpr1.project_name
         ELSE '' END
         FROM cw_finance_invoice_base wipr1
         LEFT JOIN cw_project_records rpr1 ON wipr1.program_id = rpr1.id
         WHERE wipr1.invoice_id = fi.id) as programName,
         cfid.number as "number",
-        cfid.account as "accountDetail"
-        from cw_finance_invoice fi
+        cfid.account as "accountDetail",
+        pr.report_type as "recordReportType"
+        FROM cw_finance_invoice_base fib
+        LEFT JOIN cw_project_records pr on fib.program_id=pr.id
+        LEFT JOIN cw_finance_invoice fi on  fib.invoice_id=fi.id
         left join cw_finance_invoice_detail cfid on cfid.invoice_id = fi.id and cfid.del_flag = '0'
         left join sys_user su on fi.create_by_id = su.id and su.del_flag = '0'
         left join sys_user_manage_office sumo on sumo.office_id = su.office_id

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/CwFinanceInvoiceService.java

@@ -19,6 +19,8 @@ import com.jeeplus.finance.invoice.service.dto.CwFinanceInvoiceDTO;
 import com.jeeplus.finance.invoice.service.dto.CwFinanceInvoiceDetailDTO;
 import com.jeeplus.finance.invoice.service.dto.CwFinanceInvoiceReceivablesDTO;
 import com.jeeplus.finance.invoice.service.mapstruct.*;
+import com.jeeplus.finance.projectRecords.mapper.CwProjectRecordsMapper;
+import com.jeeplus.finance.projectRecords.service.dto.CwProjectRecordsDTO;
 import com.jeeplus.finance.workClientInfo.domain.CwWorkClientBase;
 import com.jeeplus.finance.workClientInfo.domain.CwWorkClientBilling;
 import com.jeeplus.finance.workClientInfo.service.CwWorkClientBillingService;
@@ -60,6 +62,9 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
     private CwFinanceInvoiceReceivablesMapper cwFinanceInvoiceReceivablesMapper;
     @Resource
     private CwFinanceInvoiceInvalidMapper cwFinanceInvoiceInvalidMapper;
+    @Resource
+    private CwProjectRecordsMapper cwProjectRecordsMapper;
+
 //    @Resource
 //    private SerialnumTplService serialnumTplService;
 //    @Resource
@@ -222,9 +227,12 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                                 }
                             }
                         }
+//                        String label = cwProjectRecordsMapper.selectLabel();
+//                        queryWrapper.eq("sdv.dict_type_id",label);
                         checkNum.getAndIncrement();
+
                     }
-                }
+            }
             // 经办人
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getOperator())){
                 queryWrapper.like("su.name", cwFinanceInvoiceDTO.getOperator());
@@ -304,6 +312,8 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                 break;
             }
         }*/
+//        cwFinanceInvoiceMapper.selectList(new QueryWrapper<CwFinanceInvoice>().inSql("sdv.dict_type_id","SELECT id FROM `sys_dict_type` WHERE type='cw_work_client_report_type'"));
+//            queryWrapper.select("SELECT id FROM `sys_dict_type` WHERE type='cw_work_client_report_type'");
 
 
         return cwFinanceInvoiceMapper.findList(page,queryWrapper,officeIds.toString());
@@ -356,6 +366,9 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                 if (StringUtils.isBlank(cwFinanceInvoice.getReceivablesStatus())){
                     cwFinanceInvoice.setReceivablesStatus("0");
                 }
+                if(StringUtils.isBlank(cwFinanceInvoice.getReportType())){
+                    cwFinanceInvoice.setReportType(cwFinanceInvoiceDTO.getReportType());
+                }
             }
         }
         if(StringUtils.isNotBlank(cwFinanceInvoiceDTO.getId())){

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/dto/CwFinanceInvoiceBaseDTO.java

@@ -45,5 +45,8 @@ public class CwFinanceInvoiceBaseDTO extends BaseDTO {
 
     private String account;
 
+    private String reportType;
+
+
     private static final long serialVersionUID = 1L;
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/dto/CwFinanceInvoiceDTO.java

@@ -1,6 +1,7 @@
 package com.jeeplus.finance.invoice.service.dto;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.service.dto.BaseDTO;
 import com.jeeplus.finance.projectRecords.service.dto.CwProjectRecordsDTO;
@@ -315,6 +316,16 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
      * 实际开票单位的开票信息id
      */
     private String billingId;
+    /**
+     * 报备类型(其他)
+     */
+    private String reportType;
+
+    /**
+     * 报备类型
+     */
+    private String recordReportType;
+
 
     private static final long serialVersionUID = 1L;
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/controller/CwProjectRecordsController.java

@@ -211,4 +211,34 @@ public class CwProjectRecordsController {
         return cwProjectRecordsService.getHaveProjectIds();
     }
 
+
+    /**
+     * 查找该报告及报告对应项目下的开票列表
+     */
+    @ApiOperation(value = "查询该报告及报告对应项目下的开票列表")
+    @GetMapping(value = "/getReportById")
+    public ResponseEntity<List<CwProjectRecordsDTO>> getReportById(String id,CwProjectRecordsDTO cwProjectRecordsDTO) throws Exception {
+        List<CwProjectRecordsDTO> reportList=  cwProjectRecordsService.getReportById(id,cwProjectRecordsDTO);
+        return ResponseEntity.ok(reportList);
+    }
+
+
+    /**
+     * 该项目下审计收费不为0的报告信息
+     */
+    @ApiOperation(value = "该项目下审计收费不为0的报告信息")
+    @GetMapping(value = "/getReportByProjectId")
+    public ResponseEntity<List<CwProjectRecordsDTO>> getReportByProjectId(String id) throws Exception {
+        List<CwProjectRecordsDTO> reportList=  cwProjectRecordsService.getReportByProjectId(id);
+        return ResponseEntity.ok(reportList);
+    }
+
+
+
+
+
+
+
+
+
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwProjectRecordsMapper.java

@@ -74,4 +74,10 @@ public interface CwProjectRecordsMapper extends BaseMapper<CwProjectRecords> {
 
     @InterceptorIgnore(tenantLine = "true")
     List<CwProjectRecords> getListByIds(@Param("ids") List<String> ids);
+
+
+
+    List<CwProjectRecordsDTO> getReportById(@Param("id") String id, @Param("cwProjectRecordsDTO") CwProjectRecordsDTO cwProjectRecordsDTO);
+
+    List<CwProjectRecordsDTO> getReportByProjectId(@Param("id") String id);
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/xml/CwProjectRecordsMapper.xml

@@ -468,4 +468,55 @@
          </where>
 
     </select>
+
+    <select id="selectLabel" resultType="String">
+        SELECT id FROM sys_dict_type WHERE type='cw_work_client_report_type'
+    </select>
+
+    <select id="getReportById" resultType="com.jeeplus.finance.projectRecords.service.dto.CwProjectRecordsDTO">
+        SELECT
+        distinct
+        cpr.project_name,
+        prnl.report_no,
+        fi.no,
+        fid.number,
+        fid.account,
+        fi.billing_people,
+        fi.billing_date
+        FROM cw_project_report_archive a
+        LEFT JOIN cw_project_records cpr on a.project_id=cpr.id
+        LEFT JOIN cw_project_report pr on pr.project_id=cpr.id
+        LEFT JOIN cw_finance_invoice_base fib on cpr.id=fib.program_id
+        LEFT JOIN cw_finance_invoice fi on fi.id=fib.invoice_id
+        LEFT JOIN cw_project_report_new_line prnl on pr.id=prnl.report_id
+        LEFT JOIN cw_finance_invoice_detail fid on fi.id=fid.invoice_id
+        <where>
+        <if test="null!=cwProjectRecordsDTO.number and cwProjectRecordsDTO.number!=''">
+           and fid.number=#{cwProjectRecordsDTO.number}
+        </if>
+        <if test="cwProjectRecordsDTO.no!=null and cwProjectRecordsDTO.no!=''">
+           and fi.no=#{cwProjectRecordsDTO.no}
+        </if>
+        <if test="cwProjectRecordsDTO.reportNo!=null and cwProjectRecordsDTO.reportNo!=''">
+           and prnl.report_no=#{cwProjectRecordsDTO.reportNo}
+        </if>
+         and a.id=#{id} or fib.program_id=(SELECT project_id FROM cw_project_report_archive where id=#{id})
+        </where>
+    </select>
+
+    <select id="getReportByProjectId" resultType="com.jeeplus.finance.projectRecords.service.dto.CwProjectRecordsDTO">
+        SELECT
+			  cpr.project_name,
+				prnl.report_no,
+				pr.audit_fees,
+				su.login_name,
+				pr.create_time
+        from cw_project_report pr
+        LEFT JOIN cw_project_report_new_line prnl on pr.id=prnl.report_id
+        LEFT JOIN cw_project_records cpr on pr.project_id=cpr.id
+        LEFT JOIN sys_user su on pr.create_by_id = su.id
+        WHERE pr.audit_fees >'0' and pr.project_id=#{id}
+    </select>
+
+
 </mapper>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/CwProjectRecordsService.java

@@ -152,6 +152,8 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
                     }
                 }
             }
+
+
         });
         return list;
     }
@@ -625,4 +627,18 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
         return ResponseEntity.ok(cwProjectRecordsMapper.getHaveProjectIds(userDTO));
     }
 
+
+
+
+    public List<CwProjectRecordsDTO> getReportById(String id,CwProjectRecordsDTO cwProjectRecordsDTO) throws Exception {
+        List<CwProjectRecordsDTO> reportById = cwProjectRecordsMapper.getReportById(id, cwProjectRecordsDTO);
+        return reportById;
+
+
+    }
+
+    public List<CwProjectRecordsDTO> getReportByProjectId(String id) {
+        List<CwProjectRecordsDTO> projectList=cwProjectRecordsMapper.getReportByProjectId(id);
+        return projectList;
+    }
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/dto/CwProjectRecordsDTO.java

@@ -231,4 +231,23 @@ public class CwProjectRecordsDTO extends BaseDTO {
      */
     private String reportReview;
 
+    /**
+     * 查找该报告及报告对应项目下的开票列表
+     */
+    private String reportNo;
+    private String no;
+    private String number;
+    private String account;
+    private String billingPeople;
+    @Excel(name = "开票时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "6")
+    private String billingDate;
+
+    /**
+     * 该项目下审计收费不为0的报告信息
+     */
+    private String auditFees;
+    private String loginName;
+
+
+
 }