移动端二次销售审批部分接口

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyFeign.java

@@ -12,10 +12,7 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -80,5 +77,9 @@ public interface LoanSecondarySalesApplyFeign {
     @PostMapping(value = "/delegate")
     public ResultBean delegate(@RequestBody LoanSecondarySalesApplyDelegateQuery query);
 
+    @ApiOperation(value = "移动端详情")
+    @PostMapping(value = "/getAppDetails")
+    ResultBean<SecondarySalesAppVo> getAppDetails(@RequestParam("sid") String sid);
+
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesCostAppVo.java

@@ -0,0 +1,74 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalesapply;
+
+import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/29
+ **/
+@Data
+public class LoanSecondarySalesCostAppVo {
+
+    @ApiModelProperty("欠款合计")
+    private String arrearsAll;
+    @ApiModelProperty("贷款保证金")
+    private String loanDeposit;
+    @ApiModelProperty("车辆售价")
+    private String vehPrice;
+    @ApiModelProperty("催收费用")
+    private String collectionCost;
+    @ApiModelProperty("资方结清费用")
+    private String bankSettleCost;
+    @ApiModelProperty("资方结清费用承担方")
+    private String bankSettleCostAssume;
+    private String bankSettleCostAssumeKey;
+    @ApiModelProperty("车辆违章费用")
+    private String vehicleViolationCost;
+    @ApiModelProperty("车辆违章费用承担方")
+    private String vehicleViolationCostAssume;
+    private String vehicleViolationCostAssumeKey;
+    @ApiModelProperty("年检费")
+    private String inspectYearCost;
+    @ApiModelProperty("年检费承担方")
+    private String inspectYearCostAssume;
+    private String inspectYearCostAssumeKey;
+    @ApiModelProperty("保险费")
+    private String insureCost;
+    @ApiModelProperty("保险费承担方")
+    private String insureCostAssume;
+    private String insureCostAssumeKey;
+    @ApiModelProperty("过户费")
+    private String ownershipCost;
+    @ApiModelProperty("过户费承担方")
+    private String ownershipCostAssume;
+    private String ownershipCostAssumeKey;
+    @ApiModelProperty("停车费")
+    private String stopCost;
+    @ApiModelProperty("停车费承担方")
+    private String stopCostAssume;
+    private String stopCostAssumeKey;
+    @ApiModelProperty("其他费用")
+    private String otherCost;
+    @ApiModelProperty("其他费用承担方")
+    private String otherCostAssume;
+    private String otherCostAssumeKey;
+    @ApiModelProperty("费用说明")
+    private String costDescription;
+    @ApiModelProperty("预计亏损金额")
+    private String lossPrice;
+    @ApiModelProperty("后续欠款处置方向")
+    private String debtDisposal;
+    @ApiModelProperty("附件")
+    private List<String> files = new ArrayList<>();
+
+    @ApiModelProperty("车辆评估")
+    private String vehicleEvaluation;
+
+    private String filesss;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesVehAppVo.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalesapply;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/29
+ **/
+@Data
+public class LoanSecondarySalesVehAppVo {
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("车辆类型")
+    private String vehType;
+    @ApiModelProperty("车型")
+    private String modelName;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/SecondarySalesAppVo.java

@@ -0,0 +1,88 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalesapply;
+
+import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCostVo;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/29
+ **/
+@Data
+public class SecondarySalesAppVo {
+
+    @ApiModelProperty("申请部门")
+    private String createDept;
+    @ApiModelProperty("申请人")
+    private String createByName;
+
+    @ApiModelProperty("申请日期")
+    private String createDate;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
+    @ApiModelProperty("停放地点")
+    private String locationName;
+    @ApiModelProperty("是否年检")
+    private String inspect;
+    @ApiModelProperty("年检情况")
+    private String inspectSituation;
+    @ApiModelProperty("是否已出保")
+    private String guaranteed;
+    @ApiModelProperty("保险情况")
+    private String insuranceSituation;
+    @ApiModelProperty("首次登记日期")
+    private String firstDate;
+    @ApiModelProperty("当前行驶公里数")
+    private String kilometerDriven;
+    @ApiModelProperty("其他车况说明")
+    private String illustrate;
+    @ApiModelProperty("车辆照片")
+    private List<String> filesList = new ArrayList<>();
+    @ApiModelProperty("已还金额")
+    private String alRepaidMoney;
+    @ApiModelProperty("当前逾期金额")
+    private String currentBeMoney;
+    @ApiModelProperty("其中资金占用费")
+    private String wheFundOccMoney;
+    @ApiModelProperty("未到期金额")
+    private String unexpiredMoney;
+    @ApiModelProperty("总期数")
+    private String nper;
+    @ApiModelProperty("当前期数")
+    private String currentPeriod;
+    @ApiModelProperty("已还金额换算期数")
+    private String alRepaidMoneyConPeriod;
+    @ApiModelProperty("逾期金额换算期数")
+    private String beOverdueMoneyAndPeriod;
+    @ApiModelProperty("车辆列表")
+    private List<LoanSecondarySalesVehAppVo> loanSecondarySalesVehVoList = new ArrayList<>();
+    @ApiModelProperty("费用明细")
+    private LoanSecondarySalesCostAppVo loanSecondarySalesCost;
+
+    @ApiModelProperty("申请人sid")
+    private String userSid;
+    private String orgPath;
+    @ApiModelProperty(value = "任务id")
+    private String taskId;
+    @ApiModelProperty(value = "流程实例id")
+    private String procInstId;
+
+    private String files;
+
+    @ApiModelProperty("销售订单sid")
+    private String salesOrderSid;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCostVo.java

@@ -71,4 +71,6 @@ public class LoanSecondarySalesCostVo {
     @ApiModelProperty("车辆评估")
     private String vehicleEvaluation;
 
+    private String filesss;
+
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApply;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApplyDetailsVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApplyVo;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.SecondarySalesAppVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -26,4 +27,6 @@ public interface LoanSecondarySalesApplyMapper extends BaseMapper<LoanSecondaryS
     int selectBySid(String join);
 
     LoanSecondarySalesApplyDetailsVo selectDetails(String sid);
+
+    SecondarySalesAppVo getAppDetails(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.xml

@@ -83,7 +83,41 @@
                la.nper,
                la.currentPeriod,
                la.alRepaidMoneyConPeriod,
-               la.beOverdueMoneyAndPeriod,la.loanSid,la.customerSid,la.salesOrderSid
+               la.beOverdueMoneyAndPeriod,
+               la.loanSid,
+               la.customerSid,
+               la.salesOrderSid
+        from loan_secondary_sales_apply la
+        where sid = #{sid}
+    </select>
+
+    <select id="getAppDetails" resultType="com.yxt.anrui.riskcenter.api.loansecondarysalesapply.SecondarySalesAppVo">
+        select la.createDept,
+               la.createByName,
+               DATE_FORMAT(la.createTime, '%Y-%m-%d') as createDate,
+               la.customerName,
+               la.loanName,
+               la.loanContractNo,
+               la.bankName,
+               la.bankContractNo,
+               la.locationName,
+               la.inspect,
+               la.inspectSituation,
+               la.guaranteed,
+               la.insuranceSituation,
+               la.firstDate,
+               la.kilometerDriven,
+               la.illustrate,
+               la.files,
+               la.alRepaidMoney,
+               la.currentBeMoney,
+               la.wheFundOccMoney,
+               la.unexpiredMoney,
+               la.nper,
+               la.currentPeriod,
+               la.alRepaidMoneyConPeriod,
+               la.beOverdueMoneyAndPeriod,
+               la.salesOrderSid
         from loan_secondary_sales_apply la
         where sid = #{sid}
     </select>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyRest.java

@@ -60,7 +60,7 @@ public class LoanSecondarySalesApplyRest implements LoanSecondarySalesApplyFeign
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
         bv.setModelId("");
-        return loanSecondarySalesApplyService.complete(bv,query.getVehicleEvaluation());
+        return loanSecondarySalesApplyService.complete(bv, query.getVehicleEvaluation());
     }
 
     @Override
@@ -92,4 +92,9 @@ public class LoanSecondarySalesApplyRest implements LoanSecondarySalesApplyFeign
     public ResultBean delegate(LoanSecondarySalesApplyDelegateQuery query) {
         return loanSecondarySalesApplyService.delegate(query);
     }
+
+    @Override
+    public ResultBean<SecondarySalesAppVo> getAppDetails(String sid) {
+        return loanSecondarySalesApplyService.getAppDetails(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java

@@ -892,8 +892,53 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
                 loanSecondarySalesApplyDetailsVo.setLoanSecondarySalesVehVoList(loanSecondarySalesVehVoList);
             }
             LoanSecondarySalesCostVo loanSecondarySalesCost = loanSecondarySalesCostService.selectByMainSid(sid);
+            if (loanSecondarySalesCost != null) {
+                String filesss = loanSecondarySalesCost.getFilesss();
+                List<UrlQuery> lists = new ArrayList<>();
+                if (StringUtils.isNotBlank(filesss)) {
+                    List<String> fileList = Arrays.asList(filesss.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
+                    for (int i = 0; i < fileList.size(); i++) {
+                        UrlQuery urlQuery = new UrlQuery();
+                        urlQuery.setUrl(fileList.get(i));
+                        lists.add(urlQuery);
+                    }
+                    loanSecondarySalesCost.setFiles(lists);
+                }
+            }
             loanSecondarySalesApplyDetailsVo.setLoanSecondarySalesCost(loanSecondarySalesCost);
         }
         return rb.success().setData(loanSecondarySalesApplyDetailsVo);
     }
+
+    public ResultBean<SecondarySalesAppVo> getAppDetails(String sid) {
+        ResultBean<SecondarySalesAppVo> rb = ResultBean.fireFail();
+        LoanSecondarySalesApply loanSecondarySalesApply = fetchBySid(sid);
+        if (loanSecondarySalesApply == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        SecondarySalesAppVo secondarySalesAppVo = baseMapper.getAppDetails(sid);
+        if (StringUtils.isNotBlank(secondarySalesAppVo.getFiles())) {
+            List<String> fileList = Arrays.asList(secondarySalesAppVo.getFiles().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
+            secondarySalesAppVo.setFilesList(fileList);
+        }
+        secondarySalesAppVo.setOrgPath(loanSecondarySalesApply.getOrgSidPath());
+        secondarySalesAppVo.setUserSid(loanSecondarySalesApply.getCreateBySid());
+        secondarySalesAppVo.setProcInstId(loanSecondarySalesApply.getProcInstId());
+        secondarySalesAppVo.setTaskId(loanSecondarySalesApply.getTaskId());
+        List<LoanSecondarySalesVehAppVo> loanSecondarySalesVehVoList = loanSecondarySalesVehService.selectByMainSidApp(sid);
+        loanSecondarySalesVehVoList.removeAll(Collections.singleton(null));
+        if (!loanSecondarySalesVehVoList.isEmpty()) {
+            secondarySalesAppVo.setLoanSecondarySalesVehVoList(loanSecondarySalesVehVoList);
+        }
+        LoanSecondarySalesCostAppVo loanSecondarySalesCost = loanSecondarySalesCostService.selectByMainSidApp(sid);
+        if (loanSecondarySalesCost != null) {
+            String filesss = loanSecondarySalesCost.getFilesss();
+            if (StringUtils.isNotBlank(filesss)) {
+                List<String> fileList = Arrays.asList(filesss.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
+                loanSecondarySalesCost.setFiles(fileList);
+            }
+        }
+        secondarySalesAppVo.setLoanSecondarySalesCost(loanSecondarySalesCost);
+        return rb.success().setData(secondarySalesAppVo);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostMapper.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.riskcenter.biz.loansecondarysalescost;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesCostAppVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCost;
 import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCostVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -16,4 +17,6 @@ public interface LoanSecondarySalesCostMapper extends BaseMapper<LoanSecondarySa
 
     LoanSecondarySalesCostVo selectByMainSid(String sid);
     LoanSecondarySalesCost selectMainSid(String sid);
+
+    LoanSecondarySalesCostAppVo selectByMainSidApp(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostMapper.xml

@@ -9,7 +9,7 @@
 
     <select id="selectByMainSid"
             resultType="com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCostVo">
-        SELECT *
+        SELECT *,files filesss
         FROM loan_secondary_sales_cost
         where mainSid = #{sid}
     </select>
@@ -19,4 +19,11 @@
         from loan_secondary_sales_cost
         where mainSid = #{sid}
     </select>
+
+    <select id="selectByMainSidApp"
+            resultType="com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesCostAppVo">
+        select *,files filesss
+        from loan_secondary_sales_cost
+        where mainSid = #{sid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostService.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.biz.loansecondarysalescost;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesCostAppVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCost;
 import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCostVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -53,4 +54,8 @@ public class LoanSecondarySalesCostService extends MybatisBaseService<LoanSecond
 
         baseMapper.insert(loanSecondarySalesCost1);
     }
+
+    public LoanSecondarySalesCostAppVo selectByMainSidApp(String sid) {
+        return baseMapper.selectByMainSidApp(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesveh/LoanSecondarySalesVehMapper.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.riskcenter.biz.loansecondarysalesveh;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesVehAppVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVeh;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -17,4 +18,6 @@ public interface LoanSecondarySalesVehMapper extends BaseMapper<LoanSecondarySal
     int deleteByMainSid(String s);
 
     List<LoanSecondarySalesVehVo> selectByMainSid(String sid);
+
+    List<LoanSecondarySalesVehAppVo> selectByMainSidApp(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesveh/LoanSecondarySalesVehMapper.xml

@@ -19,4 +19,14 @@
         from loan_secondary_sales_veh lv
         where mainSid = #{sid}
     </select>
+
+    <select id="selectByMainSidApp"
+            resultType="com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesVehAppVo">
+        select lv.vinNo,
+               lv.vehMark,
+               lv.vehType,
+               lv.modelName
+        from loan_secondary_sales_veh lv
+        where mainSid = #{sid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesveh/LoanSecondarySalesVehService.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.riskcenter.biz.loansecondarysalesveh;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesVehAppVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVeh;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -35,4 +36,8 @@ public class LoanSecondarySalesVehService extends MybatisBaseService<LoanSeconda
             baseMapper.insert(loanSecondarySalesVeh);
         }
     }
+
+    public List<LoanSecondarySalesVehAppVo> selectByMainSidApp(String sid) {
+        return baseMapper.selectByMainSidApp(sid);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesAppVo.java

@@ -1,12 +0,0 @@
-package com.yxt.anrui.terminal.api.risk.secondarysales;
-
-import lombok.Data;
-
-/**
- * @description:
- * @author: dimengzhe
- * @date: 2024/1/29
- **/
-@Data
-public class SecondarySalesAppVo {
-}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesAppVos.java

@@ -0,0 +1,97 @@
+package com.yxt.anrui.terminal.api.risk.secondarysales;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/29
+ **/
+@Data
+public class SecondarySalesAppVos {
+    private String publishInfo;
+    @ApiModelProperty("申请部门")
+    @JsonIgnore
+    private String createDept;
+    @ApiModelProperty("申请人")
+    @JsonIgnore
+    private String createByName;
+
+    @ApiModelProperty("申请日期")
+    private String createDate;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
+    @ApiModelProperty("停放地点")
+    private String locationName;
+    @ApiModelProperty("是否年检")
+    private String inspect;
+    @ApiModelProperty("年检情况")
+    private String inspectSituation;
+    @ApiModelProperty("是否已出保")
+    private String guaranteed;
+    @ApiModelProperty("保险情况")
+    private String insuranceSituation;
+    @ApiModelProperty("首次登记日期")
+    private String firstDate;
+    @ApiModelProperty("当前行驶公里数")
+    private String kilometerDriven;
+    @ApiModelProperty("其他车况说明")
+    private String illustrate;
+    @ApiModelProperty("车辆照片")
+    private List<String> filesList = new ArrayList<>();
+    @ApiModelProperty("已还金额")
+    private String alRepaidMoney;
+    @ApiModelProperty("当前逾期金额")
+    @JsonIgnore
+    private String currentBeMoney;
+    @ApiModelProperty("其中资金占用费")
+    @JsonIgnore
+    private String wheFundOccMoney;
+    @ApiModelProperty("未到期金额")
+    private String unexpiredMoney;
+    @ApiModelProperty("总期数")
+    @JsonIgnore
+    private String nper;
+    @ApiModelProperty("当前期数")
+    @JsonIgnore
+    private String currentPeriod;
+    @ApiModelProperty("已还金额换算期数")
+    private String alRepaidMoneyConPeriod;
+    @ApiModelProperty("逾期金额换算期数")
+    private String beOverdueMoneyAndPeriod;
+    @ApiModelProperty("当前逾期金额/其中资金占用费")
+    private String yqzjzyMoney;
+    @ApiModelProperty("总期数/当前期数")
+    private String qsCount;
+    @ApiModelProperty("车辆列表")
+    private List<SecondarySalesVehAppVo> loanSecondarySalesVehVoList = new ArrayList<>();
+    @ApiModelProperty("费用明细")
+    private SecondarySalesCostAppVo loanSecondarySalesCost;
+
+    @ApiModelProperty("申请人sid")
+    private String userSid;
+    private String orgPath;
+    @ApiModelProperty(value = "任务id")
+    private String taskId;
+    @ApiModelProperty(value = "流程实例id")
+    private String procInstId;
+
+    private String files;
+
+    @ApiModelProperty("销售订单sid")
+    private String salesOrderSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesCostAppVo.java

@@ -0,0 +1,100 @@
+package com.yxt.anrui.terminal.api.risk.secondarysales;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/29
+ **/
+@Data
+public class SecondarySalesCostAppVo {
+
+    @ApiModelProperty("欠款合计")
+    private String arrearsAll;
+    @ApiModelProperty("贷款保证金")
+    private String loanDeposit;
+    @ApiModelProperty("车辆售价")
+    private String vehPrice;
+    @ApiModelProperty("催收费用")
+    private String collectionCost;
+    @ApiModelProperty("资方结清费用")
+    @JsonIgnore
+    private String bankSettleCost;
+    @ApiModelProperty("资方结清费用承担方")
+    @JsonIgnore
+    private String bankSettleCostAssume;
+    @JsonIgnore
+    private String bankSettleCostAssumeKey;
+    private String bankSettleCostAssumeDetails;
+    @ApiModelProperty("车辆违章费用")
+    @JsonIgnore
+    private String vehicleViolationCost;
+    @ApiModelProperty("车辆违章费用承担方")
+    @JsonIgnore
+    private String vehicleViolationCostAssume;
+    @JsonIgnore
+    private String vehicleViolationCostAssumeKey;
+    private String vehicleViolationCostAssumeDetails;
+    @ApiModelProperty("年检费")
+    @JsonIgnore
+    private String inspectYearCost;
+    @ApiModelProperty("年检费承担方")
+    @JsonIgnore
+    private String inspectYearCostAssume;
+    @JsonIgnore
+    private String inspectYearCostAssumeKey;
+    private String inspectYearCostAssumeDetails;
+    @ApiModelProperty("保险费")
+    @JsonIgnore
+    private String insureCost;
+    @ApiModelProperty("保险费承担方")
+    @JsonIgnore
+    private String insureCostAssume;
+    @JsonIgnore
+    private String insureCostAssumeKey;
+    private String insureCostAssumeDetails;
+    @ApiModelProperty("过户费")
+    @JsonIgnore
+    private String ownershipCost;
+    @ApiModelProperty("过户费承担方")
+    @JsonIgnore
+    private String ownershipCostAssume;
+    @JsonIgnore
+    private String ownershipCostAssumeKey;
+    private String ownershipCostAssumeDetails;
+    @ApiModelProperty("停车费")
+    @JsonIgnore
+    private String stopCost;
+    @ApiModelProperty("停车费承担方")
+    @JsonIgnore
+    private String stopCostAssume;
+    @JsonIgnore
+    private String stopCostAssumeKey;
+    private String stopCostAssumeDetails;
+    @ApiModelProperty("其他费用")
+    @JsonIgnore
+    private String otherCost;
+    @ApiModelProperty("其他费用承担方")
+    @JsonIgnore
+    private String otherCostAssume;
+    @JsonIgnore
+    private String otherCostAssumeKey;
+    private String otherCostAssumeDetails;
+    @ApiModelProperty("费用说明")
+    private String costDescription;
+    @ApiModelProperty("预计亏损金额")
+    private String lossPrice;
+    @ApiModelProperty("后续欠款处置方向")
+    private String debtDisposal;
+    @ApiModelProperty("附件")
+    private List<String> files = new ArrayList<>();
+
+    @ApiModelProperty("车辆评估")
+    private String vehicleEvaluation;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesFeign.java

@@ -50,7 +50,7 @@ public interface SecondarySalesFeign {
     @ApiOperation("详情")
     @GetMapping("/getSecondarySales/{sid}")
     @ResponseBody
-    ResultBean<SecondarySalesAppVo> getSecondarySales(@PathVariable("sid") String sid);
+    ResultBean<SecondarySalesAppVos> getSecondarySales(@PathVariable("sid") String sid);
 
     @ApiOperation(value = "加签")
     @PutMapping(value = "/delegate")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesVehAppVo.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.terminal.api.risk.secondarysales;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/29
+ **/
+@Data
+public class SecondarySalesVehAppVo {
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("车辆类型")
+    private String vehType;
+    @ApiModelProperty("车型")
+    private String modelName;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/flowable/SecondarySalesDto.java

@@ -32,4 +32,7 @@ public class SecondarySalesDto {
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")
     private String taskDefKey;
+
+    @ApiModelProperty("车辆评估价格")
+    private String vehicleEvaluation;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesRest.java

@@ -1,6 +1,6 @@
 package com.yxt.anrui.terminal.biz.risk.secondarysales;
 
-import com.yxt.anrui.terminal.api.risk.secondarysales.SecondarySalesAppVo;
+import com.yxt.anrui.terminal.api.risk.secondarysales.SecondarySalesAppVos;
 import com.yxt.anrui.terminal.api.risk.secondarysales.SecondarySalesFeign;
 import com.yxt.anrui.terminal.api.risk.secondarysales.flowable.SecondarySalesDelegateQuery;
 import com.yxt.anrui.terminal.api.risk.secondarysales.flowable.SecondarySalesDto;
@@ -51,7 +51,7 @@ public class SecondarySalesRest implements SecondarySalesFeign {
     }
 
     @Override
-    public ResultBean<SecondarySalesAppVo> getSecondarySales(String sid) {
+    public ResultBean<SecondarySalesAppVos> getSecondarySales(String sid) {
         return secondarySalesService.getSecondarySales(sid);
     }
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java

@@ -1,19 +1,29 @@
 package com.yxt.anrui.terminal.biz.risk.secondarysales;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
+import com.yxt.anrui.riskcenter.api.loanreturninboundapply.ReturnAppVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApplyFeign;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.SecondarySalesAppVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.flowable.*;
-import com.yxt.anrui.terminal.api.risk.secondarysales.SecondarySalesAppVo;
+import com.yxt.anrui.terminal.api.risk.returninbound.ReturnInboundAppVo;
+import com.yxt.anrui.terminal.api.risk.secondarysales.SecondarySalesAppVos;
+import com.yxt.anrui.terminal.api.risk.secondarysales.SecondarySalesCostAppVo;
 import com.yxt.anrui.terminal.api.risk.secondarysales.flowable.SecondarySalesDelegateQuery;
 import com.yxt.anrui.terminal.api.risk.secondarysales.flowable.SecondarySalesDto;
 import com.yxt.anrui.terminal.api.risk.secondarysales.flowable.SecondarySalesQuery;
 import com.yxt.anrui.terminal.api.risk.secondarysales.flowable.SecondarySalesTaskQuery;
+import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyCarPageVo;
 import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description:
@@ -99,8 +109,88 @@ public class SecondarySalesService {
         return rb.success().setData(data);
     }
 
-    public ResultBean<SecondarySalesAppVo> getSecondarySales(String sid) {
-        return null;
+    public ResultBean<SecondarySalesAppVos> getSecondarySales(String sid) {
+        ResultBean<SecondarySalesAppVos> rb = ResultBean.fireFail();
+        ResultBean<SecondarySalesAppVo> resultBean = loanSecondarySalesApplyFeign.getAppDetails(sid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        SecondarySalesAppVos secondarySalesAppVos = new SecondarySalesAppVos();
+        BeanUtil.copyProperties(resultBean.getData(), secondarySalesAppVos);
+        secondarySalesAppVos.setPublishInfo(secondarySalesAppVos.getCreateDept() + "-" + secondarySalesAppVos.getCreateByName());
+        if (StringUtils.isNotBlank(secondarySalesAppVos.getNper()) && StringUtils.isNotBlank(secondarySalesAppVos.getCurrentPeriod())) {
+            secondarySalesAppVos.setQsCount(secondarySalesAppVos.getNper() + "/" + secondarySalesAppVos.getCurrentPeriod());
+        }
+        if (StringUtils.isNotBlank(secondarySalesAppVos.getCurrentBeMoney()) && StringUtils.isNotBlank(secondarySalesAppVos.getWheFundOccMoney())) {
+            secondarySalesAppVos.setYqzjzyMoney(secondarySalesAppVos.getCurrentBeMoney() + "/" + secondarySalesAppVos.getWheFundOccMoney());
+        }
+        SecondarySalesCostAppVo secondarySalesCostAppVo = secondarySalesAppVos.getLoanSecondarySalesCost();
+        if (secondarySalesCostAppVo != null) {
+            String bankSettleCostAssumeDetails = "";
+            if (StringUtils.isNotBlank(secondarySalesCostAppVo.getBankSettleCost())) {
+                bankSettleCostAssumeDetails = bankSettleCostAssumeDetails + secondarySalesCostAppVo.getBankSettleCost() + "/";
+            }
+            if (StringUtils.isNotBlank(secondarySalesCostAppVo.getBankSettleCostAssume())) {
+                bankSettleCostAssumeDetails = bankSettleCostAssumeDetails + secondarySalesCostAppVo.getBankSettleCostAssume() + "承担";
+            }
+            secondarySalesCostAppVo.setBankSettleCostAssumeDetails(bankSettleCostAssumeDetails);
+            //车辆违章
+            String vehicleViolationCostAssumeDetails = "";
+            if (StringUtils.isNotBlank(secondarySalesCostAppVo.getVehicleViolationCost())) {
+                vehicleViolationCostAssumeDetails = vehicleViolationCostAssumeDetails + secondarySalesCostAppVo.getVehicleViolationCost() + "/";
+            }
+            if (StringUtils.isNotBlank(secondarySalesCostAppVo.getVehicleViolationCostAssume())) {
+                vehicleViolationCostAssumeDetails = vehicleViolationCostAssumeDetails + secondarySalesCostAppVo.getVehicleViolationCostAssume() + "承担";
+            }
+            secondarySalesCostAppVo.setVehicleViolationCostAssumeDetails(vehicleViolationCostAssumeDetails);
+            //年检费
+            String inspectYearCostAssumeDetails = "";
+            if (StringUtils.isNotBlank(secondarySalesCostAppVo.getInspectYearCost())) {
+                inspectYearCostAssumeDetails = inspectYearCostAssumeDetails + secondarySalesCostAppVo.getInspectYearCost() + "/";
+            }
+            if (StringUtils.isNotBlank(secondarySalesCostAppVo.getInspectYearCostAssume())) {
+                inspectYearCostAssumeDetails = inspectYearCostAssumeDetails + secondarySalesCostAppVo.getInspectYearCostAssume() + "承担";
+            }
+            secondarySalesCostAppVo.setInspectYearCostAssumeDetails(inspectYearCostAssumeDetails);
+            //保险费
+            String insureCostAssumeDetails = "";
+            if (StringUtils.isNotBlank(secondarySalesCostAppVo.getInsureCost())) {
+                insureCostAssumeDetails = insureCostAssumeDetails + secondarySalesCostAppVo.getInsureCost() + "/";
+            }
+            if (StringUtils.isNotBlank(secondarySalesCostAppVo.getInsureCostAssume())) {
+                insureCostAssumeDetails = insureCostAssumeDetails + secondarySalesCostAppVo.getInsureCostAssume() + "承担";
+            }
+            secondarySalesCostAppVo.setInsureCostAssumeDetails(insureCostAssumeDetails);
+            //过户费
+            String ownershipCostAssumeDetails = "";
+            if (StringUtils.isNotBlank(secondarySalesCostAppVo.getOwnershipCost())) {
+                ownershipCostAssumeDetails = ownershipCostAssumeDetails + secondarySalesCostAppVo.getOwnershipCost() + "/";
+            }
+            if (StringUtils.isNotBlank(secondarySalesCostAppVo.getOwnershipCostAssume())) {
+                ownershipCostAssumeDetails = ownershipCostAssumeDetails + secondarySalesCostAppVo.getOwnershipCostAssume() + "承担";
+            }
+            secondarySalesCostAppVo.setOwnershipCostAssumeDetails(ownershipCostAssumeDetails);
+            //停车费
+            String stopCostAssumeDetails = "";
+            if (StringUtils.isNotBlank(secondarySalesCostAppVo.getStopCost())) {
+                stopCostAssumeDetails = stopCostAssumeDetails + secondarySalesCostAppVo.getStopCost() + "/";
+            }
+            if (StringUtils.isNotBlank(secondarySalesCostAppVo.getStopCostAssume())) {
+                stopCostAssumeDetails = stopCostAssumeDetails + secondarySalesCostAppVo.getStopCostAssume() + "承担";
+            }
+            secondarySalesCostAppVo.setStopCostAssumeDetails(stopCostAssumeDetails);
+            //其他费用
+            String otherCostAssumeDetails = "";
+            if (StringUtils.isNotBlank(secondarySalesCostAppVo.getOtherCost())) {
+                otherCostAssumeDetails = otherCostAssumeDetails + secondarySalesCostAppVo.getOtherCost() + "/";
+            }
+            if (StringUtils.isNotBlank(secondarySalesCostAppVo.getOtherCostAssume())) {
+                otherCostAssumeDetails = otherCostAssumeDetails + secondarySalesCostAppVo.getOtherCostAssume() + "承担";
+            }
+            secondarySalesCostAppVo.setOtherCostAssumeDetails(otherCostAssumeDetails);
+
+        }
+        return rb.success().setData(secondarySalesAppVos);
     }
 
     public ResultBean delegate(SecondarySalesDelegateQuery delegateQuery) {