no message

src/main/java/cn/ezhizao/project/business/finance/IndividualIncomeTax/controller/BizFinancialIndividualIncomeTaxDetailController.java

@@ -40,10 +40,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -179,6 +176,8 @@ public class BizFinancialIndividualIncomeTaxDetailController extends BaseControl
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult saveDetail(@RequestBody BizFinancialIndividualIncomeTaxDetail bizFinancialIndividualIncomeTaxDetail) throws NoSuchFieldException, IllegalAccessException {
         String status = "";
+        bizFinancialIndividualIncomeTaxDetail.setVerifierId(getUserId());
+        bizFinancialIndividualIncomeTaxDetail.setVerifierTime(new Date());
         boolean bool = bizFinancialIndividualIncomeTaxDetailService.saveOrUpdate(bizFinancialIndividualIncomeTaxDetail);
         switch (bizFinancialIndividualIncomeTaxDetail.getStatus()) {
             case 0:
@@ -203,6 +202,7 @@ public class BizFinancialIndividualIncomeTaxDetailController extends BaseControl
         delConditions.setMasterTableName("biz_financial_individual_income_tax_detail");
         fileStorageService.physicalDelete(delConditions);
         bool = bool && (fileStorages.isEmpty() || fileStorageService.saveOrUpdateBatch(fileStorages));
+
         return toAjax(addRecord(bizFinancialIndividualIncomeTaxDetail.getFinancialIndividualIncomeTaxId(),
                 bizFinancialIndividualIncomeTaxDetail.getYear(), bizFinancialIndividualIncomeTaxDetail.getMonth(), SecurityUtils.getUserId(), status) && bool);
     }

src/main/java/cn/ezhizao/project/business/finance/IndividualIncomeTax/domain/BizFinancialIndividualIncomeTax.java

@@ -4,10 +4,12 @@ import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.web.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 个税任务对象 biz_financial_individual_income_tax
@@ -109,5 +111,15 @@ public class BizFinancialIndividualIncomeTax extends BaseEntity implements Seria
     @TableField(exist = false)
     private String customerLabelName;
 
+    @Excel(name = "审核人", sort = 8)
+    @TableField(exist = false)
+    private String verifierName;
+
+    @TableField(exist = false)
+    @Excel(name = "审核时间", dateFormat = "yyyy-MM-dd",sort = 9)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private java.util.Date verifierTime;
 
+    @TableField(exist = false)
+    private List<String> dateFilter;
 }

src/main/java/cn/ezhizao/project/business/finance/IndividualIncomeTax/domain/BizFinancialIndividualIncomeTaxDetail.java

@@ -10,6 +10,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -79,4 +80,6 @@ public class BizFinancialIndividualIncomeTaxDetail extends BaseEntity implements
     private String companyName;
     @TableField(exist = false)
     private String currentMonth;
+
+    private Date verifierTime;
 }

src/main/java/cn/ezhizao/project/business/finance/IndividualIncomeTaxIsZero/controller/BizFinancialIndividualIncomeTaxDetailIsZeroController.java

@@ -1,5 +1,6 @@
 package cn.ezhizao.project.business.finance.IndividualIncomeTaxIsZero.controller;
 
+import java.util.Date;
 import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -105,6 +106,8 @@ public class BizFinancialIndividualIncomeTaxDetailIsZeroController extends BaseC
                 break;
 
         }
+        bizFinancialIndividualIncomeTaxDetail.setVerifierId(getUserId());
+        bizFinancialIndividualIncomeTaxDetail.setVerifierTime(new Date());
         return toAjax(bizFinancialIndividualIncomeTaxDetailService.save(bizFinancialIndividualIncomeTaxDetail)&&addRecord(bizFinancialIndividualIncomeTaxDetail.getCompanyId(),bizFinancialIndividualIncomeTaxDetail.getFinancialIndividualIncomeTaxId(),
 
                 bizFinancialIndividualIncomeTaxDetail.getYear(),bizFinancialIndividualIncomeTaxDetail.getMonth(), SecurityUtils.getUserId(),status));
@@ -135,6 +138,7 @@ public class BizFinancialIndividualIncomeTaxDetailIsZeroController extends BaseC
 
         }
         bizFinancialIndividualIncomeTaxDetail.setVerifierId(getUserId());
+        bizFinancialIndividualIncomeTaxDetail.setVerifierTime(new Date());
         return toAjax(bizFinancialIndividualIncomeTaxDetailService.updateById(bizFinancialIndividualIncomeTaxDetail)&&addRecord(bizFinancialIndividualIncomeTaxDetail.getCompanyId(),bizFinancialIndividualIncomeTaxDetail.getFinancialIndividualIncomeTaxId(),
 
                 bizFinancialIndividualIncomeTaxDetail.getYear(),bizFinancialIndividualIncomeTaxDetail.getMonth(), SecurityUtils.getUserId(),status));

src/main/java/cn/ezhizao/project/business/finance/IndividualIncomeTaxIsZero/domain/BizFinancialIndividualIncomeTaxDetailIsZero.java

@@ -7,6 +7,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 个税任务对象 biz_financial_individual_income_tax
@@ -58,4 +59,8 @@ public class BizFinancialIndividualIncomeTaxDetailIsZero extends BaseEntity impl
 
     @ApiModelProperty("审核人")
     private Long verifierId;
+
+    private Date verifierTime;
+
+
 }

src/main/java/cn/ezhizao/project/business/finance/IndividualIncomeTaxIsZero/domain/BizFinancialIndividualIncomeTaxIsZero.java

@@ -1,11 +1,13 @@
 package cn.ezhizao.project.business.finance.IndividualIncomeTaxIsZero.domain;
 
 import java.io.Serializable;
+import java.util.List;
 
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -112,4 +114,15 @@ public class BizFinancialIndividualIncomeTaxIsZero extends BaseEntity implements
     private Long customerLabelId;
     @TableField(exist = false)
     private String customerLabelName;
+    @Excel(name = "审核人", sort = 8)
+    @TableField(exist = false)
+    private String verifierName;
+
+    @TableField(exist = false)
+    @Excel(name = "审核时间", dateFormat = "yyyy-MM-dd",sort = 9)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private java.util.Date verifierTime;
+
+    @TableField(exist = false)
+    private List<String> dateFilter;
 }

src/main/resources/mybatis/business/BizFinancialIndividualIncomeTaxIsZeroMapper.xml

@@ -63,10 +63,14 @@
 
     <select id="getList" parameterType="BizFinancialIndividualIncomeTax"
             resultMap="BizFinancialIndividualIncomeTaxResult">
-        SELECT *,c.customer_label_id, t4.lable as customerLabelName FROM biz_financial_individual_income_tax f
+        SELECT *,c.customer_label_id, t4.lable as customerLabelName,  t6.nick_name as verifierName,
+        t5.verifier_time FROM biz_financial_individual_income_tax f
         LEFT JOIN biz_company c ON f.company_id = c.id
         LEFT JOIN biz_tenant t ON f.tenant_id=t.id
         left join biz_lable t4 on t4.id = c.customer_label_id
+        left join biz_financial_individual_income_tax_detail t5 on t5.financial_individual_income_tax_id = f.id
+        and t5.deleted = 0 and t5.month = #{month} and t5.year = #{year} and t5.financial_individual_income_tax_id = f.id
+        left join sys_user t6 on t6.user_id = t5.verifier_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             f.deleted = 0
             AND c.is_zero=1
@@ -81,6 +85,16 @@
             <if test="taxType != null and taxType != null">
                 AND c.tax_type = #{taxType}
             </if>
+            <if test="verifierName != null">
+                AND t6.nick_name like concat('%', #{verifierName}, '%')
+            </if>
+            <if test="dateFilter != null and dateFilter.size()>0 ">
+                AND (
+                DATE_FORMAT(t5.verifier_time,'%Y-%m-%d') &gt;= #{dateFilter[0]}
+                AND
+                DATE_FORMAT(t5.verifier_time,'%Y-%m-%d') &lt;= #{dateFilter[1]}
+                )
+            </if>
             <if test="month != null and year != null">
                 <if test="status != null and status != 0">
                     and exists (select 1 from biz_financial_individual_income_tax_detail f3 where

src/main/resources/mybatis/business/BizFinancialIndividualIncomeTaxMapper.xml

@@ -54,10 +54,14 @@
 
     <select id="getList" parameterType="BizFinancialIndividualIncomeTax"
             resultMap="BizFinancialIndividualIncomeTaxResult">
-        SELECT *, c.customer_label_id, t4.lable as customerLabelName FROM biz_financial_individual_income_tax f
+        SELECT *, c.customer_label_id, t4.lable as customerLabelName, t6.nick_name as verifierName,
+        t5.verifier_time FROM biz_financial_individual_income_tax f
         LEFT JOIN biz_company c ON f.company_id = c.id
         LEFT JOIN biz_tenant t ON f.tenant_id=t.id
         left join biz_lable t4 on t4.id = c.customer_label_id
+        left join biz_financial_individual_income_tax_detail t5 on t5.financial_individual_income_tax_id = f.id
+        and t5.deleted = 0 and t5.month = #{month} and t5.year = #{year} and t5.financial_individual_income_tax_id = f.id
+        left join sys_user t6 on t6.user_id = t5.verifier_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             f.deleted = 0
             AND c.is_zero=0
@@ -70,6 +74,16 @@
             <if test="taxType != null and taxType != null">
                 AND c.tax_type = #{taxType}
             </if>
+            <if test="verifierName != null">
+                AND t6.nick_name like concat('%', #{verifierName}, '%')
+            </if>
+            <if test="dateFilter != null and dateFilter.size()>0 ">
+                AND (
+                DATE_FORMAT(t5.verifier_time,'%Y-%m-%d') &gt;= #{dateFilter[0]}
+                AND
+                DATE_FORMAT(t5.verifier_time,'%Y-%m-%d') &lt;= #{dateFilter[1]}
+                )
+            </if>
             <if test="customerLabelId != null">
                 AND c.customer_label_id = #{customerLabelId}
             </if>