修改车队 财务接口

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/domain/FTmsaccbills.java

@@ -1,6 +1,7 @@
 package com.ruoyi.orderManagement.finance.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -41,12 +42,14 @@ public class FTmsaccbills extends BaseEntity {
     /**
      * 活动号
      */
+    @JsonProperty("actId")
     @Excel(name = "活动号")
     private Long actId;
 
     /**
      * 检索区间
      */
+    @JsonProperty("fFromDate")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "检索区间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fFromDate;
@@ -60,6 +63,7 @@ public class FTmsaccbills extends BaseEntity {
     /**
      * 检索区间
      */
+    @JsonProperty("fToDate")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "检索区间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fToDate;
@@ -67,12 +71,14 @@ public class FTmsaccbills extends BaseEntity {
     /**
      * 参考号(银行账号、付款方式等……)
      */
+    @JsonProperty("refNo")
     @Excel(name = "参考号(银行账号、付款方式等……)")
     private String refNo;
 
     /**
      * 业务完成日期
      */
+    @JsonProperty("postDate")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "业务完成日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date postDate;
@@ -80,41 +86,48 @@ public class FTmsaccbills extends BaseEntity {
     /**
      * 应付合计
      */
+    @JsonProperty("fAmtcr")
     @Excel(name = "应付合计")
     private BigDecimal fAmtcr;
 
     /**
      * 应收合计
      */
+    @JsonProperty("fAmtdr")
     @Excel(name = "应收合计")
     private BigDecimal fAmtdr;
 
     /**
      * 删除状态
      */
+    @JsonProperty("delFlag")
     private String delFlag;
 
     /**
      * 货权方
      */
+    @JsonProperty("fCtrlcorpid")
     @Excel(name = "货权方")
     private String fCtrlcorpid;
 
     /**
      * 提单号
      */
+    @JsonProperty("tMblno")
     @Excel(name = "提单号")
     private String tMblno;
 
     /**
      * 单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)
      */
+    @JsonProperty("fBilltype")
     @Excel(name = "单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)")
     private String fBilltype;
 
     /**
      * 结算日期(对账日期)
      */
+    @JsonProperty("fAccbilldate")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "结算日期(对账日期)", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fAccbilldate;
@@ -122,6 +135,7 @@ public class FTmsaccbills extends BaseEntity {
     /**
      * 参考号
      */
+    @JsonProperty("fRefNo")
     @Excel(name = "参考号")
     private String fRefNo;
 
@@ -136,30 +150,35 @@ public class FTmsaccbills extends BaseEntity {
      * <p>
      * 发票 FP
      */
+    @JsonProperty("fBillno")
     @Excel(name = "业务编号(唯一格式+YYYY+YY+NNN， 编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。) 对账 DZ 收费 SF 付费 FF 发票 FP")
     private String fBillno;
 
     /**
      * 制单部门
      */
+    @JsonProperty("fDeptid")
     @Excel(name = "制单部门")
     private Long fDeptid;
 
     /**
      * 收费方式
      */
+    @JsonProperty("chargingMethod")
     @Excel(name = "收费方式 ")
     private String chargingMethod;
 
     /**
      * 状态(1新建，2暂存，6提交)
      */
+    @JsonProperty("fBillstatus")
     @Excel(name = "状态(1新建，2暂存，6提交)")
     private Long fBillstatus;
 
     /**
      * 发票号
      */
+    @JsonProperty("invoiceNo")
     @Excel(name = "发票号")
     private String invoiceNo;
 
@@ -172,24 +191,28 @@ public class FTmsaccbills extends BaseEntity {
     /**
      * 水单号
      */
+    @JsonProperty("waterBillNo")
     @Excel(name = "水单号")
     private String waterBillNo;
 
     /**
      * 结算单位(下拉模糊搜索)
      */
+    @JsonProperty("fCorpid")
     @Excel(name = "结算单位(下拉模糊搜索)")
     private Long fCorpid;
 
     /**
      * 系统类型(1仓储、2车队、3凯和)
      */
+    @JsonProperty("fSystemType")
     @Excel(name = "系统类型(1仓储、2车队、3凯和)")
     private String fSystemType;
 
     /**
      * 备注
      */
+    @JsonProperty("fRemarks")
     @Excel(name = "备注")
     private String fRemarks;
 

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/service/impl/FTmsaccbillsServiceImpl.java

@@ -99,7 +99,7 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService
         }
         // 查询从表数据
         FTmsaccbillsitems fTmsaccbillsitems = new FTmsaccbillsitems();
-        fTmsaccbillsitems.setFSrcid(fId);
+        fTmsaccbillsitems.setFPid(fId);
         List<FTmsaccbillsitems> fTmsaccbillsitemsList=  fTmsaccbillsitemsMapper.selectFTmsaccbillsitemsList(fTmsaccbillsitems);
         List<Map<String, Object>> feeDoList=new ArrayList<>();
         if (StringUtils.isNotEmpty(fTmsaccbillsitemsList)) {
@@ -291,7 +291,6 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService
             List<FTmsaccbillsitems> tFeeDoList = JSONObject.parseArray(jsonDrArray.toJSONString(), FTmsaccbillsitems.class);
             for (FTmsaccbillsitems tFeeDo : tFeeDoList) {
                 tFeeDo.setFPid(fPid);
-                tFeeDo.setFSrcid(fPid);
                 tFeeDo.setFStatus("2");
                 tFeeDo.setCreateTime(new Date());
                 tFeeDo.setCreateBy(loginUser.getUser().getUserName());

ruoyi-fleet/src/main/resources/mapper/finance/FTmsaccbillsMapper.xml

@@ -369,7 +369,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f.t_mblno AS tMblno,
             f.amt AS fAmtdr,
             f.f_billtype AS fBilltype,
-            f.f_billstatus AS fBillstatus,
+            CASE
+            WHEN  f.f_billstatus = '1' THEN '保存'
+            WHEN  f.f_billstatus = '2' THEN '暂存'
+            WHEN  f.f_billstatus = '3' THEN '审批驳回'
+            WHEN  f.f_billstatus = '4' THEN '提交审核'
+            WHEN  f.f_billstatus = '5' THEN '审核中'
+            WHEN  f.f_billstatus = '6' THEN '审核完成'
+            END AS fBillstatus,
             f.f_remarks AS fRemarks,
             f.create_by AS createBy
         FROM

ruoyi-fleet/src/main/resources/mapper/finance/FTmsaccbillsitemsMapper.xml

@@ -163,14 +163,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
     <delete id="deleteByFPid" parameterType="Long">
-        delete from F_TMSACCBILLSITEMS where src_id = #{fId}
+        delete from F_TMSACCBILLSITEMS where f_srcid = #{fId}
     </delete>
+
     <update id="tfeeDoFollowUpdate" parameterType="Long">
         update
             F_TMSACCBILLSITEMS
-        set bill_status = #{fettle}
+        set f_status = #{fettle}
         where
-            src_id = #{fPid}
+            f_srcid = #{fPid}
     </update>
 </mapper>