优化车队财务模块

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/finance/FTmsaccbillsController.java

@@ -48,7 +48,7 @@ public class FTmsaccbillsController extends BaseController {
     }
 
     /**
-     *  收费查询
+     *  对账查询
      */
     @GetMapping("/contrastList")
     public TableDataInfo chargeList(FTmsaccbillsFees fTmsaccbillsFees) {

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

@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 
@@ -234,11 +235,17 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
         }
         // 删除从表
         fTmsaccbillsitemsMapper.deleteByFPid(fPid);
+        // 本次对账金额合计
+        BigDecimal amt = new BigDecimal(0);
+        // 应对账金额合计
+        BigDecimal amtDr = new BigDecimal(0);
         //  财务从表
         if (StringUtils.isNotNull(tfeeDo)) {
             JSONArray jsonDrArray = JSONArray.parseArray(tfeeDo);
             List<FTmsaccbillsitems> tFeeDoList = JSONObject.parseArray(jsonDrArray.toJSONString(), FTmsaccbillsitems.class);
             for (FTmsaccbillsitems tFeeDo : tFeeDoList) {
+                amt = amt.add(tFeeDo.getFAmt());
+                amtDr = amtDr.add(tFeeDo.getFAmtdr());
                 tFeeDo.setFPid(fPid);
                 tFeeDo.setFStatus("2");
                 tFeeDo.setCreateTime(new Date());
@@ -246,6 +253,10 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
                 fTmsaccbillsitemsMapper.insertFTmsaccbillsitems(tFeeDo);
             }
         }
+        fTmsaccbills.setfAmtcr(amt);
+        fTmsaccbills.setfAmtdr(amtDr);
+        System.out.println("更新金额：" + fTmsaccbills.toString());
+        fTmsaccbillsMapper.updateFTmsaccbills(fTmsaccbills);
         map.put("tFee", fTmsaccbillsMapper.selectFTmsaccbillsById(fPid));
         return AjaxResult.success("成功", map);
     }
@@ -312,7 +323,13 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
         //  财务从表
         JSONArray jsonDrArray = JSONArray.parseArray(tfeeDo);
         List<FTmsaccbillsitems> tFeeDoList = JSONObject.parseArray(jsonDrArray.toJSONString(), FTmsaccbillsitems.class);
+        // 本次对账金额合计
+        BigDecimal amt = new BigDecimal(0);
+        // 应对账金额合计
+        BigDecimal amtDr = new BigDecimal(0);
         for (FTmsaccbillsitems tFeeDo : tFeeDoList) {
+            amt = amt.add(tFeeDo.getFAmt());
+            amtDr = amtDr.add(tFeeDo.getFAmtdr());
             tFeeDo.setCreateTime(new Date());
             tFeeDo.setFPid(fTmsaccbills.getId());
             tFeeDo.setCreateBy(user.getUserName());
@@ -324,6 +341,9 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
                 return AjaxResult.error("更新费用明细失败");
             }
         }
+        fTmsaccbills.setfAmtcr(amt);
+        fTmsaccbills.setfAmtdr(amtDr);
+        fTmsaccbillsMapper.updateFTmsaccbills(fTmsaccbills);
         AjaxResult ajaxResult = tfeeFollow(fTmsaccbills.getId(), 6L);
         String code = ajaxResult.get("code").toString();
         if ("500".equals(code)) {
@@ -336,8 +356,10 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
     public int updateBillsFees(Long fid, FTmsaccbillsitems tFeeDo, String billsType) {
         // 查询从表数据
         FTmsaccbills tFee = fTmsaccbillsMapper.selectFTmsaccbillsById(fid);
-        if ("SFDZ".equals(billsType) || "JSFF".equals(billsType) || "JSSF".equals(billsType)) {
+        if ("SFDZ".equals(billsType)) {
             billsType = "DZ";
+        } else if ("JSFF".equals(billsType) || "JSSF".equals(billsType)) {
+            billsType = "DC";
         }
         Map<String, Object> map = new HashMap<>();
         map.put("tFee", tFee);

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

@@ -294,7 +294,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             c1.f_name AS fName,
             c.f_id AS fId,
             c.f_name AS fFeesName,
-            w.f_mblno AS fMblno,
+            car.mblno AS fMblno,
             w.f_product_name AS fProductName,
             w.create_time AS fBsdate,
             w.act_id AS fBilltype,
@@ -307,6 +307,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ifnull( w.f_amount, 0 ) - ifnull( w.f_stlamount, 0 ) AS fAmt
         FROM
             F_TMSORDERBILLSFEES w
+            LEFT JOIN F_TMSORDERBILLSCARS car ON car.id = w.f_pid
             LEFT JOIN t_fees f ON w.f_feeid = f.f_id
             LEFT JOIN t_corps AS c ON w.f_corpid = c.f_id
             LEFT JOIN F_TMSORDERBILLS AS t ON w.org_id = t.id
@@ -317,7 +318,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND dict.dict_type = 'data_billType'
             <if test=" fCorpid != null  and  fCorpid != ''">and t.corp_id = #{ fCorpid} </if>
             <if test=" fToCorpid != null  and  fToCorpid != ''">and w.f_corpid = #{ fToCorpid} </if>
-            <if test=" fMblno != null  and  fMblno != ''">and w.f_mblno  like concat('%', #{ fMblno}, '%') </if>
+            <if test=" fMblno != null  and  fMblno != ''">and car.mblno  like concat('%', #{ fMblno}, '%') </if>
             <if test=" fStatementNo != null and  fStatementNo != ''">and w.f_statement_no  like concat('%', #{ fStatementNo}, '%') </if>
             <if test=' fReconciliation != null and  fReconciliation != "" and  fReconciliation == "1" '>
                 and w.f_accamount_date IS NOT NULL