no message

src/main/java/cn/ezhizao/project/business/collection/controller/BizCollectionController.java

@@ -369,6 +369,7 @@ public class BizCollectionController extends BaseController {
     @Log(title = "收款管理审核", businessType = BusinessType.UPDATE)
     public AjaxResult verified(@RequestBody BizCollection collection) {
         try {
+//            collection.setVerifyId(getUserId());
             collection.setVerifyDate(collection.getVerifyDate() == null ? DateTime.now().toTimestamp() : collection.getVerifyDate());
             BizArchiveInput contract = archiveInputService.getById(collection.getContractId());
             if (contract != null) {

src/main/java/cn/ezhizao/project/business/collection/domain/BizCollection.java

@@ -205,6 +205,8 @@ public class BizCollection extends BaseEntity implements Serializable {
 
     @TableField(exist = false)
     private List<SysFileStorage> evidenceFiles;
+
+//    private Long verifyId;
     public String getRemark()
     {
         return remark;

src/main/java/cn/ezhizao/project/business/collection/domain/vo/ResStatisticsVo.java

@@ -31,9 +31,9 @@ public class ResStatisticsVo {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date receiptDate;
 
-    @Excel(name = "确认所属时间",width = 20, dateFormat = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date actuallyDate;
+//    @Excel(name = "确认所属时间")
+//    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+//    private String actuallyDate;
 
     //提收款金额
     @Excel(name = "提收款金额")
@@ -60,5 +60,7 @@ public class ResStatisticsVo {
     @Excel(name = "审核时间")
     private String examineTime;
 
+//    @Excel(name = "审核人")
+//    private String verifyName;
 
 }

src/main/java/cn/ezhizao/project/business/collection/service/impl/BizCollectionServiceImpl.java

@@ -16,15 +16,12 @@ import cn.ezhizao.project.business.company.domain.BizCompany;
 import cn.ezhizao.project.business.company.service.IBizCompanyService;
 import cn.ezhizao.project.business.order.domain.BizArchiveInput;
 import cn.ezhizao.project.business.order.domain.BizArchiveInputDetail;
-import cn.ezhizao.project.business.order.domain.BizArchiveInputDetailProcess;
 import cn.ezhizao.project.business.order.service.IBizArchiveInputDetailService;
 import cn.ezhizao.project.business.order.service.IBizArchiveInputService;
-import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.service.ISysUserService;
 import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import net.sf.jsqlparser.expression.DateTimeLiteralExpression;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

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

@@ -33,14 +33,16 @@
         tt1.shishoujine as reallyDetailAmount,
         tt1.daishoukuanjine as waitDetailAmount,
         tt1.shenheshijian as examineTime,
+        tt1.verifyName,
         tt2.zhichu as outAmount
         FROM
         (
         SELECT
         c.company_id,
-        c.actually_date,
+        GROUP_CONCAT( DISTINCT  date_format( c.actually_date, '%Y-%m-%d' )) AS actually_date,
         com.NAME,
         detail.task_type_id,
+        GROUP_CONCAT( DISTINCT u2.user_name ) AS verifyName,
         type.`name` as typeName,
         c.contract_id,
         input.contract_no,
@@ -71,6 +73,7 @@
         LEFT JOIN biz_archive_input input ON input.id = c.contract_id
         LEFT JOIN sys_user u ON u.user_id = c.applier_id
         LEFT JOIN biz_task_type type on type.id = detail.task_type_id
+        LEFT JOIN sys_user u2 on u2.user_id = c.verify_id
         WHERE
         c.deleted = 0
         AND c.STATUS != 2