Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 1 year ago
parent
commit
516561ebcf
  1. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java
  3. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  4. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java
  5. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
  6. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java
  7. 42
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
  8. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
  9. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  10. 34
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  11. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
  12. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  13. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApply.java
  14. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDetailsVo.java
  15. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDto.java
  16. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApply.java
  17. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDetailsVo.java
  18. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDto.java
  19. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApply.java
  20. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java
  21. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java
  22. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java
  23. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java
  24. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java
  25. 84
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java
  26. 15
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDetailsVo.java
  27. 17
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDto.java
  28. 21
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java
  29. 13
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeignFallback.java
  30. 26
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressQuery.java
  31. 15
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java
  32. 24
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.java
  33. 5
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml
  34. 28
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressRest.java
  35. 97
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java

8
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java

@ -138,7 +138,6 @@ public interface BaseDistributorFeign {
@ApiOperation("移动端-销售订单-经销商分页列 表")
@PostMapping("/getDistributorList")
ResultBean<PagerVo<BaseDistributorsListVo>> getDistributorList(@RequestBody PagerQuery<BaseDistributorsListQuery> pagerQuery);
@ApiOperation("移动端-经销商分页列表")
@PostMapping("/getDistributorListOne")
ResultBean<PagerVo<BaseDistributorsVo>> getDistributorListOne(@RequestBody PagerQuery<BaseDistributorsQuery> pagerQuery);
@ -211,8 +210,13 @@ public interface BaseDistributorFeign {
@GetMapping("/selectDisListBySid/{sid}")
ResultBean<BaseDistributorListVo> selectDisListBySid(@PathVariable("sid") String sid);
// //---------------------------------------移动端流程---------------------------------------------//
// @ApiOperation("经销商备案提交")
// @PostMapping("/submitDistributor")
// public ResultBean submitDistributor(@RequestBody @Valid AppSubmitDistributorApplyDto dto);
@ApiOperation("移动销售订单查询开票名称")
@GetMapping("/getInvoiceName")
ResultBean<List<AppDisAndCustm>> getInvoiceName(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath, @RequestParam(value = "search", required = false) String search,@RequestParam("invoiceKey") String invoiceKey);
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java

@ -234,6 +234,11 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
return null;
}
@Override
public ResultBean<List<AppDisAndCustm>> getInvoiceName(String userSid, String orgPath, String search, String invoiceKey) {
return null;
}
// @Override
// public ResultBean submitDistributor(AppSubmitDistributorApplyDto dto) {
// return null;

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@ -1094,6 +1094,17 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
return rb.setMsg("参数错误:userSid");
}
BaseAccadjApply baseAccadjApply = fetchBySid(query.getBusinessSid());
if (query.getUserSid().equals(baseAccadjApply.getCreateBySid())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
return rb.success().setData(resultBean.getData());
}
List<String> purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
String businessTaskId = baseAccadjApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java

@ -141,4 +141,6 @@ public interface BaseDistributorMapper extends BaseMapper<BaseDistributor> {
int updateFlowFiled(Map<String, Object> map);
LoanCustomerRecord selectByRecord(String sid);
List<AppDisAndCustm> getInvoiceName(@Param("useOrgSid") String useOrgSid, @Param("s") String s);
}

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@ -306,4 +306,12 @@
and effectiveDate > NOW()
order by id desc limit 1
</select>
<select id="getInvoiceName" resultType="com.yxt.anrui.base.api.basedistributor.AppDisAndCustm">
select sid id,disName dictValue from base_distributor
where useOrg = #{useOrgSid}
<if test="s != null and s != ''">
and disName like concat('%',#{s},'%')
</if>
</select>
</mapper>

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@ -368,6 +368,11 @@ public class BaseDistributorRest implements BaseDistributorFeign {
return baseDistributorService.selectDisListBySid(sid);
}
@Override
public ResultBean<List<AppDisAndCustm>> getInvoiceName(String userSid, String orgPath, String search, String invoiceKey) {
return baseDistributorService.getInvoiceName(userSid,orgPath,search,invoiceKey);
}
// /*-----------------------------------移动端流程------------------------------------------------*/
// @Override
// public ResultBean submitDistributor(AppSubmitDistributorApplyDto dto) {

42
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@ -1529,6 +1529,48 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
return rb.success();
}
public ResultBean<List<AppDisAndCustm>> getInvoiceName(String userSid, String orgPath, String search, String invoiceKey) {
ResultBean<List<AppDisAndCustm>> rb = ResultBean.fireFail();
List<AppDisAndCustm> list = new ArrayList<>();
if(StringUtils.isBlank(invoiceKey)){
return rb.setMsg("请先选择开票类型");
}else{
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
list = baseMapper.getInvoiceName(useOrgSid,search);
list.removeAll(Collections.singleton(null));
if(!list.isEmpty()){
for (int i = 0; i < list.size(); i++) {
AppDisAndCustm appDisAndCustm = list.get(i);
Extra extra = new Extra();
extra.setSid(appDisAndCustm.getId());
extra.setName(appDisAndCustm.getDictValue());
appDisAndCustm.setExtra(extra);
}
}
if("01".equals(invoiceKey)){
CrmCustomerTempListQuery crmCustomerTempListQuery = new CrmCustomerTempListQuery();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
crmCustomerTempListQuery.setStaffSid(sysUserVo.getStaffSid());
crmCustomerTempListQuery.setOrgPath(orgPath);
crmCustomerTempListQuery.setCertificateTypeKey("01");
crmCustomerTempListQuery.setSearch(search);
List<CrmCustomerTempListVo> crmCustomerTempListVos = crmCustomerTempFeign.selectCustomerList(crmCustomerTempListQuery).getData();
for (CrmCustomerTempListVo crmCustomerTempListVo : crmCustomerTempListVos) {
AppDisAndCustm appDisAndCustm = new AppDisAndCustm();
Extra extra = new Extra();
appDisAndCustm.setDictValue(crmCustomerTempListVo.getName());
appDisAndCustm.setId(crmCustomerTempListVo.getSid());
extra.setSid(appDisAndCustm.getId());
extra.setName(appDisAndCustm.getDictValue());
extra.setInfo(crmCustomerTempListVo.getIdCard());
appDisAndCustm.setExtra(extra);
list.add(appDisAndCustm);
}
}
}
return rb.success().setData(list);
}
////-------------------------------------流程------------------------------------------------/
//

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@ -30,11 +30,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.base.api.basedistributor.BaseDistributor;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppModelInfoVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import org.apache.ibatis.annotations.Mapper;
@ -230,4 +232,8 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
String selectByBusVinSid(String sid);
LoanSolutions seletByOrderSid(String sid);
BaseDistributor selectDis(String affiliatedOrgSid);
CrmCustomerTemp selectCrm(String affiliatedOrgSid);
}

8
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@ -619,4 +619,12 @@
<select id="seletByOrderSid" resultType="com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions">
select * from anrui_riskcenter.loan_solutions where salesOrderSid = #{sid}
</select>
<select id="selectDis" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributor">
select * from anrui_base.base_distributor where sid = #{affiliatedOrgSid}
</select>
<select id="selectCrm" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp">
select * from anrui_crm.crm_customer_temp where sid = #{affiliatedOrgSid}
</select>
</mapper>

34
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -36,6 +36,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandMitQuery;
import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeign;
import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageFeign;
import com.yxt.anrui.base.api.basedistributor.BaseDistributor;
import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo;
import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanFeign;
import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
@ -129,6 +130,7 @@ import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleServ
import com.yxt.anrui.buscenter.biz.bussalesvehicleorder.BusSalesVehicleOrderService;
import com.yxt.anrui.buscenter.biz.bussolutionschange.BusSolutionsChangeService;
import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
import com.yxt.anrui.crm.api.crmvehicledemand.CrmOrderVo;
@ -2206,8 +2208,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
vo.setAffiliatedType("1");
vo.setAffiliatedOrgNameChoose(vo.getAffiliatedCompany());
} else {
vo.setAffiliatedType("0");
vo.setAffiliatedOrgNameWrite(vo.getAffiliatedCompany());
// vo.setAffiliatedType("0");
vo.setAffiliatedType("1");
// vo.setAffiliatedOrgNameWrite(vo.getAffiliatedCompany());
vo.setAffiliatedOrgNameChoose(vo.getAffiliatedCompany());
}
vo.setSaleOrderSid(saleOrderSid);
}
@ -2239,6 +2243,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (StringUtils.isBlank(dto.getUserSid())) {
return rb.setMsg("用户sid不能为空");
}
if("1".equals(dto.getPayTypeKey())){
if(StringUtils.isBlank(dto.getAffiliatedOrgSid())){
return rb.setMsg("开票信息为必选项");
}
}
SysUserVo sysUserInfoVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
//根据客户sid查询客户信息
ResultBean<AppCrmCustomerTempInfoVo> crmCustomerTempInfoVoResultBean = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(dto.getCustomerSid());
@ -2246,7 +2255,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (crmCustomerTempInfoVoResultBean.getSuccess()) {
AppCrmCustomerTempInfoVo customerTempInfoVo = crmCustomerTempInfoVoResultBean.getData();
//挂靠公司填写类型:1选择,0手写
String affiliatedType = dto.getAffiliatedType();
// String affiliatedType = dto.getAffiliatedType();
String affiliatedType = "1";
//新增销售订单
if (StringUtils.isBlank(dto.getSid())) {
BusSalesOrder busSalesOrder = new BusSalesOrder();
@ -2265,6 +2275,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if ("1".equals(affiliatedType)) {
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose());
busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid());
BaseDistributor baseDistributor = baseMapper.selectDis(dto.getAffiliatedOrgSid());
if(baseDistributor == null){
CrmCustomerTemp crmCustomerTemp = baseMapper.selectCrm(dto.getAffiliatedOrgSid());
if(crmCustomerTemp != null){
busSalesOrder.setAffiliatedCompanyType(1);
}
}else{
busSalesOrder.setAffiliatedCompanyType(0);
}
}
//根据用户sid查询分公司sid
String useOrgSid = "";
@ -2342,6 +2361,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if ("1".equals(affiliatedType)) {
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose());
busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid());
BaseDistributor baseDistributor = baseMapper.selectDis(dto.getAffiliatedOrgSid());
if(baseDistributor == null){
CrmCustomerTemp crmCustomerTemp = baseMapper.selectCrm(dto.getAffiliatedOrgSid());
if(crmCustomerTemp != null){
busSalesOrder.setAffiliatedCompanyType(1);
}
}else{
busSalesOrder.setAffiliatedCompanyType(0);
}
}
busSalesOrder.setCustomerPhoto(customerTempInfoVo.getCustomerPhoto());
busSalesOrder.setCustomerClass(customerTempInfoVo.getCustomerType());

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@ -107,7 +107,10 @@
purchaseSystemSid
FROM fin_collection_confirmation
WHERE sid = #{collectionBillSid}
AND useOrgSid = #{useOrgSid}
<if test="useOrgSid != null and useOrgSid != ''">
AND useOrgSid = #{useOrgSid}
</if>
</select>
<select id="getCollectionConfirmDetail"
resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinCollectionConfirmationDetailedVo">

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@ -946,8 +946,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String useOrgSid = "";
if (StringUtils.isNotBlank(orgPath)) {
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
} else {
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
}
AppFinCollectionConfirmationInitVo vo = baseMapper.initCollectionConfirm(collectionBillSid, useOrgSid);
List<AppFinSelectedReceivablesPaymentDetailsVo> list = finSelectedReceivablesDetailedService.selectByCollSid(collectionBillSid);

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApply.java

@ -110,6 +110,8 @@ public class LoanCaseAppealApply extends BaseEntity {
private String priCourtRefer;
@ApiModelProperty("上诉到期日期")
private String appealDueDate; // 上诉到期日期
@ApiModelProperty("案件进程sid")
private String busSid;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDetailsVo.java

@ -121,6 +121,8 @@ public class LoanCaseAppealApplyDetailsVo implements Vo {
private String priCourtRefer;
@ApiModelProperty("上诉到期日期")
private String appealDueDate; // 上诉到期日期
@ApiModelProperty("案件进程sid")
private String busSid;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyDto.java

@ -110,6 +110,8 @@ public class LoanCaseAppealApplyDto implements Dto {
private String expectDate; // 预上/应诉日期
@ApiModelProperty("上诉到期日期")
private String appealDueDate; // 上诉到期日期
@ApiModelProperty("案件进程sid")
private String busSid;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApply.java

@ -108,6 +108,8 @@ public class LoanCaseCloseApply extends BaseEntity {
private String closeDate; // 结案日期
@ApiModelProperty("结案说明")
private String closeRemarks; // 结案说明
@ApiModelProperty("案件进程sid")
private String busSid;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDetailsVo.java

@ -119,6 +119,8 @@ public class LoanCaseCloseApplyDetailsVo implements Vo {
private String closeDate; // 结案日期
@ApiModelProperty("结案说明")
private String closeRemarks; // 结案说明
@ApiModelProperty("案件进程sid")
private String busSid;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancasecloseapply/LoanCaseCloseApplyDto.java

@ -114,6 +114,8 @@ public class LoanCaseCloseApplyDto implements Dto {
private String closeDate; // 结案日期
@ApiModelProperty("结案说明")
private String closeRemarks; // 结案说明
@ApiModelProperty("案件进程sid")
private String busSid;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApply.java

@ -100,8 +100,8 @@ public class LoanCaseEntrustLawyerApply extends BaseEntity {
private String bankName; // 资方
@ApiModelProperty("资方合同编号")
private String bankContractNo;
@ApiModelProperty("业务sid")
private String busSid; // 业务sid
@ApiModelProperty("案件进程sid")
private String busSid;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java

@ -103,8 +103,8 @@ public class LoanCaseEntrustLawyerApplyDetailsVo implements Vo {
private String bankName; // 资方
@ApiModelProperty("资方合同编号")
private String bankContractNo;
@ApiModelProperty("业务sid")
private String busSid; // 业务sid
@ApiModelProperty("案件进程sid")
private String busSid;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java

@ -104,8 +104,8 @@ public class LoanCaseEntrustLawyerApplyDto implements Dto {
private String bankName; // 资方
@ApiModelProperty("资方合同编号")
private String bankContractNo;
@ApiModelProperty("业务sid")
private String busSid; // 业务sid
@ApiModelProperty("案件进程sid")
private String busSid;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java

@ -106,6 +106,8 @@ public class LoanCaseExecuteApply extends BaseEntity {
private String executeDeadline; // 执行时限
@ApiModelProperty("执行立案金额")
private String executeRegisMoney; // 执行立案金额
@ApiModelProperty("案件进程sid")
private String busSid;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java

@ -117,6 +117,8 @@ public class LoanCaseExecuteApplyDetailsVo implements Vo {
private String executeDeadline; // 执行时限
@ApiModelProperty("执行立案金额")
private String executeRegisMoney; // 执行立案金额
@ApiModelProperty("案件进程sid")
private String busSid;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java

@ -112,6 +112,8 @@ public class LoanCaseExecuteApplyDto implements Dto {
private String executeDeadline; // 执行时限
@ApiModelProperty("执行立案金额")
private String executeRegisMoney; // 执行立案金额
@ApiModelProperty("案件进程sid")
private String busSid;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")

84
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java

@ -0,0 +1,84 @@
package com.yxt.anrui.riskcenter.api.loancaseprogress;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author Administrator
* @description
* @date 2023/8/16 14:34
*/
@Data
@ApiModel(value = "案件进程管理", description = "案件进程管理")
@TableName("loan_case_progress")
public class LoanCaseProgress extends BaseEntity {
@ApiModelProperty("创建部门")
private String createDept;
@ApiModelProperty("创建部门sid")
private String createDeptSid;
@ApiModelProperty("创建人")
private String createByName;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("客户sid")
private String customerSid;
@ApiModelProperty("贷款人sid")
private String loanSid;
@ApiModelProperty("贷款人")
private String loanName;
@ApiModelProperty("贷款人证件号码")
private String idNumber;
@ApiModelProperty("贷款合同编号")
private String loanContractNo;
@ApiModelProperty("资方")
private String bankName;
@ApiModelProperty("资方合同编号")
private String bankContractNo;
@ApiModelProperty("公司负责人")
private String companyHead;
@ApiModelProperty("公司负责人sid")
private String companyHeadSid;
@ApiModelProperty("法务部门负责人")
private String legalHead;
@ApiModelProperty("法务部门负责人sid")
private String legalHeadSid;
@ApiModelProperty("案件编号")
private String caseNo;
@ApiModelProperty("案件类型Key")
private String caseTypeKey;
@ApiModelProperty("案件类型")
private String caseType;
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("使用组织全路径")
private String orgSidPath;
@ApiModelProperty("欠款合计")
private BigDecimal amountAll;
@ApiModelProperty("是否全额诉讼")
private String full;
@ApiModelProperty("起诉金额合计")
private BigDecimal sueMoney;
@ApiModelProperty("部分诉讼说明")
private String sueShows;
@ApiModelProperty("起诉原因")
private String sueReason;
@ApiModelProperty("诉讼时效")
private String sueAging;
@ApiModelProperty("案件当前阶段")
private String caseStage;
@ApiModelProperty("案件当前阶段编号")
private String caseStageNo;
@ApiModelProperty("案件当前环节")
private String caseTache;
@ApiModelProperty("案件当前环节编号")
private String caseTacheNo;
@ApiModelProperty("业务来源sid")
private String busSid;
}

15
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDetailsVo.java

@ -0,0 +1,15 @@
package com.yxt.anrui.riskcenter.api.loancaseprogress;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/8/21 9:13
*/
@Data
public class LoanCaseProgressDetailsVo implements Vo {
}

17
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressDto.java

@ -0,0 +1,17 @@
package com.yxt.anrui.riskcenter.api.loancaseprogress;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/8/21 9:12
*/
@Data
public class LoanCaseProgressDto implements Dto {
}

21
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java

@ -0,0 +1,21 @@
package com.yxt.anrui.riskcenter.api.loancaseprogress;
import io.swagger.annotations.Api;
import org.springframework.cloud.openfeign.FeignClient;
/**
* @description: 案件进程管理
* @author: fan
* @date: 2023/7/6
**/
@Api(tags = "案件进程管理")
@FeignClient(
contextId = "anrui-riskcenter-LoanCaseProgress",
name = "anrui-riskcenter",
path = "v1/LoanCaseProgress",
fallback = LoanCaseProgressFeignFallback.class)
public interface LoanCaseProgressFeign {
}

13
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeignFallback.java

@ -0,0 +1,13 @@
package com.yxt.anrui.riskcenter.api.loancaseprogress;
import org.springframework.stereotype.Component;
/**
* @author Administrator
* @description
* @date 2023/8/16 14:36
*/
@Component
public class LoanCaseProgressFeignFallback implements LoanCaseProgressFeign {
}

26
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressQuery.java

@ -0,0 +1,26 @@
package com.yxt.anrui.riskcenter.api.loancaseprogress;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/8/16 15:05
*/
@Data
public class LoanCaseProgressQuery implements Query {
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("菜单sid")
private String menuSid;
@ApiModelProperty("菜单url")
private String menuUrl;
@ApiModelProperty("用户sid")
private String userSid;
}

15
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java

@ -0,0 +1,15 @@
package com.yxt.anrui.riskcenter.api.loancaseprogress;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/8/16 15:04
*/
@Data
public class LoanCaseProgressVo implements Vo {
}

24
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.java

@ -0,0 +1,24 @@
package com.yxt.anrui.riskcenter.biz.loancaseprogress;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.loancaseprogress.LoanCaseProgress;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/**
* @description:
* @author: fan
* @date: 2023/8/21
**/
@Mapper
public interface LoanCaseProgressMapper extends BaseMapper<LoanCaseProgress> {
}

5
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressMapper">
</mapper>

28
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressRest.java

@ -0,0 +1,28 @@
package com.yxt.anrui.riskcenter.biz.loancaseprogress;
import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgressFeign;
import com.yxt.anrui.riskcenter.api.loanparameter.*;
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.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @description:
* @author: fan
* @date: 2023/8/21
**/
@Api(tags = "案件进程管理")
@RestController
@RequestMapping("v1/LoanCaseProgress")
public class LoanCaseProgressRest implements LoanCaseProgressFeign {
@Autowired
private LoanCaseProgressService loanCaseProgressService;
}

97
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java

@ -0,0 +1,97 @@
package com.yxt.anrui.riskcenter.biz.loancaseprogress;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgress;
import com.yxt.anrui.riskcenter.api.loanparameter.*;
import com.yxt.common.base.service.MybatisBaseService;
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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @description:
* @author: fan
* @date: 2023/8/21
**/
@Service
public class LoanCaseProgressService extends MybatisBaseService<LoanCaseProgressMapper, LoanCaseProgress> {
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
// public PagerVo<LoanParameterVo> listPage(PagerQuery<LoanParameterQuery> pq) {
// IPage<LoanParameter> page = PagerUtil.queryToPage(pq);
// LoanParameterQuery pagerQuery = pq.getParams();
// QueryWrapper<LoanParameter> qw = new QueryWrapper<>();
// //=======================
// PrivilegeQuery privilegeQuery = new PrivilegeQuery();
// privilegeQuery.setOrgPath(pagerQuery.getOrgPath());
// privilegeQuery.setMenuSid(pagerQuery.getMenuSid());
// privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl());
// privilegeQuery.setUserSid(pagerQuery.getUserSid());
// ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
// if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
// //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
// String orgSidPath = pagerQuery.getOrgPath();
// orgSidPath = orgSidPath + "/";
// int i1 = orgSidPath.indexOf("/");
// int i2 = orgSidPath.indexOf("/", i1 + 1);
// int i3 = orgSidPath.indexOf("/", i2 + 1);
// int i4 = orgSidPath.indexOf("/", i3 + 1);
// String orgLevelKey = defaultIdReltBean.getData();
// if ("1".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i1);
// qw.like("orgSidPath", orgSidPath);
// } else if ("2".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i2);
// qw.like("orgSidPath", orgSidPath);
// } else if ("3".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i3);
// qw.like("orgSidPath", orgSidPath);
// } else if ("4".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i4);
// qw.like("orgSidPath", orgSidPath);
// } else if ("5".equals(orgLevelKey)) {
// qw.eq("createBySid", pagerQuery.getUserSid());
// } else {
// PagerVo<LoanParameterVo> p = new PagerVo<>();
// return p;
// }
// } else {
// PagerVo<LoanParameterVo> p = new PagerVo<>();
// return p;
// }
// //=======================
// //参数编码
// if (StringUtils.isNotBlank(pagerQuery.getParameterNo())) {
// qw.like("parameterNo", pagerQuery.getParameterNo());
// }
// //参数名称
// if (StringUtils.isNotBlank(pagerQuery.getParameterName())) {
// qw.like("parameterName", pagerQuery.getParameterName());
// }
// qw.eq("isDelete", 0);
// qw.orderByDesc("createTime");
// IPage<LoanParameterVo> pagging = baseMapper.listPage(page, qw);
// PagerVo<LoanParameterVo> p = PagerUtil.pageToVo(pagging, null);
// return p;
// }
}
Loading…
Cancel
Save