From 8fb76d6035b2d3bd643fe13380118e34085e0270 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 14 Jan 2025 08:45:23 +0800
Subject: [PATCH 1/6] =?UTF-8?q?oaform=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/oa/api/OaMendApplyRest.java |  2 +-
 .../oa/biz/oamendapply/OaMendApplyDto.java    |  3 +++
 .../biz/oamendapply/OaMendApplyService.java   |  2 +-
 .../biz/oamendapply/SubmitOaMendApplyDto.java | 26 -------------------
 4 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/SubmitOaMendApplyDto.java

diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java
index 519abf6c4c..ab3827c71c 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java
@@ -95,7 +95,7 @@ public class OaMendApplyRest {
 
     @ApiOperation("提交审批流程")
     @PostMapping("/submit")
-    public ResultBean submit(@RequestBody @Valid SubmitOaMendApplyDto dto) {
+    public ResultBean submit(@RequestBody @Valid OaMendApplyDto dto) {
         return oaMendApplyService.submit(dto);
     }
 
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java
index 736ecbf4e6..23cdb01970 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java
@@ -68,6 +68,9 @@ public class OaMendApplyDto implements Dto {
     @ApiModelProperty("图片")
     private List<String> files = new ArrayList<>();
 
+    @ApiModelProperty("任务id")
+    private String taskId;
+
     /* @ApiModelProperty("单据编号")
     private String billNo; // 单据编号
     @ApiModelProperty("申请人")
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java
index 40744f34d2..534f14a87b 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java
@@ -198,7 +198,7 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
      * @param dto
      * @return
      */
-    public ResultBean submit(SubmitOaMendApplyDto dto) {
+    public ResultBean submit(OaMendApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         ResultBean<String> stringResultBean = saveOrUpdateDto(dto);
         if (!stringResultBean.getSuccess()) {
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/SubmitOaMendApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/SubmitOaMendApplyDto.java
deleted file mode 100644
index 2c16bfdcfd..0000000000
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/SubmitOaMendApplyDto.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.yxt.anrui.oa.biz.oamendapply;
-
-import com.yxt.anrui.oa.biz.oaleaveapply.OaLeaveApplyDto;
-import com.yxt.anrui.oa.biz.oamendapply.OaMendApplyDto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author liuguohui
- * @version 1.0
- * @description
- * @date 2022/04/13
- */
-@ApiModel("提交")
-@Data
-public class SubmitOaMendApplyDto extends OaMendApplyDto {
-
-    private static final long serialVersionUID = 8607710587497609779L;
-    /*    @ApiModelProperty("意见")
-        private String comment;
-        @ApiModelProperty("流程实例id")
-        private String instanceId;*/
-    @ApiModelProperty("任务id")
-    private String taskId;
-}

From 183a778e777952cb077c16f348e38033aa9782a2 Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Tue, 14 Jan 2025 08:52:15 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fin/api/finpayment/FinPaymentQuery.java   |  27 ++-
 .../fin/api/finpayment/FinPaymentVo.java      |  30 ++-
 .../fin/biz/finpayment/FinPaymentMapper.java  |  16 +-
 .../fin/biz/finpayment/FinPaymentMapper.xml   |  25 ++-
 .../fin/biz/finpayment/FinPaymentRest.java    |  79 ++++----
 .../fin/biz/finpayment/FinPaymentService.java |  77 +++++++-
 .../LoanBeCollectionApplyRest.java            | 184 +++++++++---------
 7 files changed, 250 insertions(+), 188 deletions(-)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java
index cdae6a7cfc..70f826f69e 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java
@@ -49,20 +49,15 @@ import lombok.Data;
 @ApiModel(value = "付款信息管理 查询条件", description = "付款信息管理 查询条件")
 public class FinPaymentQuery implements Query {
 
-	@ApiModelProperty("单位编码")
-    private String companyCode; // 单位编码
-	@ApiModelProperty("单位名称")
-    private String companyName; // 单位名称
-	@ApiModelProperty("开户行")
-    private String bank; // 开户行
-	@ApiModelProperty("收款银行账号")
-    private String receivingAccount; // 收款银行账号
-	@ApiModelProperty("业务类型key")
-    private String businessTypeKey; // 业务类型key
-	@ApiModelProperty("业务类型value")
-    private String businessTypeValue; // 业务类型value
-    @ApiModelProperty("分公司sid")
-    private String useOrgSid; // 分公司sid
-    @ApiModelProperty("分公司名称")
-    private String useOrgName;
+    @ApiModelProperty("单位名称")
+    private String companyName;
+    @ApiModelProperty("收款银行账号")
+    private String receivingAccount;
+    @ApiModelProperty("业务类型value")
+    private String businessTypeValue;
+
+    private String userSid;
+    private String orgPath;
+    private String menuUrl;
+    private String menuSid;
 }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java
index 18e88f922f..286e120d75 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java
@@ -49,22 +49,18 @@ import lombok.Data;
 @ApiModel(value = "付款信息管理 视图数据对象", description = "付款信息管理 视图数据对象")
 public class FinPaymentVo implements Vo {
 
-    private String sid; // sid
+    private String sid;
 
-	@ApiModelProperty("单位编码")
-    private String companyCode; // 单位编码
-	@ApiModelProperty("单位名称")
-    private String companyName; // 单位名称
-	@ApiModelProperty("开户行")
-    private String bank; // 开户行
-	@ApiModelProperty("收款银行账号")
-    private String receivingAccount; // 收款银行账号
-	@ApiModelProperty("业务类型key")
-    private String businessTypeKey; // 业务类型key
-	@ApiModelProperty("业务类型value")
-    private String businessTypeValue; // 业务类型value
-    @ApiModelProperty("分公司sid")
-    private String useOrgSid; // 分公司sid
-    @ApiModelProperty("分公司名称")
-    private String useOrgName;
+    @ApiModelProperty("单位编码")
+    private String companyCode;
+    @ApiModelProperty("单位名称")
+    private String companyName;
+    @ApiModelProperty("开户行")
+    private String bank;
+    @ApiModelProperty("收款银行账号")
+    private String receivingAccount;
+    @ApiModelProperty("业务类型value")
+    private String businessTypeValue;
+    @ApiModelProperty("备注")
+    private String remarks;
 }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentMapper.java
index c9878df295..e86c539bbe 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentMapper.java
@@ -54,16 +54,12 @@ import java.util.List;
 @Mapper
 public interface FinPaymentMapper extends BaseMapper<FinPayment> {
 
-	//@Update("update fin_payment set name=#{msg} where id=#{id}")
-	//IPage<FinPaymentVo> voPage(IPage<FinPayment> page, @Param(Constants.WRAPPER) QueryWrapper<FinPayment> qw);
-	
-	IPage<FinPaymentVo> selectPageVo(IPage<FinPayment> page, @Param(Constants.WRAPPER) Wrapper<FinPayment> qw);
-	
-	List<FinPaymentVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinPayment> qw);
-	
-	@Select("select * from fin_payment")
-	List<FinPaymentVo> selectListVo();
+    IPage<FinPaymentVo> selectPageVo(IPage<FinPayment> page, @Param(Constants.WRAPPER) Wrapper<FinPayment> qw);
 
-	@Select("select * from fin_payment where useOrgSid = #{useOrgSid}")
+    @Select("select * from fin_payment where useOrgSid = #{useOrgSid}")
     List<FinPaymentDetailsVo> selectByUseOrgSid(String useOrgSid);
+
+    int checkSave(@Param("useOrgSid") String useOrgSid,@Param("companyCode") String companyCode);
+
+    int checkUpdate(@Param("useOrgSid") String useOrgSid,@Param("companyCode") String companyCode, @Param("sid") String sid);
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentMapper.xml
index 82fee1769f..b2830ac241 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentMapper.xml
@@ -4,10 +4,27 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finpayment.FinPaymentVo">
-		SELECT * FROM fin_payment <where> ${ew.sqlSegment} </where>
+		SELECT * FROM fin_payment fp
+		LEFT JOIN anrui_portal.sys_organization as u ON fp.useOrgSid = u.sid
+		<where> ${ew.sqlSegment} </where>
 	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finpayment.FinPaymentVo">
-		SELECT * FROM fin_payment <where> ${ew.sqlSegment} </where>
+
+	<select id="checkSave" resultType="int">
+		SELECT
+			COUNT(*)
+		FROM
+			fin_payment
+		WHERE companyCode = #{companyCode}
+		  AND useOrgSid = #{useOrgSid}
+	</select>
+
+	<select id="checkUpdate" resultType="int">
+		SELECT
+			COUNT(*)
+		FROM
+			fin_payment
+		WHERE companyCode = #{companyCode}
+		  AND useOrgSid = #{useOrgSid}
+		  AND sid != #{sid}
 	</select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java
index 0a5c605ccd..b3025515c0 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java
@@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+
 import com.yxt.anrui.fin.api.finpayment.FinPayment;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentQuery;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentVo;
@@ -55,53 +56,51 @@ import com.yxt.anrui.fin.api.finpayment.FinPaymentFeign;
  * @since 1.0
  */
 @Api(tags = "付款信息管理")
-@RestController("com.yxt.anrui.fin.biz.finpayment.FinPaymentRest")
+@RestController
 @RequestMapping("v1/finpayment")
 public class FinPaymentRest implements FinPaymentFeign {
 
-	@Autowired
-	private FinPaymentService finPaymentService;
+    @Autowired
+    private FinPaymentService finPaymentService;
 
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<FinPaymentVo>> listPage(@RequestBody PagerQuery<FinPaymentQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<FinPaymentVo> pv = finPaymentService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<FinPaymentVo>> listPage(@RequestBody PagerQuery<FinPaymentQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<FinPaymentVo> pv = finPaymentService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
 
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody FinPaymentDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		finPaymentService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody FinPaymentDto dto) {
+        return finPaymentService.saveOrUpdateDto(dto);
+    }
 
-	@Override
-	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		finPaymentService.delBySids(sids);
-		return rb.success();
-	}
+    @Override
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        finPaymentService.delBySids(sids);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据SID获取一条记录")
+    @Override
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<FinPaymentDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		FinPaymentDetailsVo vo = finPaymentService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
+    public ResultBean<FinPaymentDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        FinPaymentDetailsVo vo = finPaymentService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
 
-	@Override
-	public ResultBean<List<FinPaymentDetailsVo>> selectByUseOrgSid(String useOrgSid) {
-		ResultBean rb = ResultBean.fireFail();
-		List<FinPaymentDetailsVo> voList = finPaymentService.selectByUseOrgSid(useOrgSid);
-		return rb.success().setData(voList);
-	}
+    @Override
+    public ResultBean<List<FinPaymentDetailsVo>> selectByUseOrgSid(String useOrgSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<FinPaymentDetailsVo> voList = finPaymentService.selectByUseOrgSid(useOrgSid);
+        return rb.success().setData(voList);
+    }
 }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java
index b8ce368917..2329e8c8a6 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java
@@ -28,6 +28,9 @@ package com.yxt.anrui.fin.biz.finpayment;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyVo;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -41,6 +44,7 @@ import com.yxt.anrui.fin.api.finpayment.FinPaymentDetailsVo;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentDto;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentFeign;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -60,29 +64,84 @@ import java.util.List;
  */
 @Service
 public class FinPaymentService extends MybatisBaseService<FinPaymentMapper, FinPayment> {
-    private QueryWrapper<FinPayment> createQueryWrapper(FinPaymentQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-        QueryWrapper<FinPayment> qw = new QueryWrapper<>();
-        return qw;
-    }
+
+    @Autowired
+    private SysUserFeign sysUserFeign;
 
     public PagerVo<FinPaymentVo> listPageVo(PagerQuery<FinPaymentQuery> pq) {
         FinPaymentQuery query = pq.getParams();
-        QueryWrapper<FinPayment> qw = createQueryWrapper(query);
+        QueryWrapper<FinPayment> qw = new QueryWrapper<>();
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("u.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("u.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("u.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("u.orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("fp.createBySid", query.getUserSid());
+                } else {
+                    PagerVo<FinPaymentVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<FinPaymentVo> p = new PagerVo<>();
+                return p;
+            }
+        }
+        if (StringUtils.isNotBlank(query.getCompanyName())) {
+            qw.like("fp.companyName", query.getCompanyName());
+        }
+        if (StringUtils.isNotBlank(query.getReceivingAccount())) {
+            qw.like("fp.receivingAccount", query.getReceivingAccount());
+        }
+        if (StringUtils.isNotBlank(query.getBusinessTypeValue())) {
+            qw.like("fp.businessTypeValue", query.getBusinessTypeValue());
+        }
         IPage<FinPayment> page = PagerUtil.queryToPage(pq);
         IPage<FinPaymentVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<FinPaymentVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
-    public void saveOrUpdateDto(FinPaymentDto dto) {
+    public ResultBean saveOrUpdateDto(FinPaymentDto dto) {
+        ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
+            int count = baseMapper.checkSave(dto.getUseOrgSid(), dto.getCompanyCode());
+            if (count > 0) {
+                return rb.setMsg("该分公司下单位编码已存在");
+            }
             this.insertByDto(dto);
-            return;
+            return rb.success();
+        }
+        int count = baseMapper.checkUpdate(dto.getUseOrgSid(), dto.getCompanyCode(), dtoSid);
+        if (count > 0) {
+            return rb.setMsg("该分公司下单位编码已存在");
         }
         this.updateByDto(dto);
+        return rb.success();
     }
 
     public void insertByDto(FinPaymentDto dto) {
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyRest.java
index 45d148e6b1..c8b7af55df 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyRest.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyRest.java
@@ -60,101 +60,101 @@ import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyF
  * @since 1.0
  */
 @Api(tags = "逾期催收申请")
-@RestController("com.yxt.anrui.riskcenter.biz.loanbecollectionapply.LoanBeCollectionApplyRest")
+@RestController
 @RequestMapping("v1/loanbecollectionapply")
 public class LoanBeCollectionApplyRest implements LoanBeCollectionApplyFeign {
 
-	@Autowired
-	private LoanBeCollectionApplyService loanBeCollectionApplyService;
-
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<LoanBeCollectionApplyVo>> listPage(@RequestBody PagerQuery<LoanBeCollectionApplyQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<LoanBeCollectionApplyVo> pv = loanBeCollectionApplyService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody LoanBeCollectionApplyDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		loanBeCollectionApplyService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据sid批量删除")
+    @Autowired
+    private LoanBeCollectionApplyService loanBeCollectionApplyService;
+
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<LoanBeCollectionApplyVo>> listPage(@RequestBody PagerQuery<LoanBeCollectionApplyQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<LoanBeCollectionApplyVo> pv = loanBeCollectionApplyService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody LoanBeCollectionApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        loanBeCollectionApplyService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
+
+    @Override
+    @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		return loanBeCollectionApplyService.delAllBySids(sids);
-	}
-
-	@Override
-	public ResultBean<LoanBeCollectionApplyDetailsVo> init(String saleVehSid, String orgPath, String userSid) {
-		ResultBean rb = ResultBean.fireFail();
-		LoanBeCollectionApplyDetailsVo loanBeCollectionApplyDetailsVo = loanBeCollectionApplyService.init(saleVehSid,orgPath,userSid);
-		return rb.success().setData(loanBeCollectionApplyDetailsVo);
-	}
-
-	@Override
-	@ApiOperation("根据SID获取一条记录")
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        return loanBeCollectionApplyService.delAllBySids(sids);
+    }
+
+    @Override
+    public ResultBean<LoanBeCollectionApplyDetailsVo> init(String saleVehSid, String orgPath, String userSid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanBeCollectionApplyDetailsVo loanBeCollectionApplyDetailsVo = loanBeCollectionApplyService.init(saleVehSid, orgPath, userSid);
+        return rb.success().setData(loanBeCollectionApplyDetailsVo);
+    }
+
+    @Override
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<LoanBeCollectionApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		LoanBeCollectionApplyDetailsVo vo = loanBeCollectionApplyService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
-
-	@Override
-	public ResultBean saveLockCarState(String applySid, String saleVehSid, String lockCarState) {
-		ResultBean rb = ResultBean.fireFail();
-		loanBeCollectionApplyService.saveLockCarState(applySid,saleVehSid,lockCarState);
-		return rb.success();
-	}
-
-	@Override
-	public ResultBean submit(SubmitLoanBeCollectionApplyDto dto) {
-		return loanBeCollectionApplyService.submit(dto);
-	}
-
-	@Override
-	public ResultBean complete(LoanBeCollectionApplyCompleteDto query) {
-		BusinessVariables bv = new BusinessVariables();
-		BeanUtil.copyProperties(query, bv);
-		bv.setModelId(ProcDefEnum.BECOLLECTIONAPPLY.getProDefId());
-		return loanBeCollectionApplyService.complete(bv);
-	}
-
-	@Override
-	public ResultBean<List<LoanBeCollectionApplyNodeVo>> getPreviousNodesForReject(LoanBeCollectionApplyNodeQuery query) {
-		return loanBeCollectionApplyService.getPreviousNodesForReject(query);
-	}
-
-	@Override
-	public ResultBean<List<LoanBeCollectionApplyNodeVo>> getNextNodesForSubmit(LoanBeCollectionApplyNodeQuery query) {
-		return loanBeCollectionApplyService.getNextNodesForSubmit(query);
-	}
-
-	@Override
-	public ResultBean reject(LoanBeCollectionApplyTaskQuery query) {
-		return loanBeCollectionApplyService.reject(query);
-	}
-
-	@Override
-	public ResultBean revokeProcess(LoanBeCollectionApplyTaskQuery query) {
-		return loanBeCollectionApplyService.revokeProcess(query);
-	}
-
-	@Override
-	public ResultBean breakProcess(LoanBeCollectionApplyTaskQuery query) {
-		return loanBeCollectionApplyService.breakProcess(query);
-	}
-
-	@Override
-	public ResultBean delegate(LoanBeCollectionApplyDelegateQuery query) {
-		return loanBeCollectionApplyService.delegate(query);
-	}
+    public ResultBean<LoanBeCollectionApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanBeCollectionApplyDetailsVo vo = loanBeCollectionApplyService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    public ResultBean saveLockCarState(String applySid, String saleVehSid, String lockCarState) {
+        ResultBean rb = ResultBean.fireFail();
+        loanBeCollectionApplyService.saveLockCarState(applySid, saleVehSid, lockCarState);
+        return rb.success();
+    }
+
+    @Override
+    public ResultBean submit(SubmitLoanBeCollectionApplyDto dto) {
+        return loanBeCollectionApplyService.submit(dto);
+    }
+
+    @Override
+    public ResultBean complete(LoanBeCollectionApplyCompleteDto query) {
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.BECOLLECTIONAPPLY.getProDefId());
+        return loanBeCollectionApplyService.complete(bv);
+    }
+
+    @Override
+    public ResultBean<List<LoanBeCollectionApplyNodeVo>> getPreviousNodesForReject(LoanBeCollectionApplyNodeQuery query) {
+        return loanBeCollectionApplyService.getPreviousNodesForReject(query);
+    }
+
+    @Override
+    public ResultBean<List<LoanBeCollectionApplyNodeVo>> getNextNodesForSubmit(LoanBeCollectionApplyNodeQuery query) {
+        return loanBeCollectionApplyService.getNextNodesForSubmit(query);
+    }
+
+    @Override
+    public ResultBean reject(LoanBeCollectionApplyTaskQuery query) {
+        return loanBeCollectionApplyService.reject(query);
+    }
+
+    @Override
+    public ResultBean revokeProcess(LoanBeCollectionApplyTaskQuery query) {
+        return loanBeCollectionApplyService.revokeProcess(query);
+    }
+
+    @Override
+    public ResultBean breakProcess(LoanBeCollectionApplyTaskQuery query) {
+        return loanBeCollectionApplyService.breakProcess(query);
+    }
+
+    @Override
+    public ResultBean delegate(LoanBeCollectionApplyDelegateQuery query) {
+        return loanBeCollectionApplyService.delegate(query);
+    }
 }

From d79e5d47b85c7b3076e493222e2bc62d7d7c2867 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 14 Jan 2025 11:40:59 +0800
Subject: [PATCH 3/6] =?UTF-8?q?oaform=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/anrui/oa/biz/oaform/OaFormDto.java    |  3 ++
 .../oa/biz/oamendapply/OaMendApplyDto.java    | 36 ++-----------------
 .../biz/oamendapply/OaMendApplyService.java   | 14 ++++----
 3 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java
index 949d3a7894..3f635bcdef 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java
@@ -21,4 +21,7 @@ public class OaFormDto {
     private String billNo;
     @ApiModelProperty("sid")
     private String sid;
+
+    @ApiModelProperty("任务id")
+    private String taskId;
 }
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java
index 23cdb01970..b2db13d559 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java
@@ -26,6 +26,7 @@
 package com.yxt.anrui.oa.biz.oamendapply;
 
 
+import com.yxt.anrui.oa.biz.oaform.OaFormDto;
 import com.yxt.common.core.dto.Dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -53,12 +54,9 @@ import lombok.Data;
  */
 @Data
 @ApiModel(value = "补卡申请 数据传输对象", description = "补卡申请 数据传输对象")
-public class OaMendApplyDto implements Dto {
+public class OaMendApplyDto extends OaFormDto {
 
     private static final long serialVersionUID = -4536006302677264298L;
-    private String sid;
-    private String createBySid;
-    private String orgSidPath;
     @ApiModelProperty("补卡原因")
     private String remarks;
     @ApiModelProperty("补卡时间")
@@ -67,34 +65,4 @@ public class OaMendApplyDto implements Dto {
     private String linkFormSids;
     @ApiModelProperty("图片")
     private List<String> files = new ArrayList<>();
-
-    @ApiModelProperty("任务id")
-    private String taskId;
-
-    /* @ApiModelProperty("单据编号")
-    private String billNo; // 单据编号
-    @ApiModelProperty("申请人")
-    private String createByName;
-    @ApiModelProperty("申请部门sid")
-    private String deptSid;
-    @ApiModelProperty("申请部门名称")
-    private String deptName;
-
-      @ApiModelProperty("分公司sid")
-    private String useOrgSid;
-    @ApiModelProperty("分公司名称")
-    private String useOrgName;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @ApiModelProperty("办结日期")
-    private Date finishTime;
-    @ApiModelProperty("实例id")
-    private String procInstId;
-    @ApiModelProperty("流程定义id")
-    private String procDefId;
-    @ApiModelProperty("任务id")
-    private String taskId;
-    @ApiModelProperty("环节id")
-    private String nodeId;
-    @ApiModelProperty("流程状态")
-    private String nodeState;*/
 }
\ No newline at end of file
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java
index 534f14a87b..f58a993bb7 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java
@@ -142,11 +142,11 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
             OaMendApply entity = new OaMendApply();
             BeanUtil.copyProperties(dto, entity, "sid");
 
-            OaFormDto oaFormDto = new OaFormDto();
-            BeanUtil.copyProperties(dto, oaFormDto);
-            oaFormDto.setBillNo("BKSQ");
-            oaFormDto.setSid(entity.getSid());
-            ResultBean<String> resultBean = oaFormService.saveOaForm(oaFormDto);
+            /*OaFormDto oaFormDto = new OaFormDto();
+            BeanUtil.copyProperties(dto, oaFormDto);*/
+            dto.setBillNo("BKSQ");
+            dto.setSid(entity.getSid());
+            ResultBean<String> resultBean = oaFormService.saveOaForm(dto);
 
             if (!resultBean.getSuccess()) {
                 return rb;
@@ -262,8 +262,9 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
         return oaFormService.reject(dto);
     }
 
-     /**
+    /**
      * 提交时获取下一环节
+     *
      * @param query
      * @return
      */
@@ -281,6 +282,7 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
 
     /**
      * 驳回时获取上一环节
+     *
      * @param query
      * @return
      */

From 037c16890c229b3186c07cea10728d2e99b0d607 Mon Sep 17 00:00:00 2001
From: yxt_mtl <2049520089@qq.com>
Date: Tue, 14 Jan 2025 11:56:07 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E3=80=81=E9=99=84=E4=BB=B6=E3=80=81=E5=85=B3=E8=81=94=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=8D=95=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java
index 3f635bcdef..b278072f7d 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java
@@ -12,7 +12,8 @@ import java.util.Date;
  * @date: 2025/1/7
  **/
 @Data
-public class OaFormDto {
+public class OaFormDto implements Dto {
+    //保存时赋值
     @ApiModelProperty("创建人sid")
     private String createBySid;
     @ApiModelProperty("组织机构全路径")
@@ -22,6 +23,7 @@ public class OaFormDto {
     @ApiModelProperty("sid")
     private String sid;
 
+    //流程提交时赋值
     @ApiModelProperty("任务id")
     private String taskId;
 }

From 86223aa7bc75e66b37f4d37aee554e9f5c728d24 Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Tue, 14 Jan 2025 14:00:49 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/basetrailer/BaseTrailerFeign.java     |   4 +
 .../api/basetrailer/PayApplyTrailerVo.java    |  63 +++++++
 .../biz/basetrailer/BaseTrailerMapper.java    |   2 +
 .../biz/basetrailer/BaseTrailerMapper.xml     |  43 ++++-
 .../base/biz/basetrailer/BaseTrailerRest.java | 165 +++++++++---------
 .../biz/basetrailer/BaseTrailerService.java   |   6 +
 .../finpaymentapply/FinPaymentapplyDto.java   |   6 +
 .../FinPaymentapplyTop.java                   |  82 +++++++++
 .../FinPaymentapplyTopDetailsVo.java          |  83 +++++++++
 .../FinPaymentapplyTopDto.java                |  83 +++++++++
 .../FinPaymentapplyTopFeign.java              |  38 ++++
 .../FinPaymentapplyTrailer.java               |  84 +++++++++
 .../FinPaymentapplyTrailerDetailsVo.java      |  85 +++++++++
 .../FinPaymentapplyTrailerDto.java            |  85 +++++++++
 .../FinPaymentapplyTrailerFeign.java          |  38 ++++
 .../FinPaymentapplyService.java               |  49 +++++-
 .../FinPaymentapplyTopMapper.java             |  38 ++++
 .../FinPaymentapplyTopMapper.xml              |   6 +
 .../FinPaymentapplyTopRest.java               |  38 ++++
 .../FinPaymentapplyTopService.java            |  67 +++++++
 .../FinPaymentapplyTrailerMapper.java         |  38 ++++
 .../FinPaymentapplyTrailerMapper.xml          |   6 +
 .../FinPaymentapplyTrailerRest.java           |  38 ++++
 .../FinPaymentapplyTrailerService.java        |  67 +++++++
 .../LoanBeCollectionApplyService.java         |   2 +-
 .../LoanBeCollectionVehMapper.java            |   2 +-
 .../LoanBeCollectionVehMapper.xml             |  13 +-
 .../LoanBeCollectionVehService.java           |   4 +-
 28 files changed, 1133 insertions(+), 102 deletions(-)
 create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/PayApplyTrailerVo.java
 create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTop.java
 create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopDetailsVo.java
 create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopDto.java
 create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopFeign.java
 create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailer.java
 create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerDetailsVo.java
 create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerDto.java
 create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerFeign.java
 create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopMapper.java
 create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopMapper.xml
 create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopRest.java
 create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopService.java
 create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerMapper.java
 create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerMapper.xml
 create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerRest.java
 create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerService.java

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java
index 65d0cb1763..862d5c677b 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java
@@ -142,4 +142,8 @@ public interface BaseTrailerFeign {
     @ApiOperation("根据挂车车架号和车辆sid获取一条记录")
     @PostMapping("/fetchByGcVinNoAndVehSid")
     ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(@RequestParam("gcVinNo") String gcVinNo,@RequestParam("vehSid") String vehSid);
+
+    @ApiOperation("付款申请选择挂车")
+    @PostMapping("/payApply")
+    public ResultBean<List<PayApplyTrailerVo>> payApply(@RequestParam("useOrgSid") String useOrgSid);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/PayApplyTrailerVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/PayApplyTrailerVo.java
new file mode 100644
index 0000000000..870d0dba66
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/PayApplyTrailerVo.java
@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basetrailer;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class PayApplyTrailerVo implements Vo {
+
+	@ApiModelProperty("挂车名称")
+	private String trailerTypeValue; // 挂车名称
+	@ApiModelProperty("外观尺寸")
+	private String size; // 外观尺寸
+	@ApiModelProperty("车架号")
+	private String vinNo; // 车架号
+	@ApiModelProperty("挂车sid")
+	private String trailerSid; // 挂车sid
+	@ApiModelProperty("箱体颜色")
+	private String color; // 箱体颜色
+	@ApiModelProperty("厂家结算价")
+	private BigDecimal costPrice; // 厂家结算价
+	@ApiModelProperty("品牌名称")
+	private String brandName; // 品牌名称
+	@ApiModelProperty("车型别名")
+	private String vehModel; // 车型别名
+	@ApiModelProperty("主车车架号")
+	private String zcVinNo; // 主车车架号
+	@ApiModelProperty("合同编号")
+	private String contractNo; // 合同编号
+	@ApiModelProperty("销售订单号")
+	private String saleOrderNo; // 销售订单号
+	@ApiModelProperty("客户名称")
+	private String customerName; // 客户名称
+	@ApiModelProperty("销售类型")
+	private String payType; // 销售类型
+}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java
index a3fa20ddcf..475783419f 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java
@@ -109,4 +109,6 @@ public interface BaseTrailerMapper extends BaseMapper<BaseTrailer> {
     BaseTrailerDetailsVo fetchByGcVinNoAndVehSid(@Param("gcVinNo") String gcVinNo,@Param("vehSid") String vehSid);
 
     List<BaseTrailerModelDetailsVo> fetchTypeAndMan(String materialSid);
+
+    List<PayApplyTrailerVo> payApply(String useOrgSid);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml
index 842cdffe7c..467c84268e 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml
@@ -8,7 +8,7 @@
         btm.*
         FROM base_trailer bt
         LEFT JOIN base_trailer_model btm
-        ON bt.`trailerModelSid` = btm.`sid`
+        ON bt.trailerModelSid = btm.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -59,7 +59,7 @@
         from base_vehicle_out_apply
         where billNo LIKE concat(#{billNo}, '%')
         order by billNo desc
-                limit 1
+            limit 1
     </select>
 
     <select id="selectNumGCRK" resultType="int">
@@ -95,7 +95,7 @@
                btm.boxColor,
                btm.moreConfig
         from base_trailer bt
-                     left join base_trailer_model btm on btm.sid = bt.trailerModelSid
+                 left join base_trailer_model btm on btm.sid = bt.trailerModelSid
         where bt.vehSid = #{vinSid}
     </select>
 
@@ -103,8 +103,41 @@
         SELECT btm.trailerTypeValue,
                btm.manufacturerName
         FROM base_trailer bt
-                     LEFT JOIN base_trailer_model btm
-                ON bt.`trailerModelSid` = btm.`sid`
+                 LEFT JOIN base_trailer_model btm
+                           ON bt.trailerModelSid = btm.sid
         WHERE bt.vehSid = #{materialSid}
     </select>
+
+    <select id="payApply" resultType="com.yxt.anrui.base.api.basetrailer.PayApplyTrailerVo">
+        SELECT btm.trailerTypeValue,
+               CONCAT(
+                       btm.appearanceSizeLong,
+                       btm.appearanceSizeWide,
+                       btm.appearanceSizeHigh
+                   ) AS size,
+                bt.vinNo,
+                bt.sid AS trailerSid,
+                btm.boxColor AS color,
+                bt.settlementPrice AS costPrice,
+                btm.brandName,
+                btm.carModelName AS vehModel,
+                bt.zcvinNo AS zcVinNo,
+                bso.contractNo,
+                bso.billNo AS saleOrderNo,
+                bso.customerName,
+                bso.payType
+        FROM
+            base_trailer bt
+            LEFT JOIN base_trailer_model btm
+        ON bt.trailerModelSid = btm.sid
+            LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bsov
+            ON bt.vehSid = bsov.linkSid
+            LEFT JOIN anrui_buscenter.bus_sales_order bso
+            ON bsov.salesOrderSid = bso.sid
+        WHERE bt.useOrgSid = #{useOrgSid}
+          AND bt.sid NOT IN (
+            SELECT ft.trailerSid
+            FROM anrui_fin.fin_paymentapply_trailer ft
+            )
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java
index 43b115e081..8ff9754cb6 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java
@@ -52,88 +52,93 @@ import java.util.List;
  * @since 1.0
  */
 @Api(tags = "挂车 base_trailer")
-@RestController("com.yxt.anrui.base.biz.basetrailer.BaseTrailerRest")
+@RestController
 @RequestMapping("v1/basetrailer")
 public class BaseTrailerRest implements BaseTrailerFeign {
 
-	@Autowired
-	private BaseTrailerService baseTrailerService;
-
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<BaseTrailerVo>> listPage(@RequestBody PagerQuery<BaseTrailerQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<BaseTrailerVo> pv = baseTrailerService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@Override
-	@ApiOperation("新增保存")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody BaseTrailerDto dto){
-		return baseTrailerService.saveTrailer(dto);
-	}
-
-	@Override
-	@ApiOperation("修改保存")
-	@PostMapping("/update/{sid}")
-	public ResultBean update(@RequestBody BaseTrailerDto dto, @PathVariable("sid") String sid){
-		return baseTrailerService.updateTrailer(dto,sid);
-	}
-
-	@Override
-	@ApiOperation("根据sid批量删除")
+    @Autowired
+    private BaseTrailerService baseTrailerService;
+
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<BaseTrailerVo>> listPage(@RequestBody PagerQuery<BaseTrailerQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<BaseTrailerVo> pv = baseTrailerService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody BaseTrailerDto dto) {
+        return baseTrailerService.saveTrailer(dto);
+    }
+
+    @Override
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@RequestBody BaseTrailerDto dto, @PathVariable("sid") String sid) {
+        return baseTrailerService.updateTrailer(dto, sid);
+    }
+
+    @Override
+    @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		baseTrailerService.delBySids(sids);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据SID获取一条记录")
-	@GetMapping("/fetchBySid/{sid}")
-	public ResultBean<BaseTrailerDetailsVo> fetchBySid(@PathVariable("sid") String sid) {
-		return baseTrailerService.fetchDetailsBySid(sid);
-	}
-
-	@Override
-	public ResultBean<List<BaseTrailer>> getByVehSid(String vehSid) {
-		return baseTrailerService.getByVehSid(vehSid);
-	}
-
-	@Override
-	public ResultBean<PagerVo<BaseTrailerSearchVo>> searchPage(PagerQuery<BaseTrailerSearchQuery> pagerQuery) {
-		ResultBean<PagerVo<BaseTrailerSearchVo>> rb = ResultBean.fireFail();
-		IPage<BaseTrailerSearchVo> page = baseTrailerService.searchPage(pagerQuery);
-		PagerVo<BaseTrailerSearchVo> pv = new PagerVo<>();
-		PagerVo<BaseTrailerSearchVo> pv1 = PagerUtil.pageToVo(page, pv);
-		return rb.success().setData(pv1);
-	}
-
-	@Override
-	public ResultBean trailerOut(String sid) {
-		return baseTrailerService.trailerOut(sid);
-	}
-
-	@Override
-	public ResultBean trailerOutNew(String sid) {
-		return baseTrailerService.trailerOutNew(sid);
-	}
-
-	@Override
-	public ResultBean<TraliveredVo> trailerList(String vinSid,String contractNo) {
-		return baseTrailerService.trailerList(vinSid,contractNo);
-	}
-
-	@Override
-	public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNo(String gcVinNo) {
-		return baseTrailerService.fetchByGcVinNo(gcVinNo);
-	}
-
-	@Override
-	public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) {
-		return baseTrailerService.fetchByGcVinNoAndVehSid(gcVinNo,vehSid);
-	}
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        baseTrailerService.delBySids(sids);
+        return rb.success();
+    }
+
+    @Override
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<BaseTrailerDetailsVo> fetchBySid(@PathVariable("sid") String sid) {
+        return baseTrailerService.fetchDetailsBySid(sid);
+    }
+
+    @Override
+    public ResultBean<List<BaseTrailer>> getByVehSid(String vehSid) {
+        return baseTrailerService.getByVehSid(vehSid);
+    }
+
+    @Override
+    public ResultBean<PagerVo<BaseTrailerSearchVo>> searchPage(PagerQuery<BaseTrailerSearchQuery> pagerQuery) {
+        ResultBean<PagerVo<BaseTrailerSearchVo>> rb = ResultBean.fireFail();
+        IPage<BaseTrailerSearchVo> page = baseTrailerService.searchPage(pagerQuery);
+        PagerVo<BaseTrailerSearchVo> pv = new PagerVo<>();
+        PagerVo<BaseTrailerSearchVo> pv1 = PagerUtil.pageToVo(page, pv);
+        return rb.success().setData(pv1);
+    }
+
+    @Override
+    public ResultBean trailerOut(String sid) {
+        return baseTrailerService.trailerOut(sid);
+    }
+
+    @Override
+    public ResultBean trailerOutNew(String sid) {
+        return baseTrailerService.trailerOutNew(sid);
+    }
+
+    @Override
+    public ResultBean<TraliveredVo> trailerList(String vinSid, String contractNo) {
+        return baseTrailerService.trailerList(vinSid, contractNo);
+    }
+
+    @Override
+    public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNo(String gcVinNo) {
+        return baseTrailerService.fetchByGcVinNo(gcVinNo);
+    }
+
+    @Override
+    public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) {
+        return baseTrailerService.fetchByGcVinNoAndVehSid(gcVinNo, vehSid);
+    }
+
+    @Override
+    public ResultBean<List<PayApplyTrailerVo>> payApply(String useOrgSid) {
+        return baseTrailerService.payApply(useOrgSid);
+    }
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
index 5f23dfc9f5..45e703515b 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
@@ -983,4 +983,10 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
     public List<BaseTrailerModelDetailsVo> fetchTypeAndMan(String vehSid) {
         return baseMapper.fetchTypeAndMan(vehSid);
     }
+
+    public ResultBean<List<PayApplyTrailerVo>> payApply(String useOrgSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<PayApplyTrailerVo> payApplyTrailerVoList = baseMapper.payApply(useOrgSid);
+        return rb.success().setData(payApplyTrailerVoList);
+    }
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java
index 7b0bb6816a..6992ecd5fd 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java
@@ -27,6 +27,8 @@ package com.yxt.anrui.fin.api.finpaymentapply;
 
 
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
@@ -78,6 +80,10 @@ public class FinPaymentapplyDto implements Dto {
     private List<FinPaymentapplyDetailDto> detailsList;
 
     private List<FinPaymentapplyVehicleDto> vehicleList;
+
+    private List<FinPaymentapplyTrailerDto> trailerList;
+    private List<FinPaymentapplyTopDto> topList;
+
     @ApiModelProperty("是否涉及车辆，1是，0否")
     @NotBlank(message = "请选择是否涉及车辆")
     private String isVeh;
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTop.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTop.java
new file mode 100644
index 0000000000..d472cc477f
--- /dev/null
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTop.java
@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplytop;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-fin(付款申请) <br/>
+ * File: FinPaymentapplyTop.java <br/>
+ * Class: com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTop <br/>
+ * Description: 付款申请上装. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-14 10:55:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款申请上装", description = "付款申请上装")
+@TableName("fin_paymentapply_top")
+public class FinPaymentapplyTop extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("付款申请sid")
+    private String applySid; // 付款申请sid
+    @ApiModelProperty("上装名称")
+    private String installNameValue; // 上装名称
+    @ApiModelProperty("货箱内部尺寸")
+    private String size; // 货箱内部尺寸
+    @ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("上装sid")
+    private String topSid; // 上装sid
+    @ApiModelProperty("箱体颜色")
+    private String color; // 箱体颜色
+    @ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice; // 厂家结算价
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("车型别名")
+    private String vehModel; // 车型别名
+    @ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    @ApiModelProperty("销售订单号")
+    private String saleOrderNo; // 销售订单号
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("销售类型")
+    private String payType; // 销售类型
+
+}
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopDetailsVo.java
new file mode 100644
index 0000000000..e28d88d47d
--- /dev/null
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopDetailsVo.java
@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplytop;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-fin(付款申请) <br/>
+ * File: FinPaymentapplyTopVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopVo <br/>
+ * Description: 付款申请上装 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-14 10:55:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款申请上装 视图数据详情", description = "付款申请上装 视图数据详情")
+public class FinPaymentapplyTopDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("付款申请sid")
+    private String applySid; // 付款申请sid
+	@ApiModelProperty("上装名称")
+    private String installNameValue; // 上装名称
+	@ApiModelProperty("货箱内部尺寸")
+    private String size; // 货箱内部尺寸
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("上装sid")
+    private String topSid; // 上装sid
+	@ApiModelProperty("箱体颜色")
+    private String color; // 箱体颜色
+	@ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice; // 厂家结算价
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("车型别名")
+    private String vehModel; // 车型别名
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("销售订单号")
+    private String saleOrderNo; // 销售订单号
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("销售类型")
+    private String payType; // 销售类型
+
+}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopDto.java
new file mode 100644
index 0000000000..4e1af5b6c6
--- /dev/null
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopDto.java
@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplytop;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-fin(付款申请) <br/>
+ * File: FinPaymentapplyTopDto.java <br/>
+ * Class: com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto <br/>
+ * Description: 付款申请上装 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-14 10:55:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款申请上装 数据传输对象", description = "付款申请上装 数据传输对象")
+public class FinPaymentapplyTopDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("付款申请sid")
+    private String applySid; // 付款申请sid
+	@ApiModelProperty("上装名称")
+    private String installNameValue; // 上装名称
+	@ApiModelProperty("货箱内部尺寸")
+    private String size; // 货箱内部尺寸
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("上装sid")
+    private String topSid; // 上装sid
+	@ApiModelProperty("箱体颜色")
+    private String color; // 箱体颜色
+	@ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice; // 厂家结算价
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("车型别名")
+    private String vehModel; // 车型别名
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("销售订单号")
+    private String saleOrderNo; // 销售订单号
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("销售类型")
+    private String payType; // 销售类型
+
+}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopFeign.java
new file mode 100644
index 0000000000..d9f3f493e1
--- /dev/null
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopFeign.java
@@ -0,0 +1,38 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplytop;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+@Api(tags = "付款申请上装")
+@FeignClient(
+        contextId = "anrui-fin-FinPaymentapplyTop",
+        name = "anrui-fin",
+        path = "v1/finpaymentapplytop")
+public interface FinPaymentapplyTopFeign {
+
+}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailer.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailer.java
new file mode 100644
index 0000000000..ad747ba2f5
--- /dev/null
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailer.java
@@ -0,0 +1,84 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplytrailer;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-fin(付款申请) <br/>
+ * File: FinPaymentapplyTrailer.java <br/>
+ * Class: com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailer <br/>
+ * Description: 付款申请挂车. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-14 10:55:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款申请挂车", description = "付款申请挂车")
+@TableName("fin_paymentapply_trailer")
+public class FinPaymentapplyTrailer extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("付款申请sid")
+    private String applySid; // 付款申请sid
+	@ApiModelProperty("挂车名称")
+    private String trailerTypeValue; // 挂车名称
+	@ApiModelProperty("外观尺寸")
+    private String size; // 外观尺寸
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("挂车sid")
+    private String trailerSid; // 挂车sid
+	@ApiModelProperty("箱体颜色")
+    private String color; // 箱体颜色
+	@ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice; // 厂家结算价
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("车型别名")
+    private String vehModel; // 车型别名
+	@ApiModelProperty("主车车架号")
+    private String zcVinNo; // 主车车架号
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("销售订单号")
+    private String saleOrderNo; // 销售订单号
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("销售类型")
+    private String payType; // 销售类型
+
+}
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerDetailsVo.java
new file mode 100644
index 0000000000..11af968f6f
--- /dev/null
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerDetailsVo.java
@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplytrailer;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-fin(付款申请) <br/>
+ * File: FinPaymentapplyTrailerVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerVo <br/>
+ * Description: 付款申请挂车 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-14 10:55:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款申请挂车 视图数据详情", description = "付款申请挂车 视图数据详情")
+public class FinPaymentapplyTrailerDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("付款申请sid")
+    private String applySid; // 付款申请sid
+	@ApiModelProperty("挂车名称")
+    private String trailerTypeValue; // 挂车名称
+	@ApiModelProperty("外观尺寸")
+    private String size; // 外观尺寸
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("挂车sid")
+    private String trailerSid; // 挂车sid
+	@ApiModelProperty("箱体颜色")
+    private String color; // 箱体颜色
+	@ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice; // 厂家结算价
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("车型别名")
+    private String vehModel; // 车型别名
+	@ApiModelProperty("主车车架号")
+    private String zcVinNo; // 主车车架号
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("销售订单号")
+    private String saleOrderNo; // 销售订单号
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("销售类型")
+    private String payType; // 销售类型
+
+}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerDto.java
new file mode 100644
index 0000000000..fa58d65f7a
--- /dev/null
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerDto.java
@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplytrailer;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-fin(付款申请) <br/>
+ * File: FinPaymentapplyTrailerDto.java <br/>
+ * Class: com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto <br/>
+ * Description: 付款申请挂车 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-14 10:55:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款申请挂车 数据传输对象", description = "付款申请挂车 数据传输对象")
+public class FinPaymentapplyTrailerDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("付款申请sid")
+    private String applySid; // 付款申请sid
+    @ApiModelProperty("挂车名称")
+    private String trailerTypeValue; // 挂车名称
+    @ApiModelProperty("外观尺寸")
+    private String size; // 外观尺寸
+    @ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("挂车sid")
+    private String trailerSid; // 挂车sid
+    @ApiModelProperty("箱体颜色")
+    private String color; // 箱体颜色
+    @ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice; // 厂家结算价
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("车型别名")
+    private String vehModel; // 车型别名
+    @ApiModelProperty("主车车架号")
+    private String zcVinNo; // 主车车架号
+    @ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    @ApiModelProperty("销售订单号")
+    private String saleOrderNo; // 销售订单号
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("销售类型")
+    private String payType; // 销售类型
+
+}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerFeign.java
new file mode 100644
index 0000000000..9a1b1fedb6
--- /dev/null
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerFeign.java
@@ -0,0 +1,38 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplytrailer;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+@Api(tags = "付款申请挂车")
+@FeignClient(
+        contextId = "anrui-fin-FinPaymentapplyTrailer",
+        name = "anrui-fin",
+        path = "v1/finpaymentapplytrailer")
+public interface FinPaymentapplyTrailerFeign {
+
+}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
index 6b88a8ad52..d788450300 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
@@ -48,6 +48,8 @@ import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
@@ -57,6 +59,8 @@ import com.yxt.anrui.fin.biz.fincompanyinvoicing.FinCompanyInvoicingService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService;
+import com.yxt.anrui.fin.biz.finpaymentapplytop.FinPaymentapplyTopService;
+import com.yxt.anrui.fin.biz.finpaymentapplytrailer.FinPaymentapplyTrailerService;
 import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleService;
 import com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordService;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -128,10 +132,9 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
     @Autowired
     private FinPaymentrecordService finPaymentrecordService;
     @Autowired
-    private SysStaffPostFeign sysStaffPostFeign;
+    private FinPaymentapplyTopService finPaymentapplyTopService;
     @Autowired
-    private SysParameterFeign sysParameterFeign;
-
+    private FinPaymentapplyTrailerService finPaymentapplyTrailerService;
     @Autowired
     private FinPaymentapplyDetailsService finPaymentapplyDetailsService;
     @Autowired
@@ -144,10 +147,6 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
     private FinCompanyInvoicingService finCompanyInvoicingService;
     @Autowired
     private MessageFeign messageFeign;
-    @Autowired
-    private ScmCollectionRebateFeign scmCollectionRebateFeign;
-    @Autowired
-    private BaseVehicleFeign baseVehicleFeign;
 
     public PagerVo<FinPaymentapplyVo> listPageVo(PagerQuery<FinPaymentapplyQuery> pq) {
         FinPaymentapplyQuery query = pq.getParams();
@@ -285,6 +284,22 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                 }
             }
 
+            if ("002".equals(dto.getCostTypeKey())){//挂车采购
+                List<FinPaymentapplyTrailerDto> trailerList = dto.getTrailerList();
+                for (FinPaymentapplyTrailerDto finPaymentapplyTrailerDto : trailerList) {
+                    finPaymentapplyTrailerDto.setApplySid(finPaymentapply.getSid());
+                    finPaymentapplyTrailerService.insertByDto(finPaymentapplyTrailerDto);
+                }
+            }
+
+            if ("003".equals(dto.getCostTypeKey())){//上装采购
+                List<FinPaymentapplyTopDto> topList = dto.getTopList();
+                for (FinPaymentapplyTopDto finPaymentapplyTopDto : topList) {
+                    finPaymentapplyTopDto.setApplySid(finPaymentapply.getSid());
+                    finPaymentapplyTopService.insertByDto(finPaymentapplyTopDto);
+                }
+            }
+
             baseMapper.insert(finPaymentapply);
             dtoSid = finPaymentapply.getSid();
         } else {
@@ -309,6 +324,26 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
             } else {
                 finPaymentapplyVehicleService.deleteVehicle(dtoSid);
             }
+
+            finPaymentapplyTrailerService.delByMainSid(dtoSid);
+            finPaymentapplyTopService.delByMainSid(dtoSid);
+
+            if ("002".equals(dto.getCostTypeKey())){//挂车采购
+                List<FinPaymentapplyTrailerDto> trailerList = dto.getTrailerList();
+                for (FinPaymentapplyTrailerDto finPaymentapplyTrailerDto : trailerList) {
+                    finPaymentapplyTrailerDto.setApplySid(dtoSid);
+                    finPaymentapplyTrailerService.insertByDto(finPaymentapplyTrailerDto);
+                }
+            }
+
+            if ("003".equals(dto.getCostTypeKey())){//上装采购
+                List<FinPaymentapplyTopDto> topList = dto.getTopList();
+                for (FinPaymentapplyTopDto finPaymentapplyTopDto : topList) {
+                    finPaymentapplyTopDto.setApplySid(dtoSid);
+                    finPaymentapplyTopService.insertByDto(finPaymentapplyTopDto);
+                }
+            }
+
             baseMapper.updateById(finPaymentapply);
         }
         return rb.success().setData(dtoSid);
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopMapper.java
new file mode 100644
index 0000000000..484897ca3c
--- /dev/null
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopMapper.java
@@ -0,0 +1,38 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finpaymentapplytop;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTop;
+
+@Mapper
+public interface FinPaymentapplyTopMapper extends BaseMapper<FinPaymentapplyTop> {
+
+	@Delete("delete from fin_paymentapply_top where applySid = #{dtoSid}")
+	void delByMainSid(String dtoSid);
+}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopMapper.xml
new file mode 100644
index 0000000000..7c5bc9797d
--- /dev/null
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopMapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.fin.biz.finpaymentapplytop.FinPaymentapplyTopMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+</mapper>
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopRest.java
new file mode 100644
index 0000000000..33c30cd172
--- /dev/null
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopRest.java
@@ -0,0 +1,38 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finpaymentapplytop;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopFeign;
+
+@Api(tags = "付款申请上装")
+@RestController
+@RequestMapping("v1/finpaymentapplytop")
+public class FinPaymentapplyTopRest implements FinPaymentapplyTopFeign {
+
+}
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopService.java
new file mode 100644
index 0000000000..aed39eae74
--- /dev/null
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopService.java
@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finpaymentapplytop;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTop;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Project: anrui-fin(付款申请) <br/>
+ * File: FinPaymentapplyTopService.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finpaymentapplytop.FinPaymentapplyTopService <br/>
+ * Description: 付款申请上装 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-14 10:55:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class FinPaymentapplyTopService extends MybatisBaseService<FinPaymentapplyTopMapper, FinPaymentapplyTop> {
+	
+	public void insertByDto(FinPaymentapplyTopDto dto){
+		FinPaymentapplyTop entity = new FinPaymentapplyTop();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+
+	public void delByMainSid(String dtoSid) {
+		baseMapper.delByMainSid(dtoSid);
+	}
+}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerMapper.java
new file mode 100644
index 0000000000..8e457ee1c5
--- /dev/null
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerMapper.java
@@ -0,0 +1,38 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finpaymentapplytrailer;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailer;
+
+@Mapper
+public interface FinPaymentapplyTrailerMapper extends BaseMapper<FinPaymentapplyTrailer> {
+
+	@Delete("delete from fin_paymentapply_trailer where applySid = #{dtoSid}")
+	void delByMainSid(String dtoSid);
+}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerMapper.xml
new file mode 100644
index 0000000000..557cfea410
--- /dev/null
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerMapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.fin.biz.finpaymentapplytrailer.FinPaymentapplyTrailerMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+</mapper>
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerRest.java
new file mode 100644
index 0000000000..775cde4c32
--- /dev/null
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerRest.java
@@ -0,0 +1,38 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finpaymentapplytrailer;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerFeign;
+
+@Api(tags = "付款申请挂车")
+@RestController
+@RequestMapping("v1/finpaymentapplytrailer")
+public class FinPaymentapplyTrailerRest implements FinPaymentapplyTrailerFeign {
+
+}
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerService.java
new file mode 100644
index 0000000000..ffb5560be1
--- /dev/null
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerService.java
@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finpaymentapplytrailer;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailer;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Project: anrui-fin(付款申请) <br/>
+ * File: FinPaymentapplyTrailerService.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finpaymentapplytrailer.FinPaymentapplyTrailerService <br/>
+ * Description: 付款申请挂车 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-14 10:55:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class FinPaymentapplyTrailerService extends MybatisBaseService<FinPaymentapplyTrailerMapper, FinPaymentapplyTrailer> {
+	
+	public void insertByDto(FinPaymentapplyTrailerDto dto){
+		FinPaymentapplyTrailer entity = new FinPaymentapplyTrailer();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+
+	public void delByMainSid(String dtoSid) {
+		baseMapper.delByMainSid(dtoSid);
+	}
+}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java
index 1c3fd77063..dab39047a3 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java
@@ -522,7 +522,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
         List<LoanBeCollectionVehDto> loanBeCollectionVehDetails = dto.getLoanBeCollectionVehDetails();
         if (collMeasures.contains("远程控制")) {
             for (LoanBeCollectionVehDto loanBeCollectionVehDetail : loanBeCollectionVehDetails) {
-                int i = loanBeCollectionVehService.selKzStateBySaleVehSid(loanBeCollectionVehDetail.getSaleVehSid());
+                int i = loanBeCollectionVehService.selKzStateBySaleVehSid(loanBeCollectionVehDetail.getSaleVehSid(),dto.getSid());
                 if (i > 0) {
                     return rb.setMsg("车架号" + loanBeCollectionVehDetail.getVinNo() + "已存在审批中(待控制/控制成功)，不可再次勾选远程控制措施。");
                 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java
index 89ea0dc890..cc6a5b2841 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java
@@ -73,7 +73,7 @@ public interface LoanBeCollectionVehMapper extends BaseMapper<LoanBeCollectionVe
 
     int selBjBySaleVehSid(String saleVehSid);
 
-	int selKzStateBySaleVehSid(String saleVehSid);
+	int selKzStateBySaleVehSid(@Param("saleVehSid") String saleVehSid,@Param("mainSid") String mainSid);
 
 	String selSidBySaleVehSidAndLockState(@Param("saleVehSid") String saleVehSid,@Param("c") String c);
 
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.xml
index 5b62105538..2c2e5831ed 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.xml
@@ -21,17 +21,18 @@
         SELECT COUNT(*)
         FROM loan_be_collection_veh lv
                      LEFT JOIN loan_be_collection_apply la
-                ON lv.`mainSid` = la.`sid`
-        WHERE lv.`saleVehSid` = #{saleVehSid}
-          AND la.`nodeState` = '已办结'
-          AND la.`collMeasure` LIKE CONCAT('%远程控制%')
+                ON lv.mainSid = la.sid
+        WHERE lv.saleVehSid = #{saleVehSid}
+          AND la.nodeState = '已办结'
+          AND la.collMeasure LIKE CONCAT('%远程控制%')
     </select>
 
     <select id="selKzStateBySaleVehSid" resultType="int">
         SELECT COUNT(*)
         FROM loan_be_collection_veh lv
-        WHERE lv.`saleVehSid` = #{saleVehSid}
-          AND (lv.lockCarState = '' OR lv.lockCarState IS NULL OR lv.lockCarState = '0' OR lv.lockCarState = '1')
+        WHERE lv.saleVehSid = #{saleVehSid}
+          AND (lv.lockCarState = '0' OR lv.lockCarState = '1')
+          AND lv.mainSid != #{mainSid}
     </select>
 
     <select id="selSidBySaleVehSidAndLockState" resultType="java.lang.String">
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java
index e212d6a6bf..c1eee31171 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java
@@ -259,8 +259,8 @@ public class LoanBeCollectionVehService extends MybatisBaseService<LoanBeCollect
         return baseMapper.selBjBySaleVehSid(saleVehSid);
     }
 
-    public int selKzStateBySaleVehSid(String saleVehSid) {
-        return baseMapper.selKzStateBySaleVehSid(saleVehSid);
+    public int selKzStateBySaleVehSid(String saleVehSid,String mainSid) {
+        return baseMapper.selKzStateBySaleVehSid(saleVehSid,mainSid);
     }
 
     public String selSidBySaleVehSidAndLockState(String saleVehSid, String c) {

From 2b62ac372e0387749387f9175d3621ae6ae19554 Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Tue, 14 Jan 2025 14:10:59 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=88=A9?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AF=BC=E5=85=A5=E8=AE=A1=E7=AE=97=E9=A2=84?=
 =?UTF-8?q?=E8=AE=A1=E8=BF=94=E5=88=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/scmvehrebate/ScmVehRebateService.java  | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
index ea04881781..41b072de7c 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
@@ -670,8 +670,22 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                     BigDecimal rule = new BigDecimal(info.getCalculationStandard());
                     if (calculationModeValue.equals("比例")) {
                         scmVehRebate.setCalculationModeKey("001");
-                        BigDecimal costPrice = new BigDecimal(baseVehicleRebateVo.getCostPrice());
-                        BigDecimal m = rule.multiply(costPrice).divide(new BigDecimal("100"));
+                        BigDecimal costPrice = new BigDecimal(baseVehicleRebateVo.getCostPrice());// 入库价
+                        BigDecimal freight = BigDecimal.ZERO; //运费
+                        BigDecimal topAmount = BigDecimal.ZERO; //上装金额
+                        BigDecimal money = BigDecimal.ZERO; //基数
+                        if (StringUtils.isNotBlank(baseVehicleRebateVo.getFreight())) {
+                            freight = new BigDecimal(baseVehicleRebateVo.getFreight());
+                        }
+                        if (StringUtils.isNotBlank(baseVehicleRebateVo.getTopAmount())) {
+                            topAmount = new BigDecimal(baseVehicleRebateVo.getTopAmount());
+                        }
+                        if (topAmount.compareTo(BigDecimal.ZERO) > 0 && baseVehicleRebateVo.getBrandName().contains("陕汽")) {
+                            money = costPrice.subtract(freight).subtract(topAmount);
+                        } else {
+                            money = costPrice.subtract(freight);
+                        }
+                        BigDecimal m = rule.multiply(money).divide(new BigDecimal("100"));
                         scmVehRebate.setEstimateRebate(m.toString());
                     } else {
                         scmVehRebate.setCalculationModeKey("002");