入账修改

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgaccount/entity/HlgAccountDetailInMoney.java

@@ -72,7 +72,11 @@ public class HlgAccountDetailInMoney implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date generateTime;
-
+    /**
+     * 是否在税务统计展示（0：否 1：是）
+     */
+    @Excel(name = "退款表里的是否展示（0：否 1：是）", width = 15)
+    private java.lang.Integer isDisplay;
 
     @TableField(exist = false)
     private String generateTimeRange_begin;  //开始时间用于查询

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgaccount/mapper/xml/HlgAccountDetailMapper.xml

@@ -367,7 +367,8 @@
         (select sum(b.refund_service_fee) from hlg_refund_detail b where b.account_detail_id = a.id)  AS "refundServiceFee",
         a.generate_time AS "generateTime",
         com.business_license as "businessLicense",
-        hcsc.service_contract as "serviceContract"
+        hcsc.service_contract as "serviceContract",
+        hrd.is_display as "isDisplay"
         FROM hlg_account_detail a
         LEFT JOIN hlg_account ac ON ac.id = a.account_id
 		LEFT JOIN hlg_company com ON com.id = ac.company_id
@@ -400,7 +401,8 @@
         a.service_fee AS "serviceFee",
         a.business_time AS "generateTime",
         CASE WHEN a.is_through_platform=1 THEN  hp.business_license else hpc.business_license end  AS "businessLicense",
-        CASE WHEN a.is_through_platform=1 THEN  hr.subcontract else hr.service_contract end  AS "serviceContract"
+        CASE WHEN a.is_through_platform=1 THEN  hr.subcontract else hr.service_contract end  AS "serviceContract",
+        0 as "isDisplay"
         FROM hw_platform_company_account_detail a
         left join hw_requirement hr on hr.id=a.requirement_id
         left join hw_platform_company hpc on hpc.id=hr.platform_company_id