交回车辆入库申请部分

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturninboundapply/LoanReturnInboundApply.java

@@ -98,4 +98,6 @@ public class LoanReturnInboundApply extends BaseEntity {
 
     private String files;
 
+    private String busVinSid;
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturninboundapply/LoanReturnInboundApplyDetailsVo.java

@@ -69,14 +69,14 @@ public class LoanReturnInboundApplyDetailsVo {
     private String alRepaidMoney;
     @ApiModelProperty("当前逾期金额")
     private String currentBeMoney;
-    @ApiModelProperty("其中资金占用费")
+    /*@ApiModelProperty("其中资金占用费")
-    private String wheFundOccMoney;
+    private String wheFundOccMoney;*/
     @ApiModelProperty("未到期金额")
     private String unexpiredMoney;
     @ApiModelProperty("总期数")
     private String nper;
-    @ApiModelProperty("当前期数")
+    /*  @ApiModelProperty("当前期数")
-    private String currentPeriod;
+      private String currentPeriod;*/
     @ApiModelProperty("已还金额换算期数")
     private String alRepaidMoneyConPeriod;
     @ApiModelProperty("逾期金额换算期数")
@@ -88,4 +88,6 @@ public class LoanReturnInboundApplyDetailsVo {
 
     private LoanReturnInboundTrailerDto loanReturnInboundTrailer;
 
+    private String files;
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturninboundapply/LoanReturnInboundApplyDto.java

@@ -66,15 +66,15 @@ public class LoanReturnInboundApplyDto implements Dto {
     @ApiModelProperty("停放地点sid")
     private String locationSid;
     @ApiModelProperty("停车收费标准")
-    private BigDecimal parkFees;
+    private String parkFees;
     @ApiModelProperty("已还金额")
-    private BigDecimal alRepaidMoney;
+    private String alRepaidMoney;
     @ApiModelProperty("当前逾期金额")
-    private BigDecimal currentBeMoney;
+    private String currentBeMoney;
     @ApiModelProperty("其中资金占用费")
-    private BigDecimal wheFundOccMoney;
+    private String wheFundOccMoney;
     @ApiModelProperty("未到期金额")
-    private BigDecimal unexpiredMoney;
+    private String unexpiredMoney;
     @ApiModelProperty("总期数")
     private String nper;
     @ApiModelProperty("当前期数")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApply;
+import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyVo;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.ReturnInboundVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -29,4 +30,8 @@ public interface LoanReturnInboundApplyMapper extends BaseMapper<LoanReturnInbou
     List<ReturnInboundVo> getInboundList(@Param("useOrgSid") String useOrgSid, @Param("busVinSid") List<String> busVinSid);
 
     List<String> selectVehInbound(String useOrgSid);
+
+    LoanReturnInboundApplyDetailsVo selectSidOne(String chooseSid);
+
+    LoanReturnInboundApplyDetailsVo selectDetails(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml

@@ -77,4 +77,74 @@
         where useOrgSid = #{useOrgSid}
           and vehType = '主车'
     </select>
+
+    <select id="selectSidOne"
+            resultType="com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyDetailsVo">
+        select la.vinNo,
+               la.carNum                                             vehMark,
+               bm.modelName,
+               bm.modelSid,
+               bm.modelConfigSid                                     configSid,
+               bm.config                                             configName,
+               la.custName                                           customerName,
+               bo.customerSid,
+               bv.borrowerSid,
+               la.borrName,
+               la.loanContractNo,
+               la.bankName,
+               la.bankContractNo,
+               la.alRepaidMoney,
+               concat(la.currentBeMoney, '/', la.wheFundOccMoney) as currentBeMoney,
+               la.unexpiredMoney,
+               concat(la.nper, '/', la.currentPeriod)             as nper,
+               la.alRepaidMoneyConPeriod,
+               la.beOverdueMoneyAndPeriod,
+               la.saleVehSid                                         busVinSid,
+               (la.currentBeMoney + la.unexpiredMoney)            as inboundMoney
+        from loan_restore_report_apply la
+                 left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = la.saleVehSid
+                 left join anrui_buscenter.bus_sales_order_model bm on bm.salesOrderSid = bv.salesOrderSid
+                 left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid
+
+        where sid = #{chooseSid}
+    </select>
+
+    <select id="selectDetails"
+            resultType="com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyDetailsVo">
+        select la.sid,
+               la.createDept,
+               la.createDeptSid,
+               la.createByName,
+               DATE_FORMAT(la.createTime, '%Y-%m-%d')             as createDate,
+               la.vinNo,
+               la.vinSid,
+               la.vehMark,
+               la.firstDate,
+               la.modelSid,
+               la.modelName,
+               la.configName,
+               la.configSid,
+               la.tralier,
+               la.customerSid,
+               la.customerName,
+               la.loanSid,
+               la.loanName,
+               la.loanContractNo,
+               la.bankName,
+               la.bankContractNo,
+               la.inboundMoney,
+               la.locationName,
+               la.locationSid,
+               la.parkFees,
+               la.alRepaidMoney,
+               concat(la.currentBeMoney, '/', la.wheFundOccMoney) as currentBeMoney,
+               la.unexpiredMoney,
+               concat(la.nper, '/', la.currentPeriod)             as nper,
+               la.alRepaidMoneyConPeriod,
+               la.beOverdueMoneyAndPeriod,
+               la.busVinSid,
+               la.files
+        from loan_return_inbound_apply la
+        where sid = #{sid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java

@@ -24,6 +24,8 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.*;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.flowable.*;
+import com.yxt.anrui.riskcenter.api.loanreturninboundtrailer.LoanReturnInboundTrailer;
+import com.yxt.anrui.riskcenter.api.loanreturninboundtrailer.LoanReturnInboundTrailerDto;
 import com.yxt.anrui.riskcenter.biz.loanreturninboundtrailer.LoanReturnInboundTrailerService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -39,6 +41,7 @@ import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
@@ -280,6 +283,20 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
             if ("是".equals(dto.getTralier())) {
                 loanReturnInboundTrailerService.saveOrInsert(dto.getLoanReturnInboundTrailer(), loanReturnInboundApply.getSid());
             }
+            if (StringUtils.isNotBlank(dto.getCurrentBeMoney())) {
+                List<String> stringList = Arrays.asList(dto.getCurrentBeMoney().split("/"));
+                if (StringUtils.isNotBlank(stringList.get(0))) {
+                    loanReturnInboundApply.setCurrentBeMoney(new BigDecimal(stringList.get(0)));
+                }
+                if (StringUtils.isNotBlank(stringList.get(1))) {
+                    loanReturnInboundApply.setWheFundOccMoney(new BigDecimal(stringList.get(1)));
+                }
+            }
+            if (StringUtils.isNotBlank(dto.getNper())) {
+                List<String> stringList = Arrays.asList(dto.getNper().split("/"));
+                loanReturnInboundApply.setNper(stringList.get(0));
+                loanReturnInboundApply.setCurrentPeriod(stringList.get(1));
+            }
             baseMapper.insert(loanReturnInboundApply);
             sid = loanReturnInboundApply.getSid();
         } else {
@@ -303,6 +320,28 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
             } else {
                 loanReturnInboundTrailerService.deleteByMainSid(sid);
             }
+            if (StringUtils.isNotBlank(dto.getCurrentBeMoney())) {
+                List<String> stringList = Arrays.asList(dto.getCurrentBeMoney().split("/"));
+                if (StringUtils.isNotBlank(stringList.get(0))) {
+                    loanReturnInboundApply.setCurrentBeMoney(new BigDecimal(stringList.get(0)));
+                } else {
+                    loanReturnInboundApply.setCurrentBeMoney(new BigDecimal(0));
+                }
+                if (StringUtils.isNotBlank(stringList.get(1))) {
+                    loanReturnInboundApply.setWheFundOccMoney(new BigDecimal(stringList.get(1)));
+                } else {
+                    loanReturnInboundApply.setWheFundOccMoney(new BigDecimal(0));
+                }
+            }
+            if (StringUtils.isNotBlank(dto.getNper())) {
+                List<String> stringList = Arrays.asList(dto.getNper().split("/"));
+                loanReturnInboundApply.setNper(stringList.get(0));
+                loanReturnInboundApply.setCurrentPeriod(stringList.get(1));
+            } else {
+                loanReturnInboundApply.setNper("");
+                loanReturnInboundApply.setCurrentPeriod("");
+            }
+            baseMapper.updateById(loanReturnInboundApply);
         }
         return rb.success().setData(sid);
     }
@@ -346,12 +385,34 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
             loanReturnInboundApplyDetailsVo.setCreateByName(userVoResultBean.getData().getName());
             loanReturnInboundApplyDetailsVo.setCreatgeDate(DateUtil.today());
             //根据交回车辆事前报备申请sid查询数据
+            loanReturnInboundApplyDetailsVo = baseMapper.selectSidOne(chooseSid);
 
 
         } else {//编辑初始化
+            loanReturnInboundApplyDetailsVo = baseMapper.selectDetails(sid);
+            String files = loanReturnInboundApplyDetailsVo.getFiles();
+            List<UrlQuery> list = new ArrayList<>();
+            if (StringUtils.isNotBlank(files)) {
+                List<String> fileList = Arrays.asList(files.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));
+                    list.add(urlQuery);
+                }
+                loanReturnInboundApplyDetailsVo.setFilesList(list);
+            }
+            if ("是".equals(loanReturnInboundApplyDetailsVo.getTralier())) {
+                LoanReturnInboundTrailerDto loanReturnInboundTrailerDto = new LoanReturnInboundTrailerDto();
+                LoanReturnInboundTrailer loanReturnInboundTrailer = loanReturnInboundTrailerService.selectByMainSid(sid);
+                if (loanReturnInboundTrailer != null) {
+                    BeanUtil.copyProperties(loanReturnInboundTrailer, loanReturnInboundTrailerDto);
+                }
+                loanReturnInboundApplyDetailsVo.setLoanReturnInboundTrailer(loanReturnInboundTrailerDto);
+            }
+
 
         }
-        return null;
+        return rb.success().setData(loanReturnInboundApplyDetailsVo);
     }
 
     public ResultBean delAllBySids(String[] sids) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundtrailer/LoanReturnInboundTrailerMapper.java

@@ -12,4 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface LoanReturnInboundTrailerMapper extends BaseMapper<LoanReturnInboundTrailer> {
     int deleteByMainSid(String sid);
+
+    LoanReturnInboundTrailer selectByMainSid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundtrailer/LoanReturnInboundTrailerMapper.xml

@@ -6,4 +6,11 @@
         from loan_return_inbound_trailer
         where mainSid = #{sid}
     </delete>
+
+    <select id="selectByMainSid"
+            resultType="com.yxt.anrui.riskcenter.api.loanreturninboundtrailer.LoanReturnInboundTrailer">
+        select *
+        from loan_return_inbound_trailer
+        where mainSid = #{sid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundtrailer/LoanReturnInboundTrailerService.java

@@ -24,4 +24,8 @@ public class LoanReturnInboundTrailerService extends MybatisBaseService<LoanRetu
     public void deleteByMainSid(String sid) {
         baseMapper.deleteByMainSid(sid);
     }
+
+    public LoanReturnInboundTrailer selectByMainSid(String sid) {
+        return baseMapper.selectByMainSid(sid);
+    }
 }

doc/databases/risk_center.sql

@@ -1440,6 +1440,7 @@ CREATE TABLE `loan_return_inbound_apply`
     `procInstId`              varchar(64)          DEFAULT NULL COMMENT '实例id',
     `procDefId`               varchar(64)          DEFAULT NULL COMMENT '流程定义id',
     `taskId`                  varchar(64)          DEFAULT NULL COMMENT '任务id',
+    `busVinSid`               varchar(64)          DEFAULT NULL COMMENT '销售订单车辆sid',
     `taskDefKey`              varchar(64)          DEFAULT NULL COMMENT '环节id',
     `orgSidPath`              text                 DEFAULT NULL COMMENT '机构全路径sid',
     `files`                   text                 DEFAULT NULL COMMENT '附件',