feat:发票管理添加操作记录表

src/main/java/cn/ezhizao/project/business/invoice/controller/BizInvoiceController.java

@@ -14,7 +14,9 @@ import cn.ezhizao.project.business.collection.service.IBizCollectionDetailServic
 import cn.ezhizao.project.business.collection.service.IBizCollectionService;
 import cn.ezhizao.project.business.invoice.domain.BizCopyInfo;
 import cn.ezhizao.project.business.invoice.domain.BizInvoice;
+import cn.ezhizao.project.business.invoice.domain.BizInvoiceRecord;
 import cn.ezhizao.project.business.invoice.service.IBizCopyInfoService;
+import cn.ezhizao.project.business.invoice.service.IBizInvoiceRecordService;
 import cn.ezhizao.project.business.invoice.service.IBizInvoiceService;
 import cn.ezhizao.project.business.order.service.IBizArchiveInputService;
 import cn.ezhizao.project.system.domain.SysFileStorage;
@@ -51,7 +53,8 @@ import cn.ezhizao.framework.web.page.TableDataInfo;
 public class BizInvoiceController extends BaseController {
     @Resource
     private IBizInvoiceService bizInvoiceService;
-
+    @Resource
+    private IBizInvoiceRecordService bizInvoiceRecordService;
     @Resource
     private IBizCollectionService collectionService;
 
@@ -110,12 +113,12 @@ public class BizInvoiceController extends BaseController {
         String contractNo = bizArchiveInputService.getById(bizInvoice.getContractId()).getContractNo();
         bizInvoice.setContractNo(contractNo);
         if (bizInvoice.getInvoiceId() != null) {
-            String userName2 = userService.selectUserById(bizInvoice.getInvoiceId()).getUserName();
+            String userName2 = userService.selectUserById(bizInvoice.getInvoiceId()).getNickName();
             bizInvoice.setInvoiceName(userName2);
         }
 
         if (bizInvoice.getApplierId() != null) {
-            String userName1 = userService.selectUserById(bizInvoice.getApplierId()).getUserName();
+            String userName1 = userService.selectUserById(bizInvoice.getApplierId()).getNickName();
             bizInvoice.setApplierName(userName1);
         }
         return success(bizInvoice);
@@ -165,7 +168,7 @@ public class BizInvoiceController extends BaseController {
         bizInvoice.setApplierId(getUserId());
         bizInvoice.setApplierTime(new Date());
         bizInvoice.setTenantId(  getTenantId());
-        return toAjax(bizInvoiceService.save(bizInvoice));
+        return toAjax(bizInvoiceService.save(bizInvoice) && editRecord(bizInvoice));
     }
 
     /**
@@ -214,10 +217,54 @@ public class BizInvoiceController extends BaseController {
            }
             fileStorageService.save(sysFileStorage);
         }
-
+        editRecord(bizInvoice);
         return toAjax(bizInvoiceService.updateById(bizInvoice));
     }
 
+    private boolean editRecord(BizInvoice bizInvoice) {
+        BizInvoiceRecord bizInvoiceRecord = new BizInvoiceRecord();
+        bizInvoiceRecord.setInvoiceId(bizInvoice.getId());
+        bizInvoiceRecord.setContractId(bizInvoice.getContractId());
+        bizInvoiceRecord.setUserId(getUserId());
+        bizInvoiceRecord.setTenantId(bizInvoice.getTenantId());
+        switch (bizInvoice.getStatus()) {
+            case 0:
+                //待提交（页面上的保存）
+                bizInvoiceRecord.setInvoiceStatus(0);
+                bizInvoiceRecord.setRemark(bizInvoice.getRemark());
+                break;
+            case 1:
+                //页面上的提交 ，状态叫待开票
+                bizInvoiceRecord.setInvoiceStatus(1);
+                break;
+            case 2:
+                //页面 拒绝
+                bizInvoiceRecord.setInvoiceStatus(2);
+                bizInvoiceRecord.setRemark(bizInvoice.getRefuseReason());
+                break;
+            case 3:
+                //审核通过, 状态时已开票
+                bizInvoiceRecord.setInvoiceStatus(3);
+                bizInvoiceRecord.setRemark(bizInvoice.getInvoiceRemark());
+                break;
+            case 4:
+                //退回
+                bizInvoiceRecord.setInvoiceStatus(4);
+                bizInvoiceRecord.setRemark(bizInvoice.getReturnReason());
+                break;
+            case 5:
+                //反审核
+                bizInvoiceRecord.setInvoiceStatus(5);
+                bizInvoiceRecord.setRemark(bizInvoice.getUauditReason());
+                //需要把状态设置为1，页面得是待开票
+                bizInvoice.setStatus(1);
+                break;
+            default:
+                break;
+        }
+        return bizInvoiceRecordService.save(bizInvoiceRecord);
+    }
+
     /**
      * 删除开票管理
      */

src/main/java/cn/ezhizao/project/business/invoice/domain/BizInvoice.java

@@ -157,4 +157,5 @@ public class BizInvoice extends BaseEntity {
     private List<String> invoiceDateFilter;
 
     private Long tenantId;
+    private String uauditReason;
 }

src/main/java/cn/ezhizao/project/business/invoice/domain/BizInvoiceRecord.java

@@ -1,5 +1,6 @@
 package cn.ezhizao.project.business.invoice.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import cn.ezhizao.framework.web.domain.BaseEntity;
 import lombok.Data;
@@ -21,14 +22,18 @@ public class BizInvoiceRecord extends BaseEntity
     /** $column.columnComment */
     @ApiModelProperty(value = "${comment}")
     private Long invoiceId;
-
+    private Long contractId;
     /** 发票状态（待提交，提交，退回，审核，反审核） */
-    @Excel(name = "发票状态", readConverterExp = "待=提交，提交，退回，审核，反审核")
-    @ApiModelProperty(value = "发票状态")
-    private Long status;
 
+    private Long status;
+    private Long tenantId;
     /** 操作人 */
     @ApiModelProperty(value = "发票状态")
     private Long userId;
+    @TableField(exist = false)
+    private String nickName;
+    @Excel(name = "发票状态", readConverterExp = "待=提交，提交，退回，审核，反审核")
+    @ApiModelProperty(value = "发票状态")
+    private Integer invoiceStatus;
 
 }

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

@@ -10,7 +10,7 @@
 
 
     <select id="getList" parameterType="BizInvoice" resultMap="BizInvoiceResult">
-        SELECT t1.*,t2.contract_no ,t3.user_name as applierName,t4.user_name as invoiceName
+        SELECT t1.*,t2.contract_no ,t3.nick_name as applierName,t4.nick_name as invoiceName
 
         FROM biz_invoice t1
         left join biz_archive_input t2 on t1.contract_id = t2.id

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

@@ -10,11 +10,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="getList" parameterType="BizInvoiceRecord" resultMap="BizInvoiceRecordResult">
-        SELECT * FROM biz_invoice_record
+        SELECT *,user1.nick_name as nick_name FROM biz_invoice_record record
+        left join sys_user user1 on user1.user_id = record.user_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             deleted = 0
-            <if test="status != null "> AND status = #{status}</if>
+            <if test="invoiceId != null "> AND record.invoice_id = #{invoiceId}</if>
         </trim>
+        order by record.create_time desc
     </select>
 
     <delete id="physicalDelete">