ly před 1 rokem
rodič
revize
3872b825d9

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

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

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

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

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

@@ -60,7 +60,7 @@ public class ResStatisticsVo {
     @Excel(name = "审核时间")
     private String examineTime;
 
-//    @Excel(name = "审核人")
-//    private String verifyName;
+    @Excel(name = "审核人")
+    private String verifyName;
 
 }

+ 1 - 1
src/main/resources/mybatis/business/BizCollectionMapper.xml

@@ -42,7 +42,7 @@
         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,
+        GROUP_CONCAT( DISTINCT u2.nick_name ) AS verifyName,
         type.`name` as typeName,
         c.contract_id,
         input.contract_no,