diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index b575f6e930..058de1da03 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -58,7 +58,7 @@ public enum ProcDefEnum { LOANTEMPLATEAPPLY("定制金融方案", "process_9q5omebi:2:2685008"), LOANHOMEVISITAPPEALAPPLY("家访考察申诉", "process_8ujil3h3:1:3665004"), BUSVALCUSTFILING("价值客户备案申请", "process_n8fwpitk:2:5085004"), - LOANCUSTOMERRECORD("欠款客户备案", "process_x6o0chx9:1:5715004"), + LOANCUSTOMERRECORD("欠款客户备案", "process_x6o0chx9:3:6022504"), BUSSOLUTIONSCHANGE("金融方案变更", "process_x6edjfoj:1:5932504"), /******************************测试流程id*********************************************/ diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeign.java index da1a855989..47b2252552 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeign.java @@ -14,6 +14,8 @@ import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.io.IOException; +import java.net.URISyntaxException; import java.util.List; @@ -124,7 +126,6 @@ public interface LoanCustomerRecordFeign { @PostMapping(value = "/delegate") public ResultBean delegate(@RequestBody CustomerRecordDelegateQuery distributorDelegateQuery); - //---------------------------app-------------------------------- @ApiOperation("移动端-欠款客户备案分页列表") @PostMapping("/getCustomerRecordList") @@ -134,7 +135,7 @@ public interface LoanCustomerRecordFeign { @ApiOperation("移动端-欠款客户备案初始化") @GetMapping("/customerRecordInit") @ResponseBody - ResultBean customerRecordInit(@RequestParam("sid") String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid); + ResultBean customerRecordInit(@RequestParam(value = "sid", required = false) String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid); @ApiOperation("移动端-欠款客户备案新增修改") @PostMapping("/saveCustomerRecord") @@ -150,4 +151,9 @@ public interface LoanCustomerRecordFeign { @PostMapping("/submitCustomerRecord") public ResultBean submitCustomerRecord(@RequestBody @Valid AppSubmitCustomerRecordDto dto); + @ApiOperation("移动端-查询挂靠公司") + @GetMapping("/selectAffiliated") + @ResponseBody + ResultBean> selectAffiliated(@RequestParam("orgPath") String orgPath, @RequestParam(value = "name", required = false) String name); + } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeignFallback.java index b03d329cee..295dbf71a6 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordFeignFallback.java @@ -85,6 +85,7 @@ public class LoanCustomerRecordFeignFallback implements LoanCustomerRecordFeign return null; } + @Override public ResultBean> getCustomerRecordList(PagerQuery pagerQuery) { return null; @@ -109,4 +110,9 @@ public class LoanCustomerRecordFeignFallback implements LoanCustomerRecordFeign public ResultBean submitCustomerRecord(AppSubmitCustomerRecordDto dto) { return null; } + + @Override + public ResultBean> selectAffiliated(String orgPath, String name) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppCustomerRecordInitVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppCustomerRecordInitVo.java index 9113f84a9f..c20dfb7393 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppCustomerRecordInitVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppCustomerRecordInitVo.java @@ -81,5 +81,6 @@ public class AppCustomerRecordInitVo implements Vo { private List agreement = new ArrayList<>(); @ApiModelProperty("其他资料") private List otherInfo = new ArrayList<>(); - + private String file1; + private String file2; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppSearchSelect.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppSearchSelect.java new file mode 100644 index 0000000000..99fe388cfc --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppSearchSelect.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.riskcenter.api.loancustomerrecord.app; + +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/10/18 15:48 + */ +@Data +public class AppSearchSelect { + // 必须有 一般为sid + private String id; + private String checkId; + private String dictKey; + private boolean selected; + //必须有 显示的文字 + private String dictValue; + + // 额外的内容 + private AppSelectObject extra; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppSelectObject.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppSelectObject.java new file mode 100644 index 0000000000..b76c6ea3c3 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppSelectObject.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.riskcenter.api.loancustomerrecord.app; + +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/10/18 15:49 + */ +@Data +public class AppSelectObject { + //企业名称 + private String disName; + //统一社会信用代码 + private String registNum; + //企业负责人 + private String contract; + //联系方式 + private String mobile2; + //法定代表人 + private String legalName; + //地址 + private String registDetailAddress; +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordRest.java index 6293675965..1c42334fac 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordRest.java @@ -7,16 +7,19 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.riskcenter.api.loancustomerrecord.*; import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.*; import com.yxt.anrui.riskcenter.api.loancustomerrecord.flow.*; -import com.yxt.anrui.riskcenter.api.loanfinpolicyrecordapply.LoanFinPolicyRecordApply; -import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; 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.core.io.ClassPathResource; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; import java.util.List; @@ -28,6 +31,8 @@ public class LoanCustomerRecordRest implements LoanCustomerRecordFeign { @Autowired private LoanCustomerRecordService loanCustomerRecordService; + @Autowired + private HttpServletResponse response; @Override public ResultBean> listPage(PagerQuery pq) { @@ -117,6 +122,7 @@ public class LoanCustomerRecordRest implements LoanCustomerRecordFeign { return loanCustomerRecordService.delegate(customerRecordDelegateQuery); } + @Override public ResultBean> getCustomerRecordList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); @@ -126,7 +132,7 @@ public class LoanCustomerRecordRest implements LoanCustomerRecordFeign { @Override public ResultBean customerRecordInit(String sid, String orgPath, String userSid) { - return loanCustomerRecordService.customerRecordInit(sid,orgPath,userSid); + return loanCustomerRecordService.customerRecordInit(sid, orgPath, userSid); } @Override @@ -143,4 +149,9 @@ public class LoanCustomerRecordRest implements LoanCustomerRecordFeign { public ResultBean submitCustomerRecord(AppSubmitCustomerRecordDto dto) { return loanCustomerRecordService.submitCustomerRecord(dto); } + + @Override + public ResultBean> selectAffiliated(String orgPath, String name) { + return loanCustomerRecordService.selectAffiliated(orgPath, name); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java index 7c2708c3d6..b1eb30a45d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java @@ -54,6 +54,7 @@ import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.biz.loancustomerrecordstaff.LoanCustomerRecordStaffService; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; +import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -113,6 +114,9 @@ public class LoanCustomerRecordService extends MybatisBaseService variables = BeanUtil.beanToMap(dto); Map appMap = new HashMap<>(); //若有网关,则赋值网关中判断的字段。 + boolean isTure = true; + //去查询是否同意 + if (StringUtils.isNotBlank(entity.getSalesUserSid())) { + if (!entity.getCreateBySid().equals(entity.getSalesUserSid())) { + isTure = false; + } + } + variables.put("isTure", isTure); variables.put("businessSid", businessSid); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -543,7 +555,11 @@ public class LoanCustomerRecordService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); //若有网关,则赋值网关中判断的字段。 - + boolean isTure = true; + //去查询是否同意 + if (StringUtils.isNotBlank(loanCustomerRecord.getSalesUserSid())) { + if (!loanCustomerRecord.getCreateBySid().equals(loanCustomerRecord.getSalesUserSid())) { + isTure = false; + } + } + variables.put("isTure", isTure); + if (bv.getTaskDefKey().equals("Activity_1078xxs")) { + if (StringUtils.isNotBlank(loanCustomerRecord.getManageSid())) { + bv.setNextNodeUserSids(loanCustomerRecord.getManageSid()); + } else { + bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId()); + } + } variables.put("businessSid", businessSid); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -843,6 +873,14 @@ public class LoanCustomerRecordService extends MybatisBaseService resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { @@ -939,8 +977,18 @@ public class LoanCustomerRecordService extends MybatisBaseService variables = new HashMap<>(); + //根据业务sid查询排产信息 LoanCustomerRecord loanCustomerRecord = fetchBySid(query.getBusinessSid()); + //若有网关,则赋值网关中判断的字段。 + boolean isTure = true; + //去查询是否同意 + if (StringUtils.isNotBlank(loanCustomerRecord.getSalesUserSid())) { + if (!loanCustomerRecord.getCreateBySid().equals(loanCustomerRecord.getSalesUserSid())) { + isTure = false; + } + } + variables.put("isTure", isTure); bv.setFormVariables(variables); bv.setModelId(loanCustomerRecord.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); @@ -957,6 +1005,15 @@ public class LoanCustomerRecordService extends MybatisBaseService variables = new HashMap<>(); //根据业务sid查询排产信息 LoanCustomerRecord loanCustomerRecord = fetchBySid(query.getBusinessSid()); + //若有网关,则赋值网关中判断的字段。 + boolean isTure = true; + //去查询是否同意 + if (StringUtils.isNotBlank(loanCustomerRecord.getSalesUserSid())) { + if (!loanCustomerRecord.getCreateBySid().equals(loanCustomerRecord.getSalesUserSid())) { + isTure = false; + } + } + variables.put("isTure", isTure); bv.setFormVariables(variables); bv.setModelId(loanCustomerRecord.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); @@ -1050,10 +1107,21 @@ public class LoanCustomerRecordService extends MybatisBaseService orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()); @@ -1547,6 +1638,15 @@ public class LoanCustomerRecordService extends MybatisBaseService variables = BeanUtil.beanToMap(dto); Map appMap = new HashMap<>(); //若有网关,则赋值网关中判断的字段。 + //若有网关,则赋值网关中判断的字段。 + boolean isTure = true; + //去查询是否同意 + if (StringUtils.isNotBlank(loanCustomerRecord.getSalesUserSid())) { + if (!loanCustomerRecord.getCreateBySid().equals(loanCustomerRecord.getSalesUserSid())) { + isTure = false; + } + } + variables.put("isTure", isTure); variables.put("businessSid", businessSid); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -1562,7 +1662,12 @@ public class LoanCustomerRecordService extends MybatisBaseService> selectAffiliated(String orgPath, String name) { + ResultBean> rb = ResultBean.fireFail(); + List list = new ArrayList<>(); + List data = selectInvoingByOrgPath(orgPath).getData(); + if (!data.isEmpty()) { + if (StringUtils.isNotBlank(name)) { + data = data.stream() + .filter((LoanFinCompanyInvoicingVo s) -> s.getBusinessName().contains(name)) + .collect(Collectors.toList()); + } + for (LoanFinCompanyInvoicingVo datum : data) { + AppSearchSelect appSearchSelect = new AppSearchSelect(); + AppSelectObject appSelectObject = new AppSelectObject(); + if (StringUtils.isNotBlank(datum.getTaxpayerNo())) { + appSearchSelect.setId(datum.getTaxpayerNo()); + appSelectObject.setRegistNum(datum.getTaxpayerNo()); + } + if (StringUtils.isNotBlank(datum.getAddress())) { + appSelectObject.setRegistDetailAddress(datum.getAddress()); + } + if (StringUtils.isNotBlank(datum.getPhone())) { + appSelectObject.setMobile2(datum.getPhone()); + } + if (StringUtils.isNotBlank(datum.getBusinessName())) { + appSearchSelect.setDictValue(datum.getBusinessName()); + appSelectObject.setDisName(datum.getBusinessName()); + } + appSearchSelect.setExtra(appSelectObject); + list.add(appSearchSelect); + } + } + return rb.success().setData(list); + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordFeign.java index c64b376851..350508e65b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordFeign.java @@ -12,6 +12,7 @@ import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.util.List; /** * @description: @@ -35,7 +36,7 @@ public interface CustomerRecordFeign { @ApiOperation("移动端-欠款客户备案初始化") @GetMapping("/customerRecordInit") @ResponseBody - ResultBean customerRecordInit(@RequestParam("sid") String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid); + ResultBean customerRecordInit(@RequestParam(value = "sid", required = false) String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid); @ApiOperation("移动端-欠款客户备案新增修改") @@ -48,6 +49,11 @@ public interface CustomerRecordFeign { @ResponseBody ResultBean deleteCustomerRecord(@PathVariable("sid") String sid); + @ApiOperation("移动端-查询挂靠公司") + @GetMapping("/selectAffiliated") + @ResponseBody + ResultBean> selectAffiliated(@RequestParam("orgPath") String orgPath, @RequestParam(value = "name", required = false) String name); + //-------------------------流程----------------------------------------- diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordFeignFallback.java index 2937516f53..f24089044b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordFeignFallback.java @@ -6,6 +6,8 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; +import java.util.List; + /** * @description: * @author: fzz @@ -33,6 +35,11 @@ public class CustomerRecordFeignFallback implements CustomerRecordFeign { return null; } + @Override + public ResultBean> selectAffiliated(String orgPath, String name) { + return null; + } + @Override public ResultBean submitCustomerRecord(SubmitCustomerRecordDto dto) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordInitVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordInitVo.java index 8bba4c7f55..3dbd8b0828 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordInitVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordInitVo.java @@ -82,5 +82,7 @@ public class CustomerRecordInitVo implements Vo { @ApiModelProperty("其他资料") private List otherInfo = new ArrayList<>(); + private String file1; + private String file2; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/SearchSelect.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/SearchSelect.java new file mode 100644 index 0000000000..daf35f95e2 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/SearchSelect.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.terminal.api.risk.loancustomerrecord; + +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/10/18 15:38 + */ +@Data +public class SearchSelect { + // 必须有 一般为sid + private String id; + private String checkId; + private String dictKey; + private boolean selected; + //必须有 显示的文字 + private String dictValue; + + // 额外的内容 + private SelectObject extra; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/SelectObject.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/SelectObject.java new file mode 100644 index 0000000000..145bcbca36 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/SelectObject.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.terminal.api.risk.loancustomerrecord; + +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/10/18 15:43 + */ +@Data +public class SelectObject { + + //企业名称 + private String disName; + //统一社会信用代码 + private String registNum; + //企业负责人 + private String contract; + //联系方式 + private String mobile2; + //法定代表人 + private String legalName; + //地址 + private String registDetailAddress; + +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loancustomerrecord/CustomerRecordRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loancustomerrecord/CustomerRecordRest.java index e174924ff7..becb50b0b1 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loancustomerrecord/CustomerRecordRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loancustomerrecord/CustomerRecordRest.java @@ -10,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import java.util.List; + /** * @description: * @author: fzz @@ -42,6 +44,11 @@ public class CustomerRecordRest implements CustomerRecordFeign { return customerRecordService.deleteCustomerRecord(sid); } + @Override + public ResultBean> selectAffiliated(String orgPath, String name) { + return customerRecordService.selectAffiliated(orgPath,name); + } + @Override public ResultBean submitCustomerRecord(SubmitCustomerRecordDto dto) { return customerRecordService.submitCustomerRecord(dto); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loancustomerrecord/CustomerRecordService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loancustomerrecord/CustomerRecordService.java index f092e943e8..7cb1468928 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loancustomerrecord/CustomerRecordService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loancustomerrecord/CustomerRecordService.java @@ -11,10 +11,7 @@ import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.*; import com.yxt.anrui.riskcenter.api.loancustomerrecord.flow.CustomerRecordCompleteDto; import com.yxt.anrui.riskcenter.api.loancustomerrecord.flow.CustomerRecordDelegateQuery; import com.yxt.anrui.riskcenter.api.loancustomerrecord.flow.CustomerRecordTaskQuery; -import com.yxt.anrui.terminal.api.risk.loancustomerrecord.CustomerRecordDto; -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.anrui.terminal.api.risk.loancustomerrecord.*; import com.yxt.anrui.terminal.api.risk.loancustomerrecord.flow.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -22,6 +19,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -192,4 +190,22 @@ public class CustomerRecordService { ResultBean delegate = loanCustomerRecordFeign.delegate(delegateQuery1); return rb.success(); } + + public ResultBean> selectAffiliated(String orgPath, String name) { + ResultBean> rb = ResultBean.fireFail(); + ResultBean> resultBean = loanCustomerRecordFeign.selectAffiliated(orgPath, name); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + List list = new ArrayList<>(); + List data = resultBean.getData(); + if (!data.isEmpty()) { + for (AppSearchSelect datum : data) { + SearchSelect searchSelect = new SearchSelect(); + BeanUtil.copyProperties(datum, searchSelect); + list.add(searchSelect); + } + } + return rb.success().setData(list); + } }