Browse Source

完善客户欠款备案

master
fanzongzhe 2 years ago
parent
commit
972dfab015
  1. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java
  2. 7
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempVo.java
  3. 11
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListVo.java
  4. 14
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
  5. 49
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
  6. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecord.java
  7. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeign.java
  8. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeignFallback.java
  9. 61
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppCustomerRecordInitVo.java
  10. 24
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppSalesmanRsk.java
  11. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordRest.java
  12. 215
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java
  13. 11
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordFeign.java
  14. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordFeignFallback.java
  15. 6
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loancustomerrecord/CustomerRecordRest.java

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java

@ -1369,8 +1369,8 @@ public class BaseDistributorApplyService extends MybatisBaseService<BaseDistribu
if (!staffinfoVoList.isEmpty()) {
for (SysOrgStaffVo sysOrgStaffVo : staffinfoVoList) {
AppSalesman appSalesman = new AppSalesman();
if (StringUtils.isNotBlank(sysOrgStaffVo.getStaffSid())) {
appSalesman.setDictKey(sysOrgStaffVo.getStaffSid());
if (StringUtils.isNotBlank(sysOrgStaffVo.getUserSid())) {
appSalesman.setDictKey(sysOrgStaffVo.getUserSid());
}
if (StringUtils.isNotBlank(sysOrgStaffVo.getStaffName())) {
appSalesman.setDictValue(sysOrgStaffVo.getStaffName());
@ -1847,8 +1847,8 @@ public class BaseDistributorApplyService extends MybatisBaseService<BaseDistribu
if (!staff.isEmpty()) {
for (SysOrgStaffVo sysOrgStaffVo : staff) {
AppSalesman user = new AppSalesman();
if (StringUtils.isNotBlank(sysOrgStaffVo.getStaffSid())) {
user.setDictKey(sysOrgStaffVo.getStaffSid());
if (StringUtils.isNotBlank(sysOrgStaffVo.getUserSid())) {
user.setDictKey(sysOrgStaffVo.getUserSid());
}
if (StringUtils.isNotBlank(sysOrgStaffVo.getStaffName())) {
user.setDictValue(sysOrgStaffVo.getStaffName());

7
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempVo.java

@ -93,4 +93,11 @@ public class AppCrmCustomerTempVo implements Vo {
@ApiModelProperty("详细地址")
private String address;
@ApiModelProperty("证件有效期")
private String idDate;
@ApiModelProperty("证件类型")
private String idType;
@ApiModelProperty("证件号码")
private String idNumber;
}

11
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListVo.java

@ -31,4 +31,15 @@ public class CrmCustomerTempListVo implements Vo {
@ApiModelProperty("客户地址")
private String clientAddress;
@ApiModelProperty("省")
private String province;
@ApiModelProperty("市")
private String city;
@ApiModelProperty("县")
private String county;
@ApiModelProperty("详细地址")
private String address;
}

14
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml

@ -39,6 +39,13 @@
cct.isOnRemindkey,
cct.companyName,
cct.follow_state,
cct.endDate as idDate,
cct.IDNumber as idNumber,
cct.certificateType as idType,
cct.province as province,
cct.city as city,
cct.county as county,
cct.address as address,
(select Max(DATE_FORMAT(cv.createTime, '%Y-%m-%d')) from crm_visit cv where cv.customerSid = cct.sid order by
cv.id DESC) as visitTime
FROM crm_customer_temp cct
@ -203,8 +210,11 @@
<select id="selectCustomerList" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempListVo">
select ct.name, ct.sid, ct.mobile, ct.customerNo, ct.IDNumber as idCard,
ct.customerType,ct.customerTypeKey,ct.certificateType as documents,ct.endDate as documentsDate,ct.address as
clientAddress
ct.customerType,ct.customerTypeKey,ct.certificateType as documents,ct.endDate as documentsDate,
ct.province as province,
ct.city as city,
ct.county as county,
ct.address as address
from crm_customer_temp ct
<where>
${ew.sqlSegment}

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

@ -50,6 +50,7 @@ import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -473,13 +474,30 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
if (StringUtils.isNotBlank(name)) {
qw.like("cct.name", name);
}
if(StringUtils.isNotBlank(params.getType())){
qw.eq("cct.customerTypeKey",params.getType());
if (StringUtils.isNotBlank(params.getType())) {
qw.eq("cct.customerTypeKey", params.getType());
}
}
qw.orderByDesc("cct.id");
IPage<AppCrmCustomerTempVo> iPage = baseMapper.getCustomerTempListByUserSid(page, qw);
for (AppCrmCustomerTempVo record : iPage.getRecords()) {
String province = "";
String city = "";
String county = "";
String address = "";
if (StringUtils.isNotBlank(record.getProvince())) {
province = record.getProvince();
}
if (StringUtils.isNotBlank(record.getCity())) {
city = record.getCity();
}
if (StringUtils.isNotBlank(record.getCounty())) {
county = record.getCounty();
}
if (StringUtils.isNotBlank(record.getAddress())) {
address = record.getAddress();
}
record.setAddressNss(province + city + county + address);
if (record.getIsOnRemindkey() == 0) {
record.setRemind_day("未设置提醒");
}
@ -1007,6 +1025,27 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
qw.eq("ct.staffSid", staffSid);
List<CrmCustomerTempListVo> list = baseMapper.selectCustomerList(qw);
list.removeAll(Collections.singleton(null));
if (!list.isEmpty()) {
for (CrmCustomerTempListVo record : list) {
String province = "";
String city = "";
String county = "";
String address = "";
if (StringUtils.isNotBlank(record.getProvince())) {
province = record.getProvince();
}
if (StringUtils.isNotBlank(record.getCity())) {
city = record.getCity();
}
if (StringUtils.isNotBlank(record.getCounty())) {
county = record.getCounty();
}
if (StringUtils.isNotBlank(record.getAddress())) {
address = record.getAddress();
}
record.setClientAddress(province + city + county + address);
}
}
return rb.success().setData(list);
}
@ -1119,12 +1158,12 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
String name = dto.getName();
//业务员sid
String staffSid = dto.getStaffSid();
if (StringUtils.isBlank(staffSid)){
if (StringUtils.isBlank(staffSid)) {
String userSid = dto.getCreateBySid();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
staffSid = sysUserVo.getStaffSid();
}
if (StringUtils.isBlank(dtoSid)){//新增
if (StringUtils.isBlank(dtoSid)) {//新增
//生成客户编码:分公司简称+部门编码+手机号+姓名首字母大写拼写
String customerNo = getPrefix(staffSid, name, phone);
//查询该客户编码是否存在
@ -1166,7 +1205,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
}
CrmCustomerTemp crmCustomerTemp = fetchBySid(dtoSid);
CrmCustomerTempUpdateDto crmCustomerTempDto = new CrmCustomerTempUpdateDto();
BeanUtils.copyProperties(crmCustomerTemp,crmCustomerTempDto);
BeanUtils.copyProperties(crmCustomerTemp, crmCustomerTempDto);
crmCustomerTempDto.setIDNumber(dto.getTaxpayerNo());
ResultBean resultBean = updateCrmCustomer(crmCustomerTempDto, dtoSid);
if (!resultBean.getSuccess()) {

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecord.java

@ -28,7 +28,9 @@ public class LoanCustomerRecord extends BaseEntity {
@ApiModelProperty("申请人")
private String applyName; // 申请人
@ApiModelProperty("销售专员sid")
private String salesmanSid; // 销售专员sid
private String staffSid; //
@ApiModelProperty("销售专员用户sid")
private String salesUserSid; // // 销售专员sid
@ApiModelProperty("销售专员")
private String salesman; // 销售专员
@ApiModelProperty("申请日期")

6
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeign.java

@ -1,5 +1,6 @@
package com.yxt.anrui.riskcenter.api.loancustomerrecord;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.AppCustomerRecordInitVo;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.AppCustomerRecordQuery;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.AppCustomerRecordVo;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.flow.*;
@ -130,4 +131,9 @@ public interface LoanCustomerRecordFeign {
@ResponseBody
ResultBean<PagerVo<AppCustomerRecordVo>> getCustomerRecordList(@RequestBody PagerQuery<AppCustomerRecordQuery> pagerQuery);
@ApiOperation("移动端-欠款客户备案初始化")
@GetMapping("/customerRecordInit")
@ResponseBody
ResultBean<AppCustomerRecordInitVo> customerRecordInit(@RequestParam("sid") String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid);
}

6
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeignFallback.java

@ -1,6 +1,7 @@
package com.yxt.anrui.riskcenter.api.loancustomerrecord;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.AppCustomerRecordInitVo;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.AppCustomerRecordQuery;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.AppCustomerRecordVo;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.flow.*;
@ -90,4 +91,9 @@ public class LoanCustomerRecordFeignFallback implements LoanCustomerRecordFeign
public ResultBean<PagerVo<AppCustomerRecordVo>> getCustomerRecordList(PagerQuery<AppCustomerRecordQuery> pagerQuery) {
return null;
}
@Override
public ResultBean<AppCustomerRecordInitVo> customerRecordInit(String sid, String orgPath, String userSid) {
return null;
}
}

61
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppCustomerRecordInitVo.java

@ -0,0 +1,61 @@
package com.yxt.anrui.riskcenter.api.loancustomerrecord.app;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/10/13 9:34
*/
@Data
public class AppCustomerRecordInitVo implements Vo {
private String sid;
private String userSid;
private String orgPath;
private String publishInfo;
private String taskId;
private String procInsId;
@ApiModelProperty("申请人")
private String applyName;
@ApiModelProperty("申请日期")
private String applyDate;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门")
private String dept;
@ApiModelProperty("销售部门sid")
private String salesDeptSid;
@ApiModelProperty("销售部门")
private String salesDept;
@ApiModelProperty("主管人员sid")
private String mangeSid;
@ApiModelProperty("主管人员")
private String mange;
@ApiModelProperty("销售专员sid")
private String salesmanSid;
@ApiModelProperty("销售专员")
private String salesman;
private List<AppSalesmanRsk> users = new ArrayList<>();
@ApiModelProperty("备注")
private String remarks;
private String tempMangeSid;
private String tempMange;
private String customerSid;
private String customerType;
private String mobile;
private String name;
private String customerTypeKey;
private String addressNss;
private String idDate;
private String idNumber;
private String idType;
private String isGK;
}

24
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppSalesmanRsk.java

@ -0,0 +1,24 @@
package com.yxt.anrui.riskcenter.api.loancustomerrecord.app;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/10/13 9:53
*/
@Data
public class AppSalesmanRsk {
private String sid;
private String checkSid;
// 必须有 一般sid
private String dictKey;
private boolean selected;
//必须有 显示的文字
private String dictValue;
private boolean mandatory;
private String dictType;
private String extra;
//额外的内容;
private Object extra2;
}

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordRest.java

@ -5,6 +5,7 @@ import com.yxt.anrui.base.api.basedistributor.app.apply.AppDistributorApplyVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.*;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.AppCustomerRecordInitVo;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.AppCustomerRecordQuery;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.AppCustomerRecordVo;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.flow.*;
@ -124,4 +125,9 @@ public class LoanCustomerRecordRest implements LoanCustomerRecordFeign {
PagerVo<AppCustomerRecordVo> pv = loanCustomerRecordService.getCustomerRecordList(pagerQuery);
return rb.success().setData(pv);
}
@Override
public ResultBean<AppCustomerRecordInitVo> customerRecordInit(String sid, String orgPath, String userSid) {
return loanCustomerRecordService.customerRecordInit(sid,orgPath,userSid);
}
}

215
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java

@ -9,8 +9,12 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basedistributor.BaseDistributor;
import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsQuery;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppDistributorApplyVo;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppSalesDeptVo;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppSalesman;
import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendix;
import com.yxt.anrui.base.api.basedistributorapply.BaseDistributorApply;
import com.yxt.anrui.base.api.basedistributorapply.BaseDistributorApplyFeign;
import com.yxt.anrui.base.api.basedistributorapply.BaseSalesManger;
import com.yxt.anrui.base.api.basedistributorapply.flow.DistributorDelegateQuery;
import com.yxt.anrui.base.api.basedistributorapplyappendix.BaseDistributorApplyAppendixVo;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
@ -27,8 +31,7 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysorganization.*;
import com.yxt.anrui.portal.api.sysparameter.SysParameterEnum;
import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
@ -39,8 +42,10 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.*;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.AppCustomerRecordInitVo;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.AppCustomerRecordQuery;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.AppCustomerRecordVo;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.AppSalesmanRsk;
import com.yxt.anrui.riskcenter.api.loancustomerrecord.flow.*;
import com.yxt.anrui.riskcenter.api.loancustomerrecordstaff.LoanCustomerRecordStaff;
import com.yxt.anrui.riskcenter.api.loancustomerrecordstaff.LoanCustomerRecordStaffDto;
@ -105,6 +110,8 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
private FlowableFeign flowableFeign;
@Autowired
private SysParameterFeign sysParameterFeign;
@Autowired
private BaseDistributorApplyFeign baseDistributorApplyFeign;
/**
* 分页列表
@ -201,6 +208,9 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
LoanCustomerRecordDetailsVo vo = new LoanCustomerRecordDetailsVo();
LoanCustomerRecord entity = fetchBySid(sid);
BeanUtil.copyProperties(entity, vo);
if (StringUtils.isNotBlank(entity.getStaffSid())) {
vo.setSalesmanSid(entity.getStaffSid());
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if (null != entity.getApplyDate()) {
vo.setApplyDate(sdf.format(entity.getApplyDate()));
@ -313,6 +323,14 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
sid = dto.getSid();
LoanCustomerRecord loanCustomerRecord = fetchBySid(sid);
BeanUtil.copyProperties(dto, loanCustomerRecord, "id", "sid");
if (StringUtils.isNotBlank(dto.getSalesmanSid())) {
String salesmanSid = dto.getSalesmanSid();
loanCustomerRecord.setStaffSid(salesmanSid);
SysUserVo data = sysUserFeign.selectByStaffsid(salesmanSid).getData();
if (null != data) {
loanCustomerRecord.setSalesUserSid(data.getSid());
}
}
baseMapper.updateById(loanCustomerRecord);
} else {
LoanCustomerRecord loanCustomerRecord = new LoanCustomerRecord();
@ -333,6 +351,14 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
}
}
loanCustomerRecord.setNodeState("待提交");
if (StringUtils.isNotBlank(dto.getSalesmanSid())) {
String salesmanSid = dto.getSalesmanSid();
loanCustomerRecord.setStaffSid(salesmanSid);
SysUserVo data = sysUserFeign.selectByStaffsid(salesmanSid).getData();
if (null != data) {
loanCustomerRecord.setSalesUserSid(data.getSid());
}
}
baseMapper.insert(loanCustomerRecord);
}
if (StringUtils.isNotBlank(sid)) {
@ -596,11 +622,13 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
String address = "";
String phone = "";
String invoicingSid = "";
String orgPath = "";
if (StringUtils.isNotBlank(entity.getTaxpayerNo())) {
taxpayerNo = entity.getTaxpayerNo();
FinCompanyInvoicingDetailsVo data = finCompanyInvoicingFeign.selectInvoingByTaxpayerNo(taxpayerNo).getData();
if (null != data) {
invoicingSid = data.getSid();
orgPath = data.getOrgSidPath();
}
}
if (StringUtils.isNotBlank(entity.getBusinessName())) {
@ -614,6 +642,7 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
}
if (StringUtils.isNotBlank(invoicingSid)) {
invoicingDto.setSid(invoicingSid);
invoicingDto.setOrgSidPath(orgPath);
} else {
invoicingDto.setOrgSidPath(entity.getOrgSidPath());
invoicingDto.setCreateBySid(entity.getCreateBySid());
@ -635,11 +664,13 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
String address = "";
String phone = "";
String invoicingSid = "";
String orgPath = "";
if (StringUtils.isNotBlank(customerTempVo.getIDNumber())) {
taxpayerNo = customerTempVo.getIDNumber();
FinCompanyInvoicingDetailsVo data = finCompanyInvoicingFeign.selectInvoingByTaxpayerNo(taxpayerNo).getData();
if (null != data) {
invoicingSid = data.getSid();
orgPath = data.getOrgSidPath();
}
}
if (StringUtils.isNotBlank(customerTempVo.getName())) {
@ -653,6 +684,7 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
}
if (StringUtils.isNotBlank(invoicingSid)) {
invoicingDto.setSid(invoicingSid);
invoicingDto.setOrgSidPath(orgPath);
} else {
invoicingDto.setOrgSidPath(entity.getOrgSidPath());
invoicingDto.setCreateBySid(entity.getCreateBySid());
@ -932,4 +964,183 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
PagerVo<AppCustomerRecordVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean<AppCustomerRecordInitVo> customerRecordInit(String sid, String orgPath, String userSid) {
ResultBean<AppCustomerRecordInitVo> rb = ResultBean.fireFail();
AppCustomerRecordInitVo vo = new AppCustomerRecordInitVo();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
LoanCustomerRecord entity = fetchBySid(sid);
if (entity != null) {
vo.setUserSid(entity.getCreateBySid());
vo.setOrgPath(entity.getOrgSidPath());
if (null != entity.getApplyDate()) {
vo.setApplyDate(sdf.format(entity.getApplyDate()));
}
if (StringUtils.isNotBlank(entity.getRemarks())) {
vo.setRemarks(entity.getRemarks());
}
if (StringUtils.isNotBlank(entity.getIsAnchored())) {
vo.setIsGK(entity.getIsAnchored());
}
// 主管人员
if (StringUtils.isNotBlank(entity.getManageSid())) {
vo.setMangeSid(entity.getManageSid());
}
if (StringUtils.isNotBlank(entity.getManage())) {
vo.setMange(entity.getManage());
}
//销售部门
if (StringUtils.isNotBlank(entity.getSalesDeptSid())) {
vo.setSalesDeptSid(entity.getSalesDeptSid());
}
if (StringUtils.isNotBlank(entity.getSalesDept())) {
vo.setSalesDept(entity.getSalesDept());
}
//销售专员
if (StringUtils.isNotBlank(entity.getSalesman())) {
vo.setSalesman(entity.getSalesman());
}
if (StringUtils.isNotBlank(entity.getSalesUserSid())) {
vo.setSalesmanSid(entity.getSalesUserSid());
}
if (StringUtils.isNotBlank(entity.getTaskId())) {
vo.setTaskId(entity.getTaskId());
}
if (StringUtils.isNotBlank(entity.getProcInstId())) {
vo.setProcInsId(entity.getProcInstId());
}
if (StringUtils.isNotBlank(entity.getApplyName()) && StringUtils.isNotBlank(entity.getDept())) {
vo.setPublishInfo(entity.getDept() + "-" + entity.getApplyName());
}
if (StringUtils.isNotBlank(entity.getCustomerTypeKey())) {
vo.setCustomerTypeKey(entity.getCustomerTypeKey());
}
if (StringUtils.isNotBlank(entity.getCustomerType())) {
vo.setCustomerType(entity.getCustomerType());
}
if (StringUtils.isNotBlank(entity.getProcInstId())) {
vo.setProcInsId(entity.getProcInstId());
}
//组装销售专员
List<AppSalesmanRsk> users = new ArrayList<>();
SysOrganizationListQuery query = new SysOrganizationListQuery();
query.setOrgPath(orgPath);
query.setUserSid(userSid);
List<SysOrganizationListVo> sysOrganizationListVos = sysOrganizationFeign.selectOrgList(query).getData();
sysOrganizationListVos.removeAll(Collections.singleton(null));
if (!sysOrganizationListVos.isEmpty()) {
for (SysOrganizationListVo org : sysOrganizationListVos) {
if (org.getOrgDeptSid().equals(entity.getDeptSid())) {
List<SysOrgStaffVo> staff = org.getStaffinfoVoList();
if (!staff.isEmpty()) {
for (SysOrgStaffVo sysOrgStaffVo : staff) {
AppSalesmanRsk user = new AppSalesmanRsk();
if (StringUtils.isNotBlank(sysOrgStaffVo.getUserSid())) {
user.setDictKey(sysOrgStaffVo.getUserSid());
}
if (StringUtils.isNotBlank(sysOrgStaffVo.getStaffName())) {
user.setDictValue(sysOrgStaffVo.getStaffName());
}
users.add(user);
}
}
}
}
}
vo.setUsers(users);
//查询客户基本信息
if (StringUtils.isNotBlank(entity.getCustomerSid())) {
String customerSid = entity.getCustomerSid();
CrmCustomerTempVo customerTempVo = crmCustomerTempFeign.fetchSid(customerSid).getData();
if (null != customerTempVo) {
if (StringUtils.isNotBlank(customerTempVo.getMobile())) {
vo.setMobile(customerTempVo.getMobile());
}
if (StringUtils.isNotBlank(customerTempVo.getIDNumber())) {
vo.setIdNumber(customerTempVo.getIDNumber());
}
if (StringUtils.isNotBlank(customerTempVo.getCertificateType())) {
vo.setIdType(customerTempVo.getCertificateType());
}
if (StringUtils.isNotBlank(customerTempVo.getEndDate())) {
vo.setIdDate(customerTempVo.getEndDate());
}
if (StringUtils.isNotBlank(customerTempVo.getAddress())) {
vo.setAddressNss(customerTempVo.getAddress());
}
}
}
//查询企业人员信息
// List<LoanCustomerRecordStaffVo> staffVos = loanCustomerRecordStaffService.getStaffsByMainSid(sid).getData();
// staffVos.removeAll(Collections.singleton(null));
// if (!staffVos.isEmpty()) {
// vo.setStaffs(staffVos);
// }
// //信息查询授权书
// List<LoanFile> fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.INFO_LETTER.getAttachType());
// fileList.removeAll(Collections.singleton(null));
// if (!fileList.isEmpty()) {
// List<String> infoLetter = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
// collect(Collectors.toList());
// vo.setInfoLetter(infoLetter);
// }
// //车队挂靠协议
// fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.AGREEMENT.getAttachType());
// fileList.removeAll(Collections.singleton(null));
// if (!fileList.isEmpty()) {
// List<String> agreement = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
// vo.setAgreement(agreement);
// }
// //营业执照
// fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.LICENSE.getAttachType());
// fileList.removeAll(Collections.singleton(null));
// if (!fileList.isEmpty()) {
// List<String> license = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
// vo.setLicense(license);
// }
// //法人和实际控制人身份证
// fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.ID_CARD.getAttachType());
// fileList.removeAll(Collections.singleton(null));
// if (!fileList.isEmpty()) {
// List<String> idCard = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
// vo.setIdCard(idCard);
// }
// //其他资料
// fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.OTHER_INFO.getAttachType());
// fileList.removeAll(Collections.singleton(null));
// if (!fileList.isEmpty()) {
// List<String> otherInfo = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
// vo.setOtherInfo(otherInfo);
// }
//
} else {
vo.setUserSid(userSid);
vo.setOrgPath(orgPath);
vo.setApplyDate(sdf.format(new Date()));
SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
if (null != sysUserVo) {
vo.setApplyName(sysUserVo.getName());
//根据orgPath查询部门
List<String> orgPathsList = Arrays.asList(orgPath.split("/"));
String orgSids = orgPathsList.get(orgPathsList.size() - 1);
vo.setDeptSid(orgSids);
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(orgSids);
if (organizationResultBean.getData() != null) {
String deptName = organizationResultBean.getData().getName();
vo.setDept(deptName);
}
BaseSalesManger baseSalesManger = baseDistributorApplyFeign.selectMangerByDeptSid(orgSids).getData();
if (null != baseSalesManger) {
if (StringUtils.isNotBlank(baseSalesManger.getManageSid())) {
vo.setTempMangeSid(baseSalesManger.getManageSid());
}
if (StringUtils.isNotBlank(baseSalesManger.getManage())) {
vo.setTempMange(baseSalesManger.getManage());
}
}
}
}
return rb.success().setData(vo);
}
}

11
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordFeign.java

@ -1,6 +1,7 @@
package com.yxt.anrui.terminal.api.risk.loancustomerrecord;
import com.yxt.anrui.terminal.api.autoservice.distributor.DisDetailsVo;
import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorQuery;
import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorApplyVo;
import com.yxt.anrui.terminal.api.risk.loantemplate.TemplateFeignFallback;
@ -10,9 +11,7 @@ import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
/**
* @description:
@ -32,4 +31,10 @@ public interface CustomerRecordFeign {
@ResponseBody
ResultBean<PagerVo<CustomerRecordVo>> getCustomerRecordList(@RequestBody PagerQuery<CustomerRecordQuery> pagerQuery);
@ApiOperation("移动端-欠款客户备案初始化")
@GetMapping("/customerRecordInit")
@ResponseBody
ResultBean<CustomerRecordInitVo> customerRecordInit(@RequestParam("sid") String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid);
}

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordFeignFallback.java

@ -16,4 +16,9 @@ public class CustomerRecordFeignFallback implements CustomerRecordFeign {
public ResultBean<PagerVo<CustomerRecordVo>> getCustomerRecordList(PagerQuery<CustomerRecordQuery> pagerQuery) {
return null;
}
@Override
public ResultBean<CustomerRecordInitVo> customerRecordInit(String sid, String orgPath, String userSid) {
return null;
}
}

6
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loancustomerrecord/CustomerRecordRest.java

@ -2,6 +2,7 @@ package com.yxt.anrui.terminal.biz.risk.loancustomerrecord;
import com.yxt.anrui.terminal.api.risk.loancustomerrecord.CustomerRecordFeign;
import com.yxt.anrui.terminal.api.risk.loancustomerrecord.CustomerRecordInitVo;
import com.yxt.anrui.terminal.api.risk.loancustomerrecord.CustomerRecordQuery;
import com.yxt.anrui.terminal.api.risk.loancustomerrecord.CustomerRecordVo;
import com.yxt.common.core.query.PagerQuery;
@ -27,4 +28,9 @@ public class CustomerRecordRest implements CustomerRecordFeign {
public ResultBean<PagerVo<CustomerRecordVo>> getCustomerRecordList(PagerQuery<CustomerRecordQuery> pagerQuery) {
return customerRecordService.getCustomerRecordList(pagerQuery);
}
@Override
public ResultBean<CustomerRecordInitVo> customerRecordInit(String sid, String orgPath, String userSid) {
return null;
}
}

Loading…
Cancel
Save