借还单出纳驳回日志记录、细分驳回为财务驳回与出纳驳回、新增财务驳回时间

cost-core/src/main/java/com/blt/other/other_cost/controller/CostCheckController.java

@@ -162,6 +162,7 @@ public class CostCheckController {
         CostDomain costDomain = new CostDomain();
         costDomain.setCostNo(costNo);
         costDomain.setRejectReason(rejectReason);
+        costDomain.setRejectTime(new Date());
         Map<String, Object> stringObjectMap = costService.upadateCost(costDomain);
         Map<String, Object> map = changeStatus(costNo, 3);
         costLogService.save(costNo,Integer.parseInt(updateuserid),"费用系统财务审核驳回："+rejectReason);
@@ -359,6 +360,7 @@ public class CostCheckController {
             }
             costDomain.setRejectReason(domain.getPaynote());
             costDomain.setCostStatus(3);
+            costDomain.setRejectType(2);
             Integer result = costService.updateById(costDomain);
 //            if (null != result && result >= 1) {
                 // 如果是付款费用，改变子项目的费用单

cost-core/src/main/java/com/blt/other/other_cost/controller/CostCheckLendController.java

@@ -190,6 +190,21 @@ public class CostCheckLendController {
         return map;
     }
 
+    @PostMapping(value = "invoice")
+    public Map<String,Object> invoice (HttpServletRequest request, HttpServletResponse response) {
+        Map<String, Object> map = null;
+        CostDomain costDomain = new CostDomain();
+        String costNo = request.getParameter("costNo");
+        String updateuserid = request.getParameter("updateuserid");
+        costDomain.setHasInvoice(1);
+        costDomain.setCostNo(costNo);
+        map = costService.upadateCost(costDomain);
+        costLogService.save(costNo, Integer.valueOf(updateuserid),"确认发票");
+        map.put("success",true);
+        map.put("msg","确认发票成功！");
+        return map;
+    }
+
     /**
      * 提交出纳
      * @param costDomain
@@ -406,6 +421,7 @@ public class CostCheckLendController {
                     boolean b = finansysReject(costCashiercallbackDomain);
                     if (b){
                         logger.info("借还出纳驳回，费用单状态更改成功"+costCashiercallbackDomain);
+                        costLogService.save(costNo, costCashiercallbackDomain.getPayuserid(),"被出纳驳回："+costCashiercallbackDomain.getPaynote());
                     }else {
                         logger.info("借还出纳驳回，费用单状态更改失败"+costCashiercallbackDomain);
                     }
@@ -514,6 +530,7 @@ public class CostCheckLendController {
             }
             costDomain.setRejectReason(domain.getPaynote());
             costDomain.setCostStatus(3);
+            costDomain.setRejectType(2);
             Integer result = costService.updateById(costDomain);
         }
         return true;

cost-core/src/main/java/com/blt/other/other_cost/dto/CostDto.java

@@ -65,6 +65,9 @@ public class CostDto {
     private String detailKey; // 出纳系统 detailKey
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date payTime; // 付款时间
+    private Integer hasInvoice;
+    private Integer rejectType;
+    private Integer rejectTime;
 
     public String getDic() {
         return dic;
@@ -516,6 +519,30 @@ public class CostDto {
         this.payTime = payTime;
     }
 
+    public Integer getHasInvoice() {
+        return hasInvoice;
+    }
+
+    public void setHasInvoice(Integer hasInvoice) {
+        this.hasInvoice = hasInvoice;
+    }
+
+    public Integer getRejectType() {
+        return rejectType;
+    }
+
+    public void setRejectType(Integer rejectType) {
+        this.rejectType = rejectType;
+    }
+
+    public Integer getRejectTime() {
+        return rejectTime;
+    }
+
+    public void setRejectTime(Integer rejectTime) {
+        this.rejectTime = rejectTime;
+    }
+
     @Override
     public String toString() {
         return "CostDto{" +
@@ -543,8 +570,8 @@ public class CostDto {
                 ", morFileName='" + morFileName + '\'' +
                 ", amount=" + amount +
                 ", amountDto='" + amountDto + '\'' +
-                ", logisticsSupplierId=" + logisticsSupplierId +
                 ", subLogisticsSupplierId=" + subLogisticsSupplierId +
+                ", logisticsSupplierId=" + logisticsSupplierId +
                 ", bankName='" + bankName + '\'' +
                 ", bankCard='" + bankCard + '\'' +
                 ", bankCardUser='" + bankCardUser + '\'' +
@@ -575,6 +602,9 @@ public class CostDto {
                 ", isTaxStr='" + isTaxStr + '\'' +
                 ", detailKey='" + detailKey + '\'' +
                 ", payTime=" + payTime +
+                ", hasInvoice=" + hasInvoice +
+                ", rejectType=" + rejectType +
+                ", rejectTime=" + rejectTime +
                 '}';
     }
 }

cost-core/src/main/java/com/blt/other/other_database/model/CostDomain.java

@@ -60,6 +60,9 @@ public class CostDomain {
     private Integer companyValue; // 公司主体value
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date auditTime; // 财务审核时间
+    private Integer hasInvoice; //发票状态
+    private Integer rejectType; //驳回类型
+    private Date rejectTime; //财务驳回时间
 
     public String getDic() {
         return dic;
@@ -470,6 +473,30 @@ public class CostDomain {
         this.auditTime = auditTime;
     }
 
+    public Integer getHasInvoice() {
+        return hasInvoice;
+    }
+
+    public void setHasInvoice(Integer hasInvoice) {
+        this.hasInvoice = hasInvoice;
+    }
+
+    public Integer getRejectType() {
+        return rejectType;
+    }
+
+    public void setRejectType(Integer rejectType) {
+        this.rejectType = rejectType;
+    }
+
+    public Date getRejectTime() {
+        return rejectTime;
+    }
+
+    public void setRejectTime(Date rejectTime) {
+        this.rejectTime = rejectTime;
+    }
+
     @Override
     public String toString() {
         return "CostDomain{" +
@@ -524,6 +551,9 @@ public class CostDomain {
                 ", amountRmb=" + amountRmb +
                 ", companyValue=" + companyValue +
                 ", auditTime=" + auditTime +
+                ", hasInvoice=" + hasInvoice +
+                ", rejectType=" + rejectType +
+                ", rejectTime=" + rejectTime +
                 '}';
     }
 }

cost-core/src/main/resources/mapper/Cost.xml

@@ -99,7 +99,10 @@
             <if test=" toRmbRate!=null">to_rmb_rate=#{toRmbRate},</if>
             <if test=" amountRmb!=null">amount_rmb=#{amountRmb},</if>
             <if test=" companyValue!=null">company_value=#{companyValue},</if>
-            <if test=" auditTime!=null">audit_time=#{auditTime}</if>
+            <if test=" auditTime!=null">audit_time=#{auditTime},</if>
+            <if test="hasInvoice != null">has_invoice = #{hasInvoice}, </if>
+            <if test="rejectType != null">reject_type = #{rejectType}, </if>
+            <if test="rejectTime != null">reject_time = #{rejectTime}</if>
         </set>
         WHERE
         cost_no = #{costNo}
@@ -157,7 +160,9 @@
             <if test=" toRmbRate!=null">to_rmb_rate=#{toRmbRate},</if>
             <if test=" amountRmb!=null">amount_rmb=#{amountRmb},</if>
             <if test=" companyValue!=null">company_value=#{companyValue},</if>
-            <if test=" auditTime!=null">audit_time=#{auditTime}</if>
+            <if test=" auditTime!=null">audit_time=#{auditTime}, </if>
+            <if test="hasInvoice != null">has_invoice = #{hasInvoice}, </if>
+            <if test="rejectType != null">reject_type = #{rejectType}</if>
         </set>
         WHERE
         id = #{id}