no message

src/main/java/cn/ezhizao/project/business/housingFund/controller/BizHousingFundDeclareController.java

@@ -255,6 +255,8 @@ public class BizHousingFundDeclareController extends BaseController {
     @PreAuthorize("@ss.hasPermi('business:housingFundDeclare:edit')")
     @ResponseBody
     public AjaxResult saveDetail(@RequestBody BizHousingFundDeclareDetail detail) {
+        detail.setVerifierId(SecurityUtils.getUserId());
+        detail.setVerifierTime(new Date());
         boolean bool = housingFundDeclareDetailService.saveOrUpdate(detail);
         bool = bool && checkDeduction(detail);
         List<SysFileStorage> fileStorages = detail.getEvidenceFiles();

src/main/java/cn/ezhizao/project/business/housingFund/domain/BizHousingFundDeclare.java

@@ -4,6 +4,7 @@ import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.web.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -94,4 +95,13 @@ public class BizHousingFundDeclare extends BaseEntity implements Serializable {
     @Excel(name = "执行人",sort = 7)
     @TableField(exist = false)
     private String serviceName;
+    @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/housingFund/domain/BizHousingFundDeclareDetail.java

@@ -83,4 +83,7 @@ public class BizHousingFundDeclareDetail extends BaseEntity implements Serializa
     @TableField(exist = false)
     @ApiModelProperty("公积金窗口缴")
     private Integer isPayOnWindow;
+    @ApiModelProperty("审核人")
+    private Long verifierId;
+    private java.util.Date verifierTime;
 }

src/main/java/cn/ezhizao/project/business/reportTax/controller/BizFinancialReportTaxNonZeroController.java

@@ -42,10 +42,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;
 
 @RestController
@@ -132,6 +129,7 @@ public class BizFinancialReportTaxNonZeroController extends BaseController {
     @PostMapping("/saveDetail")
     @ResponseBody
     public AjaxResult saveDetail(@RequestBody BizFinancialReportTaxDetail detail) {
+        detail.setVerifierTime(new Date());
         detail.setVerifierId(getUserId());
         boolean bool = financialReportTaxDetaiIsZerolService.saveOrUpdate(detail);
         Map<String, Object> conditions = new HashMap<>(1);

src/main/java/cn/ezhizao/project/business/reportTax/domain/BizFinancialReportTaxNonZero.java

@@ -3,6 +3,7 @@ package cn.ezhizao.project.business.reportTax.domain;
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.web.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -99,4 +100,13 @@ public class BizFinancialReportTaxNonZero extends BaseEntity {
     private Long customerLabelId;
     @TableField(exist = false)
     private String customerLabelName;
+    @Excel(name = "审核人", sort = 10)
+    @TableField(exist = false)
+    private String verifierName;
+    @TableField(exist = false)
+    @Excel(name = "审核时间", dateFormat = "yyyy-MM-dd",sort = 11)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private java.util.Date verifierTime;
+    @TableField(exist = false)
+    private List<String> dateFilter;
 }

src/main/java/cn/ezhizao/project/business/reportTaxIsZero/controller/BizFinancialReportTaxController.java

@@ -114,6 +114,7 @@ public class BizFinancialReportTaxController extends BaseController {
     @ResponseBody
     public AjaxResult saveDetail(@RequestBody BizFinancialReportTaxDetail detail) {
         detail.setVerifierId(getUserId());
+        detail.setVerifierTime(new Date());
         boolean bool = financialReportTaxDetailService.saveOrUpdate(detail);
         Map<String, Object> conditions = new HashMap<>(1);
         conditions.put("financialReportTaxDetailId", detail.getId());

src/main/java/cn/ezhizao/project/business/reportTaxIsZero/domain/BizFinancialReportTax.java

@@ -3,6 +3,7 @@ package cn.ezhizao.project.business.reportTaxIsZero.domain;
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.web.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -103,4 +104,13 @@ public class BizFinancialReportTax extends BaseEntity {
     private Long customerLabelId;
     @TableField(exist = false)
     private String customerLabelName;
+    @Excel(name = "审核人", sort = 10)
+    @TableField(exist = false)
+    private String verifierName;
+    @TableField(exist = false)
+    @Excel(name = "审核时间", dateFormat = "yyyy-MM-dd",sort = 11)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private java.util.Date verifierTime;
+    @TableField(exist = false)
+    private List<String> dateFilter;
 }

src/main/java/cn/ezhizao/project/business/reportTaxIsZero/domain/BizFinancialReportTaxDetail.java

@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
@@ -89,4 +90,5 @@ public class BizFinancialReportTaxDetail extends BaseEntity {
     @TableField(exist = false)
     private String companyName;
 
+    private Date verifierTime;
 }

src/main/java/cn/ezhizao/project/business/socialSecurity/controller/SocialSecurityDeclareController.java

@@ -102,7 +102,7 @@ public class SocialSecurityDeclareController extends BaseController {
 
     @ApiOperation(value = "带条件List 分页查询", notes = "带条件List 分页查询")
     @PreAuthorize("@ss.hasPermi('business:socialSecurityDeclare:list')")
-    @GetMapping("、ist")
+    @GetMapping("/list")
     @ResponseBody
     public TableDataInfo getList(BizSocialSecurityDeclare conditions) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(conditions);
@@ -262,6 +262,8 @@ public class SocialSecurityDeclareController extends BaseController {
     @PostMapping("/saveDetail")
     @ResponseBody
     public AjaxResult saveDetail(@RequestBody BizSocialSecurityDeclareDetail detail) {
+        detail.setVerifierId(SecurityUtils.getUserId());
+        detail.setVerifierTime(new Date());
         boolean bool = socialSecurityDeclareDetailService.saveOrUpdate(detail);
         bool = bool && checkDeduction(detail);
         List<SysFileStorage> fileStorages = detail.getEvidenceFiles();

src/main/java/cn/ezhizao/project/business/socialSecurity/domain/BizSocialSecurityDeclare.java

@@ -4,6 +4,7 @@ import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.web.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -94,4 +95,14 @@ public class BizSocialSecurityDeclare extends BaseEntity implements Serializable
     @Excel(name = "执行人",sort = 7)
     @TableField(exist = false)
     private String serviceName;
+
+    @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/socialSecurity/domain/BizSocialSecurityDeclareDetail.java

@@ -109,7 +109,8 @@ public class BizSocialSecurityDeclareDetail extends BaseEntity implements Serial
 
     @ApiModelProperty("审核人")
     private Long verifierId;
-
+    private java.util.Date verifierTime;
     @TableField(exist = false)
     private List<Long> mainIds;
+
 }

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

@@ -26,11 +26,15 @@
         t1.*, t2.name as company_name, t2.social_credit_code, t2.tax_type, t2.is_zero, t2.customer_label_id, t4.lable as customerLabelName,
         (select concat(frtd.year, '-', frtd.month) from biz_financial_report_tax_detail frtd where
         frtd.financial_report_tax_id = t1.id order by year desc, month desc limit 1) currentDate,
-        t3.account_name as from_company_name
+        t3.account_name as from_company_name,t6.nick_name as verifierName,
+        t5.verifier_time
         from biz_financial_report_tax t1
         left join biz_company t2 on t2.id = t1.company_id
         left join biz_tenant t3 on t3.id = t1.tenant_id
         left join biz_lable t4 on t4.id = t2.customer_label_id
+        left join biz_financial_report_tax_detail t5 on t5.financial_report_tax_id = t1.id
+        and t5.deleted = 0 and t5.month = #{month} and t5.year = #{year} and t5.financial_report_tax_id = t1.id
+        left join sys_user t6 on t6.user_id = t5.verifier_id
         <!--        left join fxy_financial_checkout t3 on t3.account_sets_id = t1.account_sets_id-->
         WHERE
         t1.deleted = 0
@@ -53,6 +57,16 @@
         <if test="socialCreditCode != null and socialCreditCode!=''">
             AND t2.social_credit_code = #{socialCreditCode}
         </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="fromCompanyName != null and fromCompanyName != ''">
             AND t3.account_name like concat('%', #{fromCompanyName}, '%')
         </if>

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

@@ -26,11 +26,15 @@
         t1.*, t2.name as company_name, t2.social_credit_code, t2.tax_type, t2.is_zero,t2.customer_label_id, t4.lable as customerLabelName,
         (select concat(frtd.year, '-', frtd.month) from biz_financial_report_tax_detail frtd where
         frtd.financial_report_tax_id = t1.id order by year desc, month desc limit 1) currentDate,
-        t3.account_name as from_company_name
+        t3.account_name as from_company_name,t6.nick_name as verifierName,
+        t5.verifier_time
         from biz_financial_report_tax t1
         left join biz_company t2 on t2.id = t1.company_id
         left join biz_tenant t3 on t3.id = t1.tenant_id
         left join biz_lable t4 on t4.id = t2.customer_label_id
+        left join biz_financial_report_tax_detail t5 on t5.financial_report_tax_id = t1.id
+        and t5.deleted = 0 and t5.month = #{month} and t5.year = #{year} and t5.financial_report_tax_id = t1.id
+        left join sys_user t6 on t6.user_id = t5.verifier_id
         <!--        left join fxy_financial_checkout t3 on t3.account_sets_id = t1.account_sets_id-->
         WHERE
         t1.deleted = 0
@@ -47,6 +51,16 @@
         <if test="taxType != null and taxType != ''">
             AND t2.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="fromCompanyName != null and fromCompanyName != ''">
             AND (t3.account_name like concat('%', #{fromCompanyName}, '%'))
         </if>

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

@@ -23,10 +23,14 @@
         SELECT t1.*, t2.name as company_name,
         (select concat(frtd.year, '-', frtd.month) from biz_housing_fund_declare_detail frtd where
         frtd.housing_fund_declare_id = t1.id order by year desc, month desc limit 1) currentDate,
-        t3.account_name as from_company_name, t2.tax_type
+        t3.account_name as from_company_name, t2.tax_type,t6.nick_name as verifierName,
+        t5.verifier_time
         FROM biz_housing_fund_declare t1
         left join biz_company t2 on t2.id = t1.company_id
         left join biz_tenant t3 on t3.id = t1.tenant_id
+        left join biz_housing_fund_declare_detail t5 on t5.housing_fund_declare_id = t1.id
+        and t5.deleted = 0 and t5.month = #{month} and t5.year = #{year} and t5.housing_fund_declare_id = t1.id
+        left join sys_user t6 on t6.user_id = t5.verifier_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 AND
             <if test="id != null  ">
@@ -50,6 +54,16 @@
             <if test="taxType != null and taxType != ''">
                 t2.tax_type = #{taxType} AND
             </if>
+            <if test="verifierName != null">
+                t6.nick_name like concat('%', #{verifierName}, '%')AND
+            </if>
+            <if test="dateFilter != null and dateFilter.size()>0 ">
+                (
+                DATE_FORMAT(t5.verifier_time,'%Y-%m-%d') &gt;= #{dateFilter[0]} AND
+
+                DATE_FORMAT(t5.verifier_time,'%Y-%m-%d') &lt;= #{dateFilter[1]}
+                )AND
+            </if>
             <if test="fromCompanyName != null and fromCompanyName != ''">
                 (t3.account_name like concat('%', #{fromCompanyName}, '%')) AND
             </if>

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

@@ -22,10 +22,14 @@
     <sql id="getListSql">
         SELECT t1.*, t2.name as company_name,
         (select concat(frtd.year, '-', frtd.month) from biz_social_security_declare_detail frtd where frtd.social_security_declare_id = t1.id order by year desc, month desc limit 1) currentDate,
-        t3.account_name as from_company_name, t2.tax_type
+        t3.account_name as from_company_name, t2.tax_type,t6.nick_name as verifierName,
+        t5.verifier_time
         FROM biz_social_security_declare t1
         left join biz_company t2 on t2.id = t1.company_id
         left join biz_tenant t3 on t3.id = t1.tenant_id
+        left join biz_social_security_declare_detail t5 on t5.social_security_declare_id = t1.id
+        and t5.deleted = 0 and t5.month = #{month} and t5.year = #{year} and t5.social_security_declare_id = t1.id
+        left join sys_user t6 on t6.user_id = t5.verifier_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 AND
             <if test="id != null  ">
@@ -37,6 +41,16 @@
             <if test="companyName != null and companyName != ''">
                 (t2.name like concat('%', #{companyName}, '%')) AND
             </if>
+            <if test="verifierName != null">
+                 t6.nick_name like concat('%', #{verifierName}, '%')AND
+            </if>
+            <if test="dateFilter != null and dateFilter.size()>0 ">
+                 (
+                DATE_FORMAT(t5.verifier_time,'%Y-%m-%d') &gt;= #{dateFilter[0]} AND
+
+                DATE_FORMAT(t5.verifier_time,'%Y-%m-%d') &lt;= #{dateFilter[1]}
+                )AND
+            </if>
             <if test="keyword != null and keyword != ''">
                 (t2.name like concat('%', #{keyword}, '%') or t2.code like concat('%', #{keyword}, '%')) AND
             </if>

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

@@ -19,7 +19,7 @@
         from biz_work_order_record t1
                  left join sys_user t2 on t1.handler_id = t2.user_id
                  left join sys_user t3 on t1.recorder_id = t3.user_id
-                 left join biz_entrust t4 on t1.work_order_id = t4.work_order_id
+                 left join biz_entrust t4 on t1.work_order_id = t4.work_order_id AND t4.deleted = 0
         where t1.deleted = 0
           and t1.from_id = 0
           and t1.work_order_id = #{id}