逾期-车辆催收录入（新增）

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionRecordDto.java

@@ -51,54 +51,46 @@ import java.util.List;
 @ApiModel(value = "逾期催收记录 数据传输对象", description = "逾期催收记录 数据传输对象")
 public class AppBeCollectionRecordDto implements Dto {
 
-    private String sid; // sid
+    private String sid;
 
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+    @ApiModelProperty("催收方式key")
+    private String collectionTypeKey;
+    @ApiModelProperty("催收方式value")
+    private String collectionTypeValue;
+    @ApiModelProperty("定位坐标")
+    private String location;
+    @ApiModelProperty("定位具体位置")
+    private String locationStr;
+    @ApiModelProperty("催收结果key")
+    private String collectionResultKey;
+    @ApiModelProperty("催收结果value")
+    private String collectionResultValue;
+    @ApiModelProperty("联系人key")
+    private String contactsKey;
+    @ApiModelProperty("联系人value")
+    private String contactsValue;
+    @ApiModelProperty("逾期原因")
+    private String beReason;
+    @ApiModelProperty("是否正常运营key")
+    private String isNormalOperKey;
+    @ApiModelProperty("是否正常运营value")
+    private String isNormalOperValue;
+    @ApiModelProperty("承诺还款日期")
+    private String promRepayDate;
+    @ApiModelProperty("承诺还款金额")
+    private String promRepayMoney;
+    @ApiModelProperty("预处理措施key")
+    private String taskHandMeasuresKey;
+    @ApiModelProperty("预处理措施value")
+    private String taskHandMeasuresValue;
     @ApiModelProperty("备注")
-    private String remarks; // 备注
-    @ApiModelProperty("创建人sid")
-    private String createBySid; // 创建人sid
-	@ApiModelProperty("创建人")
-    private String createByName; // 创建人
-	@ApiModelProperty("催收方式key")
-    private String collectionTypeKey; // 催收方式key
-	@ApiModelProperty("催收方式value")
-    private String collectionTypeValue; // 催收方式value
-	@ApiModelProperty("定位坐标")
-    private String location; // 定位坐标
-	@ApiModelProperty("定位具体位置")
-    private String locationStr; // 定位具体位置
-	@ApiModelProperty("催收结果key")
-    private String collectionResultKey; // 催收结果key
-	@ApiModelProperty("催收结果value")
-    private String collectionResultValue; // 催收结果value
-	@ApiModelProperty("联系人key")
-    private String contactsKey; // 联系人key
-	@ApiModelProperty("联系人value")
-    private String contactsValue; // 联系人value
-	@ApiModelProperty("逾期原因")
-    private String beReason; // 逾期原因
-	@ApiModelProperty("是否正常运营key")
-    private String isNormalOperKey; // 是否正常运营key
-	@ApiModelProperty("是否正常运营value")
-    private String isNormalOperValue; // 是否正常运营value
-	@ApiModelProperty("承诺还款日期")
-    private String promRepayDate; // 承诺还款日期
-	@ApiModelProperty("承诺还款金额")
-    private String promRepayMoney; // 承诺还款金额
-	@ApiModelProperty("预处理措施key")
-    private String taskHandMeasuresKey; // 预处理措施key
-	@ApiModelProperty("预处理措施value")
-    private String taskHandMeasuresValue; // 预处理措施value
-	@ApiModelProperty("销售订单车辆sid")
-    private String saleVehSid; // 销售订单车辆sid
-    @ApiModelProperty("分公司sid")
-    private String useOrgSid; // 分公司sid
-	@ApiModelProperty("分公司名称")
-    private String useOrgName; // 分公司名称
-	@ApiModelProperty("组织全路径")
-    private String orgPath; // 组织全路径
-    @ApiModelProperty("销售订单车辆sid")
-    private List<String> saleVehSids; // 销售订单车辆sid
+    private String remarks;
     @ApiModelProperty("催收附件")
-    private List<String> loanBeCollectionRecordFileList = new ArrayList<>(); // 催收附件
+    private List<String> files = new ArrayList<>();
+    @ApiModelProperty("销售订单车辆sid")
+    private List<String> saleVehSids;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeOverdueVehVo.java

@@ -15,7 +15,7 @@ public class AppBeOverdueVehVo implements Vo {
 
     @ApiModelProperty("分公司")
     private String useOrgName;
-    @ApiModelProperty("销售部门")
+    @ApiModelProperty("发起部门")
     private String dept;
     @ApiModelProperty("贷款合同编号")
     private String loanContractNo;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/BeCollectionFeign.java

@@ -29,14 +29,14 @@ public interface BeCollectionFeign {
     public ResultBean<PagerVo<AppBeOverdueVehVo>> beVehListPage(@RequestBody PagerQuery<AppBeOverdueVehQuery> pagerQuery);
 
     @ApiOperation("催收措施详情")
-    @GetMapping("/collectionDetail")
+    @GetMapping("/collectionDetail/{sid}")
     @ResponseBody
-    public ResultBean<AppBeCollectionApplyDetailsVo> collectionDetail(@RequestParam("sid") String sid);
+    public ResultBean<AppBeCollectionApplyDetailsVo> collectionDetail(@PathVariable("sid") String sid);
 
-    @ApiOperation("催收措施详情")
-    @GetMapping("/padsincereDetail")
+    @ApiOperation("垫款详情")
+    @GetMapping("/padsincereDetail/{sid}")
     @ResponseBody
-    public ResultBean<AppBePadsincereApplyDetailsVo> padsincereDetail(@RequestParam("sid") String sid);
+    public ResultBean<AppBePadsincereApplyDetailsVo> padsincereDetail(@PathVariable("sid") String sid);
 
     @ApiOperation("初始化实际还款人")
     @PostMapping("/initReaRepayment")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java

@@ -31,13 +31,16 @@ import cn.hutool.core.date.DateUtil;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.ReaRepaymentDto;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyFeign;
 import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo;
 import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.*;
-import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordFeign;
-import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordInit;
-import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVehInit;
+import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.*;
 import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile;
 import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehFegin;
@@ -79,6 +82,12 @@ public class BeCollectionService {
     private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
     @Autowired
     private LoanBeCollectionRecordFeign loanBeCollectionRecordFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
     public ResultBean agreeCreditInfo(CompleteBeCollectionDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -425,6 +434,42 @@ public class BeCollectionService {
 
     public ResultBean saveCollectionEnter(AppBeCollectionRecordDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        LoanBeCollectionRecordDto loanBeCollectionRecordDto = new LoanBeCollectionRecordDto();
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
+        loanBeCollectionRecordDto.setCreateBySid(dto.getUserSid());
+        loanBeCollectionRecordDto.setCreateByName(sysUserVo.getName());
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+        loanBeCollectionRecordDto.setUseOrgSid(useOrgSid);
+        loanBeCollectionRecordDto.setUseOrgName(sysOrganizationVo.getName());
+        loanBeCollectionRecordDto.setCollectionTypeKey(dto.getCollectionTypeKey());
+        loanBeCollectionRecordDto.setCollectionTypeValue(dto.getCollectionTypeValue());
+        loanBeCollectionRecordDto.setLocation(dto.getLocation());
+        loanBeCollectionRecordDto.setLocationStr(dto.getLocationStr());
+        loanBeCollectionRecordDto.setCollectionResultKey(dto.getCollectionResultKey());
+        loanBeCollectionRecordDto.setCollectionResultValue(dto.getCollectionResultValue());
+        loanBeCollectionRecordDto.setContactsKey(dto.getContactsKey());
+        loanBeCollectionRecordDto.setContactsValue(dto.getContactsValue());
+        loanBeCollectionRecordDto.setBeReason(dto.getBeReason());
+        loanBeCollectionRecordDto.setIsNormalOperKey(dto.getIsNormalOperKey());
+        loanBeCollectionRecordDto.setIsNormalOperValue(dto.getIsNormalOperValue());
+        loanBeCollectionRecordDto.setPromRepayDate(dto.getPromRepayDate());
+        loanBeCollectionRecordDto.setPromRepayMoney(dto.getPromRepayMoney());
+        loanBeCollectionRecordDto.setTaskHandMeasuresKey(dto.getTaskHandMeasuresKey());
+        loanBeCollectionRecordDto.setTaskHandMeasuresValue(dto.getTaskHandMeasuresValue());
+        loanBeCollectionRecordDto.setOrgPath(dto.getOrgPath());
+        loanBeCollectionRecordDto.setSaleVehSids(dto.getSaleVehSids());
+        List<String> files = dto.getFiles();
+        List<LoanBeCollectionRecordFile> loanBeCollectionRecordFiles = new ArrayList<>();
+        if (files != null && files.size() > 0){
+            for (String file : files) {
+                LoanBeCollectionRecordFile loanBeCollectionRecordFile = new LoanBeCollectionRecordFile();
+                loanBeCollectionRecordFile.setUrl(file);
+                loanBeCollectionRecordFiles.add(loanBeCollectionRecordFile);
+            }
+        }
+        loanBeCollectionRecordDto.setLoanBeCollectionRecordFileList(loanBeCollectionRecordFiles);
+        loanBeCollectionRecordFeign.save(loanBeCollectionRecordDto);
         return rb.success();
     }
 }