1 修改费用类型赋值

src/main/java/com/example/backend/pAndSExe/mapper/PurMultiSettleMapper.java

@@ -2,8 +2,10 @@ package com.example.backend.pAndSExe.mapper;
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.backend.pAndSExe.model.Feiyongleixing;
 import com.example.backend.pAndSExe.model.PurMultiSettle;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 /**
@@ -24,4 +26,7 @@ public interface PurMultiSettleMapper extends BaseMapper<PurMultiSettle> {
     @InterceptorIgnore(blockAttack="true")
     @Update("{call SGGMIIP.pro_feelInvReq_save300(#{settleId})}")
     void insertfeeId(Long settleId);
+
+    @Select("select cateCode,cateName,feeCd,feeNm from fytypedtl where ifnull(del_flag, 0) != 1  and feeNm=#{feeNm} order by cateCode,feeCd limit 1")
+    Feiyongleixing selectFeeCateNameByFeeNm(String feeNm);
 }

src/main/java/com/example/backend/pAndSExe/model/Feiyongleixing.java

@@ -0,0 +1,19 @@
+package com.example.backend.pAndSExe.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+@Data
+public class Feiyongleixing{
+
+    @TableField("cateCode")
+    private String cateCode;
+    @TableField("cateName")
+    private String cateName;
+    @TableField("feeCd")
+    private String feeCd;
+    @TableField("feeNm")
+    private String feeNm;
+}
+
+

src/main/java/com/example/backend/pAndSExe/service/impl/FeeInvoiceSettleServiceImpl.java

@@ -72,6 +72,10 @@ public class FeeInvoiceSettleServiceImpl implements FeeInvoiceSettleService {
                 settle.setTaxInvType(inf.getTaxInvType()); // 映射中间表发票类型
                 settle.setExpNode(inf.getExpNode());   // 映射中间表业务类别
                 settle.setCateName(inf.getCateName()); // 映射中间表类别名称
+
+                Feiyongleixing feiyongleixing=purMultiSettleMapper.selectFeeCateNameByFeeNm(inf.getFeeNm());
+                settle.setCateName(feiyongleixing.getCateName());
+                settle.setCateCode(feiyongleixing.getCateCode());
                 // 公用字段赋值
                 settle.setQichu("1"); // 固定值1
                 settle.setSoloId(inf.getId()); // 关联中间表的ID
@@ -176,6 +180,7 @@ public class FeeInvoiceSettleServiceImpl implements FeeInvoiceSettleService {
                 dtl.setNtPoAmt(inf.getNtPoAmt());   // 映射中间表无税金额
                 dtl.setInTaxRate(inf.getInTaxRate()); // 映射中间表税率
                 dtl.setFeeNm(inf.getFeeNm());       // 映射中间表费用名称
+                dtl.setFeeCd(feiyongleixing.getFeeCd());
                 dtl.setCurcypo(inf.getCurcypo());   // 映射中间表币别
                 dtl.setPoamt(inf.getPoamt());
                 dtl.setPoprice(inf.getPoprice());