垫款申请对接联调优化

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -1163,9 +1163,9 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
                 return rb.setMsg("手机号格式不正确");
             }
         }
-        if (!dto.getTaxpayerNo().matches("^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$")) {
+        /*if (!dto.getTaxpayerNo().matches("^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$")) {
             return rb.setMsg("证件号码格式不正确");
-        }
+        }*/
         //客户姓名
         String name = dto.getName();
         //业务员sid

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyDetailsVo.java

@@ -26,6 +26,8 @@
 package com.yxt.anrui.riskcenter.api.loanbepadsincereapply;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo;
 import com.yxt.common.core.vo.Vo;
 
@@ -34,6 +36,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -55,8 +58,11 @@ public class LoanBePadsincereApplyDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
     @ApiModelProperty("发起日期")
-    private String createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
     @ApiModelProperty("申请部门sid")
     private String deptSid;
     @ApiModelProperty("申请部门名称")
@@ -84,7 +90,7 @@ public class LoanBePadsincereApplyDetailsVo implements Vo {
 	@ApiModelProperty("任务id")
     private String taskId; // 任务id
     @ApiModelProperty("附件")
-    private List<String> fileUrlList = new ArrayList<>(); // 附件
+    private List<LoanBePadsincereFile> fileUrlList = new ArrayList<>(); // 附件
     @ApiModelProperty("垫款车辆列表")
-    private List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVoList = new ArrayList<>();
+    private List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehList = new ArrayList<>();
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyDto.java

@@ -56,6 +56,8 @@ public class LoanBePadsincereApplyDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
     @ApiModelProperty("申请部门sid")
     private String deptSid;
     @ApiModelProperty("申请部门名称")
@@ -66,6 +68,8 @@ public class LoanBePadsincereApplyDto implements Dto {
     private String useOrgName;
     @ApiModelProperty("组织全路径")
     private String orgPath;
+    @ApiModelProperty("创建人sid")
+    private String createBySid; // 创建人sid
 	@ApiModelProperty("创建人")
     private String createByName; // 创建人
 	@ApiModelProperty("申请编号")
@@ -83,5 +87,5 @@ public class LoanBePadsincereApplyDto implements Dto {
     @ApiModelProperty("附件")
     private List<LoanBePadsincereFile> fileUrlList = new ArrayList<>(); // 附件
     @ApiModelProperty("垫款车辆列表")
-    private List<LoanBePadsincereVehDto> loanBePadsincereVehDtoList = new ArrayList<>();
+    private List<LoanBePadsincereVehDto> loanBePadsincereVehList = new ArrayList<>();
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyFeign.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.riskcenter.api.loanbepadsincereapply;
 import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.*;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo;
+import com.yxt.anrui.riskcenter.api.loancustomerrecord.flow.CustomerRecordDelegateQuery;
 import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentExcelInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -128,4 +129,8 @@ public interface LoanBePadsincereApplyFeign {
     @ApiOperation(value = "终止任务")
     @PostMapping(value = "/breakProcess")
     public ResultBean breakProcess(@Valid @RequestBody LoanBePadsincereTaskQuery query);
+
+    @ApiOperation(value = "加签")
+    @PostMapping(value = "/delegate")
+    public ResultBean delegate(@RequestBody LoanBePadsincereDelegateQuery loanBePadsincereDelegateQuery);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyFeignFallback.java

@@ -126,4 +126,9 @@ public class LoanBePadsincereApplyFeignFallback implements LoanBePadsincereApply
 		return null;
 	}
 
+	@Override
+	public ResultBean delegate(LoanBePadsincereDelegateQuery loanBePadsincereDelegateQuery) {
+		return null;
+	}
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/flowable/LoanBePadsincereDelegateQuery.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/9/28 9:28
+ */
+@Data
+public class LoanBePadsincereDelegateQuery {
+    @ApiModelProperty
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+//    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("审批人sid")
+    private String assignee;
+    @ApiModelProperty("填写意见")
+    private String views;
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDetailsVo.java

@@ -49,8 +49,6 @@ import lombok.Data;
 @ApiModel(value = "逾期垫款车辆 视图数据详情", description = "逾期垫款车辆 视图数据详情")
 public class LoanBePadsincereVehDetailsVo implements Vo {
 
-    private String sid; // sid
-
 	@ApiModelProperty("车架号")
     private String vinNo; // 车架号
 	@ApiModelProperty("贷款合同编号")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDto.java

@@ -49,8 +49,6 @@ import lombok.Data;
 @ApiModel(value = "逾期垫款车辆 数据传输对象", description = "逾期垫款车辆 数据传输对象")
 public class LoanBePadsincereVehDto implements Dto {
 
-    private String sid; // sid
-
 	@ApiModelProperty("车架号")
     private String vinNo; // 车架号
 	@ApiModelProperty("贷款合同编号")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.java

@@ -67,4 +67,6 @@ public interface LoanBePadsincereApplyMapper extends BaseMapper<LoanBePadsincere
     int updateFlowFiled(Map<String, Object> map);
 
 	int selectBySid(String join);
+
+    String selectNum(String billNo);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.xml

@@ -32,4 +32,12 @@
 		WHERE nodeState != '待提交'
 		  and find_in_set(sid, #{list})
     </select>
+
+	<select id="selectNum" resultType="java.lang.String">
+		select RIGHT (billNo, 4)
+		from loan_be_padsincere_apply
+		where billNo LIKE concat(#{billNo}, '%')
+		order by billNo desc
+				limit 1
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyRest.java

@@ -109,7 +109,7 @@ public class LoanBePadsincereApplyRest implements LoanBePadsincereApplyFeign {
 
 	@Override
 	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
+    @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
 		ResultBean rb = ResultBean.fireFail();
 		loanBePadsincereApplyService.delAll(sids);
@@ -117,8 +117,8 @@ public class LoanBePadsincereApplyRest implements LoanBePadsincereApplyFeign {
 	}
 
 	@Override
-	@ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
+	@ApiOperation("根据SID获取一条记录")    @GetMapping("/fetchDetailsBySid/{sid}")
+
     public ResultBean<LoanBePadsincereApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
 		ResultBean rb = ResultBean.fireFail();
 		LoanBePadsincereApplyDetailsVo vo = loanBePadsincereApplyService.fetchDetailsVoBySid(sid);
@@ -188,4 +188,9 @@ public class LoanBePadsincereApplyRest implements LoanBePadsincereApplyFeign {
 	public ResultBean breakProcess(LoanBePadsincereTaskQuery query) {
 		return loanBePadsincereApplyService.breakProcess(query);
 	}
+
+	@Override
+	public ResultBean delegate(LoanBePadsincereDelegateQuery loanBePadsincereDelegateQuery) {
+		return loanBePadsincereApplyService.delegate(loanBePadsincereDelegateQuery);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -30,11 +30,14 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
+import com.yxt.anrui.flowable.api.flow2.FlowFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
@@ -47,10 +50,7 @@ import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.*;
-import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable.LoanBePadsincereNodeQuery;
-import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable.LoanBePadsincereNodeVo;
-import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable.LoanBePadsincereTaskQuery;
-import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable.SubmitLoanBePadsincereDto;
+import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDto;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
@@ -128,7 +128,11 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private FlowFeign flowFeign;
 
     public PagerVo<LoanBePadsincereApplyVo> listPageVo(PagerQuery<LoanBePadsincereApplyQuery> pq) {
         LoanBePadsincereApplyQuery query = pq.getParams();
@@ -194,9 +198,21 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
     public ResultBean<String> saveOrUpdateDto(LoanBePadsincereApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
-        List<LoanBePadsincereVehDto> loanBePadsincereVehDtoList = dto.getLoanBePadsincereVehDtoList();
+        List<LoanBePadsincereVehDto> loanBePadsincereVehDtoList = dto.getLoanBePadsincereVehList();
         List<LoanBePadsincereFile> fileUrlList = dto.getFileUrlList();
         if (StringUtils.isBlank(dtoSid)) {
+            //生成单据编号
+            String billNo = "";
+            String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
+            billNo = "YQDK" + sysOrganizationVo.getOrgCode() + date;
+            String i = baseMapper.selectNum(billNo);
+            if (StringUtils.isNotBlank(i)) {
+                billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+            } else {
+                billNo = Rule.getBillNo(billNo, 0);
+            }
+            dto.setBillNo(billNo);
             String sid = this.insertByDto(dto);
             for (LoanBePadsincereVehDto loanBePadsincereVehDto : loanBePadsincereVehDtoList) {
                 loanBePadsincereVehDto.setMainSid(sid);
@@ -247,7 +263,20 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         LoanBePadsincereApplyDetailsVo vo = new LoanBePadsincereApplyDetailsVo();
         BeanUtil.copyProperties(entity, vo);
         List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos = loanBePadsincereVehService.selByMainSid(sid);
-        vo.setLoanBePadsincereVehDetailsVoList(loanBePadsincereVehDetailsVos);
+        vo.setLoanBePadsincereVehList(loanBePadsincereVehDetailsVos);
+        List<LoanFile> loanFiles = loanFileService.selectByLinkSid(sid,LoanFileEnum.BEPADSINCERE.getAttachType());
+        List<LoanBePadsincereFile> loanBePadsincereFiles = new ArrayList<>();
+        if (loanFiles != null && loanFiles.size() > 0){
+            for (LoanFile loanFile : loanFiles) {
+                LoanBePadsincereFile loanBePadsincereFile = new LoanBePadsincereFile();
+                String filePath = loanFile.getFilePath();
+                String urlPrefix = fileUploadComponent.getUrlPrefix();
+                filePath = urlPrefix + filePath;
+                loanBePadsincereFile.setUrl(filePath);
+                loanBePadsincereFiles.add(loanBePadsincereFile);
+            }
+        }
+        vo.setFileUrlList(loanBePadsincereFiles);
         return vo;
     }
 
@@ -791,7 +820,20 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
         loanBePadsincereApplyDetailsVo.setCreateBySid(userSid);
         loanBePadsincereApplyDetailsVo.setCreateByName(sysUserVo.getName());
-        loanBePadsincereApplyDetailsVo.setCreateTime(DateUtil.formatDate(new Date()));
+        loanBePadsincereApplyDetailsVo.setCreateTime(new Date());
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+        loanBePadsincereApplyDetailsVo.setUseOrgSid(useOrgSid);
+        loanBePadsincereApplyDetailsVo.setUseOrgName(sysOrganizationVo1.getName());
+        loanBePadsincereApplyDetailsVo.setOrgPath(orgPath);
         return loanBePadsincereApplyDetailsVo;
     }
+
+    public ResultBean delegate(LoanBePadsincereDelegateQuery loanBePadsincereDelegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
+        BeanUtil.copyProperties(loanBePadsincereDelegateQuery, delegateQuery);
+        flowFeign.delegate(delegateQuery);
+        return rb.success();
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehService.java

@@ -77,13 +77,9 @@ public class LoanBePadsincereVehService extends MybatisBaseService<LoanBePadsinc
     }
 
     public void saveOrUpdateDto(LoanBePadsincereVehDto dto) {
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
         this.insertByDto(dto);
         return;
     }
-		this.updateByDto(dto);
-	}
 
     public void insertByDto(LoanBePadsincereVehDto dto) {
         LoanBePadsincereVeh entity = new LoanBePadsincereVeh();
@@ -91,16 +87,6 @@ public class LoanBePadsincereVehService extends MybatisBaseService<LoanBePadsinc
         baseMapper.insert(entity);
     }
 
-	public void updateByDto(LoanBePadsincereVehDto dto){
-          String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        } 
-		LoanBePadsincereVeh entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
     public LoanBePadsincereVehDetailsVo fetchDetailsVoBySid(String sid) {
         LoanBePadsincereVeh entity = fetchBySid(sid);
         LoanBePadsincereVehDetailsVo vo = new LoanBePadsincereVehDetailsVo();