diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java index 80b042d01c..c6141ee655 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java @@ -101,7 +101,7 @@ public interface BusSalesOrderBorrowerFeign { @ResponseBody public ResultBean> fetchDetailsByOrderSid(@PathVariable("orderSid") String orderSid); - @ApiOperation("修改贷款人状态") + @ApiOperation("修改贷款人及贷款合同状态") @PostMapping("/updateState") @ResponseBody ResultBean updateState(@RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid,@RequestParam("state") String state); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java index 72fe0512b7..60353497d5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java @@ -99,4 +99,7 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper idCardImages = new ArrayList<>(); @ApiModelProperty("贷前信用审核人员列表") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.xml index 7c8849723e..2ea54ebd13 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.xml @@ -80,24 +80,27 @@ \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java index 7734305ffd..644d7ce4f9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java @@ -102,656 +102,652 @@ import java.util.stream.Collectors; @Service public class LoanHomevisitAppealService extends MybatisBaseService { - @Autowired - private SysUserFeign sysUserFeign; - @Autowired - private BusSalesOrderFeign busSalesOrderFeign; - @Autowired - private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService; - @Autowired - private LoanHomevisitInvestigateService loanHomevisitInvestigateService; - @Autowired - private FileUploadComponent fileUploadComponent; - @Autowired - private SysOrganizationFeign sysOrganizationFeign; - @Autowired - private MessageFeign messageFeign; - @Autowired - private FlowFeign flowFeign; - @Autowired - private FlowableFeign flowableFeign; - @Autowired - private FlowTaskFeign flowTaskFeign; - @Autowired - private LoanHomevisitFileexamineService loanHomevisitFileexamineService; - @Autowired - private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign; - - public PagerVo listPageVo(PagerQuery pq) { - LoanHomevisitAppealQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("li.state", 2); - if (StringUtils.isNotBlank(query.getMenuSid())) { - //======================= - PrivilegeQuery privilegeQuery = new PrivilegeQuery(); - privilegeQuery.setOrgPath(query.getOrgSidPath()); - privilegeQuery.setMenuSid(query.getMenuSid()); - privilegeQuery.setUserSid(query.getUserSid()); - ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { - //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgSidPath(); - 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("bo.orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("bo.orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("bo.orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("bo.orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("bo.createBySid", query.getUserSid()); - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } - if (StringUtils.isNotBlank(query.getUseOrgName())) { - qw.like("bo.useOrgName", query.getUseOrgName()); - } - if (StringUtils.isNotBlank(query.getSaleDeptName())) { - qw.like("bo.orgName", query.getSaleDeptName()); - } - if (StringUtils.isNotBlank(query.getStaffName())) { - qw.like("bo.staffName", query.getStaffName()); - } - if (StringUtils.isNotBlank(query.getContractNo())) { - qw.like("bo.contractNo", query.getContractNo()); - } - if (StringUtils.isNotBlank(query.getLoanPeoName())) { - qw.like("bb.borrowerName", query.getLoanPeoName()); - } - if (StringUtils.isNotBlank(query.getBankName())) { - qw.like("bb.bankName", query.getBankName()); - } - if (StringUtils.isNotBlank(query.getHomeVisStaffName())) { - qw.like("li.homeVisStaffName", query.getHomeVisStaffName()); - } - if (StringUtils.isNotBlank(query.getInvestigateValue())) { - qw.like("li.investigateValue", query.getInvestigateValue()); - } - String orderStartDate = query.getOrderStartDate(); - String orderEndDate = query.getOrderEndDate(); - qw.apply(StringUtils.isNotBlank(orderStartDate), "date_format (bo.createDate,'%Y-%m-%d') >= date_format('" + orderStartDate + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(orderEndDate), "date_format (bo.createDate,'%Y-%m-%d') <= date_format('" + orderEndDate + "','%Y-%m-%d')" - ); - String resHomeVisStartDate = query.getResHomeVisStartDate(); - String resHomeVisEndDate = query.getResHomeVisEndDate(); - qw.apply(StringUtils.isNotBlank(resHomeVisStartDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') >= date_format('" + resHomeVisStartDate + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(resHomeVisEndDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') <= date_format('" + resHomeVisEndDate + "','%Y-%m-%d')" - ); - if (StringUtils.isNotBlank(query.getNames())){ - qw.and(wrapper -> wrapper.like("bo.contractNo", query.getNames()).or().like("bb.borrowerName", query.getNames()).or().like("li.homeVisStaffName", query.getNames())); - } - qw.orderByDesc("li.createTime"); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private BusSalesOrderFeign busSalesOrderFeign; + @Autowired + private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService; + @Autowired + private LoanHomevisitInvestigateService loanHomevisitInvestigateService; + @Autowired + private FileUploadComponent fileUploadComponent; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private MessageFeign messageFeign; + @Autowired + private FlowFeign flowFeign; + @Autowired + private FlowableFeign flowableFeign; + @Autowired + private FlowTaskFeign flowTaskFeign; + @Autowired + private LoanHomevisitFileexamineService loanHomevisitFileexamineService; + @Autowired + private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign; - public PagerVo getHomeAppealList2(PagerQuery pq) { - LoanHomevisitAppealQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getMenuSid())) { - //======================= - PrivilegeQuery privilegeQuery = new PrivilegeQuery(); - privilegeQuery.setOrgPath(query.getOrgSidPath()); - privilegeQuery.setMenuSid(query.getMenuSid()); - privilegeQuery.setUserSid(query.getUserSid()); - ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { - //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgSidPath(); - 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("bo.orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("bo.orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("bo.orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("bo.orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("bo.createBySid", query.getUserSid()); - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } - if (StringUtils.isNotBlank(query.getNames())){ - qw.and(wrapper -> wrapper.like("bb.borrowerName", query.getNames()).or().like("li.homeVisStaffName", query.getNames())); - } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.getHomeAppealList2(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public String saveOrUpdateDto(LoanHomevisitAppealDto dto){ + public PagerVo listPageVo(PagerQuery pq) { + LoanHomevisitAppealQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("li.state", 2); + if (StringUtils.isNotBlank(query.getMenuSid())) { + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgSidPath()); + privilegeQuery.setMenuSid( query.getMenuSid()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgSidPath(); + 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("bo.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("bo.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getUseOrgName())) { + qw.like("bo.useOrgName", query.getUseOrgName()); + } + if (StringUtils.isNotBlank(query.getSaleDeptName())) { + qw.like("bo.orgName", query.getSaleDeptName()); + } + if (StringUtils.isNotBlank(query.getStaffName())) { + qw.like("bo.staffName", query.getStaffName()); + } + if (StringUtils.isNotBlank(query.getContractNo())) { + qw.like("bo.contractNo", query.getContractNo()); + } + if (StringUtils.isNotBlank(query.getLoanPeoName())) { + qw.like("bb.borrowerName", query.getLoanPeoName()); + } + if (StringUtils.isNotBlank(query.getBankName())) { + qw.like("bb.bankName", query.getBankName()); + } + if (StringUtils.isNotBlank(query.getHomeVisStaffName())) { + qw.like("li.homeVisStaffName", query.getHomeVisStaffName()); + } + if (StringUtils.isNotBlank(query.getInvestigateValue())) { + qw.like("li.investigateValue", query.getInvestigateValue()); + } + String orderStartDate = query.getOrderStartDate(); + String orderEndDate = query.getOrderEndDate(); + qw.apply(StringUtils.isNotBlank(orderStartDate), "date_format (bo.createDate,'%Y-%m-%d') >= date_format('" + orderStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(orderEndDate), "date_format (bo.createDate,'%Y-%m-%d') <= date_format('" + orderEndDate + "','%Y-%m-%d')" + ); + String resHomeVisStartDate = query.getResHomeVisStartDate(); + String resHomeVisEndDate = query.getResHomeVisEndDate(); + qw.apply(StringUtils.isNotBlank(resHomeVisStartDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') >= date_format('" + resHomeVisStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(resHomeVisEndDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') <= date_format('" + resHomeVisEndDate + "','%Y-%m-%d')" + ); + if (StringUtils.isNotBlank(query.getNames())) { + qw.and(wrapper -> wrapper.like("bo.contractNo", query.getNames()).or().like("bb.borrowerName", query.getNames()).or().like("li.homeVisStaffName", query.getNames())); + } + qw.orderByDesc("li.createTime"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo getHomeAppealList2(PagerQuery pq) { + LoanHomevisitAppealQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getMenuSid())) { + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgSidPath()); + privilegeQuery.setMenuSid(query.getMenuSid()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgSidPath(); + 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("bo.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("bo.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getNames())) { + qw.and(wrapper -> wrapper.like("bb.borrowerName", query.getNames()).or().like("li.homeVisStaffName", query.getNames())); + } + qw.orderByDesc("la.createTime"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.getHomeAppealList2(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public String saveOrUpdateDto(LoanHomevisitAppealDto dto) { + String dtoSid = dto.getSsSid(); + List ssImages = dto.getSsImages(); + if (StringUtils.isBlank(dtoSid)) { + //生成单据编号 + String billNo = ""; + //查询家访考察信息 + LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(dto.getKcSid()); + //查询销售订单信息 + AppOrderDetailsVo data = busSalesOrderFeign.getSaleOrderDetails(loanHomevisitInvestigate.getSaleOrderSid()).getData(); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(data.getUseOrgSid()).getData(); + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + billNo = "JFKCSS" + 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 (String ssImage : ssImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(sid); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.SSFJ.getAttachType()); + if (ssImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + ssImage = ssImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(ssImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + return sid; + } + this.updateByDto(dto); + loanHomevisitInvestigateFileService.delByMainSid(dtoSid); + for (String ssImage : ssImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dtoSid); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.SSFJ.getAttachType()); + if (ssImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + ssImage = ssImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(ssImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + return dtoSid; + } + + public String insertByDto(LoanHomevisitAppealDto dto) { + LoanHomevisitAppeal entity = new LoanHomevisitAppeal(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setNodeState("待提交"); + entity.setHomeVisitSid(dto.getKcSid()); + baseMapper.insert(entity); + return entity.getSid(); + } + + public void updateByDto(LoanHomevisitAppealDto dto) { String dtoSid = dto.getSsSid(); - List ssImages = dto.getSsImages(); - if (StringUtils.isBlank(dtoSid)) { - //生成单据编号 - String billNo = ""; - //查询家访考察信息 - LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(dto.getKcSid()); - //查询销售订单信息 - AppOrderDetailsVo data = busSalesOrderFeign.getSaleOrderDetails(loanHomevisitInvestigate.getSaleOrderSid()).getData(); - SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(data.getUseOrgSid()).getData(); - String date = DateUtil.format(DateUtil.date(), "yyyyMM"); - billNo = "JFKCSS" + 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 (String ssImage : ssImages) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - loanHomevisitInvestigateFileDto.setMainSid(sid); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.SSFJ.getAttachType()); - if (ssImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - ssImage = ssImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(ssImage); - loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - return sid; - } - this.updateByDto(dto); - loanHomevisitInvestigateFileService.delByMainSid(dtoSid); - for (String ssImage : ssImages) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - loanHomevisitInvestigateFileDto.setMainSid(dtoSid); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.SSFJ.getAttachType()); - if (ssImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - ssImage = ssImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(ssImage); - loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - return dtoSid; - } - - public String insertByDto(LoanHomevisitAppealDto dto){ - LoanHomevisitAppeal entity = new LoanHomevisitAppeal(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - entity.setNodeState("待提交"); - entity.setHomeVisitSid(dto.getKcSid()); - baseMapper.insert(entity); - return entity.getSid(); - } - - public void updateByDto(LoanHomevisitAppealDto dto){ - String dtoSid = dto.getSsSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - LoanHomevisitAppeal entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } + } + LoanHomevisitAppeal entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } - public ResultBean delAll(String[] sids) { - ResultBean rb = ResultBean.fireFail(); - //查询该sid中是否有流程不是待提交的 - int count = baseMapper.selectBySid(StringUtils.join(sids, ",")); - if (count > 0) { - return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败"); - } - delBySids(sids); - for (String sid : sids) { - loanHomevisitInvestigateFileService.delByMainSid(sid); - } - return rb.success().setMsg("删除成功"); - } + public ResultBean delAll(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + //查询该sid中是否有流程不是待提交的 + int count = baseMapper.selectBySid(StringUtils.join(sids, ",")); + if (count > 0) { + return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败"); + } + delBySids(sids); + for (String sid : sids) { + loanHomevisitInvestigateFileService.delByMainSid(sid); + } + return rb.success().setMsg("删除成功"); + } - public LoanHomevisitAppealDetailsVo fetchDetailsVoBySid(String sid,String type){ - //type1 初始化 type2 编辑回显 - LoanHomevisitAppealDetailsVo vo = new LoanHomevisitAppealDetailsVo(); - LoanHomevisitInvestigate loanHomevisitInvestigate; - if (type.equals("1")){ - loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(sid); - vo.setOrderSid(loanHomevisitInvestigate.getSaleOrderSid()); - vo.setHomeVisitSid(sid); - }else { - LoanHomevisitAppeal entity = fetchBySid(sid); - BeanUtil.copyProperties(entity, vo); - loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(entity.getHomeVisitSid()); - vo.setOrderSid(loanHomevisitInvestigate.getSaleOrderSid()); - List ssfjImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.SSFJ.getAttachType()); - List ssImages = new ArrayList<>(); - if (ssfjImages != null && ssfjImages.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo ssfjImage : ssfjImages) { - ssImages.add(ssfjImage.getFileUrl()); - } - } - vo.setSsImages(ssImages); - } - vo.setInvestigateValue(loanHomevisitInvestigate.getInvestigateValue()); - return vo; - } + public LoanHomevisitAppealDetailsVo fetchDetailsVoBySid(String sid, String type) { + //type1 初始化 type2 编辑回显 + LoanHomevisitAppealDetailsVo vo = new LoanHomevisitAppealDetailsVo(); + LoanHomevisitInvestigate loanHomevisitInvestigate; + if (type.equals("1")) { + loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(sid); + vo.setOrderSid(loanHomevisitInvestigate.getSaleOrderSid()); + vo.setHomeVisitSid(sid); + } else { + LoanHomevisitAppeal entity = fetchBySid(sid); + BeanUtil.copyProperties(entity, vo); + loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(entity.getHomeVisitSid()); + vo.setOrderSid(loanHomevisitInvestigate.getSaleOrderSid()); + List ssfjImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.SSFJ.getAttachType()); + List ssImages = new ArrayList<>(); + if (ssfjImages != null && ssfjImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo ssfjImage : ssfjImages) { + ssImages.add(ssfjImage.getFileUrl()); + } + } + vo.setSsImages(ssImages); + } + vo.setInvestigateValue(loanHomevisitInvestigate.getInvestigateValue()); + return vo; + } - public ResultBean submitHomeAppeal(SubmitHomeAppealDto dto) { - ResultBean rb = ResultBean.fireFail(); - int i = baseMapper.selectKcSid(dto.getKcSid()); - if (i > 0){ - return rb.setMsg("该家访考察申诉已存在"); - } - dto.getKcSid(); - LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(dto.getSsSid()); - int r = submitBusinessData(dto, loanHomevisitAppeal); - if (r == 3) { - return rb.setMsg("该申请不存在"); - } - if (r == 0) { - return rb.setMsg("操作失败!提交的数据不一致"); - } - //新增修改保存 - String businessSid = saveOrUpdateDto(dto); - loanHomevisitAppeal = fetchBySid(businessSid); - //查询家访考察信息 - LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(loanHomevisitAppeal.getHomeVisitSid()); - //查询销售订单信息 - BusSalesOrder data = busSalesOrderFeign.fetchBySid(loanHomevisitInvestigate.getSaleOrderSid()).getData(); - //创建BusinessVariables实体对象 - BusinessVariables bv = new BusinessVariables(); - //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 - Map variables = new HashMap<>(); - //用户的部门全路径sid - bv.setOrgSidPath(data.getOrgSidPath()); - //业务sid - bv.setBusinessSid(businessSid); - //用户sid - bv.setUserSid(data.getCreateBySid()); - //若app移动端有此功能，则传递appMap参数 - Map appMap = new HashMap<>(); - //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。 - appMap.put("kcSid", loanHomevisitAppeal.getHomeVisitSid()); - appMap.put("ssSid", loanHomevisitAppeal.getSid()); - variables.put("app", appMap); - //流程定义id - bv.setModelId(ProcDefEnum.LOANHOMEVISITAPPEALAPPLY.getProDefId()); - //======================================== - FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); - flowProcessMapQuery.setProDefKey(bv.getModelId()); - flowProcessMapQuery.setVariables(variables); - BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(loanHomevisitInvestigate.getSaleOrderBorrowerSid()).getData(); - flowProcessMapQuery.setDkrName(busSalesOrderBorrowerDetailsVo.getBorrowerName()); - variables = flowableFeign.getMapJFKCSS(flowProcessMapQuery).getData(); - //======================================= - bv.setFormVariables(variables); - if (r == 1) { - ResultBean voResultBean = flowFeign.startProcess(bv); - UpdateFlowFieldVo ufVo = voResultBean.getData(); - updateFlowFiled(BeanUtil.beanToMap(ufVo)); - //极光推送 - try { - ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() - .setNameFormat("demo-pool-%d").build(); - ExecutorService pool = new java.util.concurrent.ThreadPoolExecutor(2, 100, - 0L, TimeUnit.MILLISECONDS, - new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - BusSalesOrder finalBusSalesOrder = data; - Future future1 = pool.submit(() -> { - //极光推送 - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - messageFlowableQuery.setUfVo(messageFlowVo); - messageFlowableQuery.setAppMap(appMap); - messageFlowableQuery.setBusinessSid(businessSid); - messageFlowableQuery.setModuleName("信用审核申诉"); - messageFlowableQuery.setMsgContent(finalBusSalesOrder.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - messageFlowableQuery.setMsgTitle("信用审核申诉"); - messageFeign.pushMessage(messageFlowableQuery); - }); - } catch (Exception e) { - e.printStackTrace(); - } - return voResultBean; - } - if (r == 2) { - // ToDo:驳回到发起人后再次提交 - if (StringUtils.isBlank(dto.getInstanceId())) { - return rb.setMsg("参数错误：instanceId"); - } - bv.setTaskId(loanHomevisitAppeal.getTaskId()); - bv.setTaskDefKey(loanHomevisitAppeal.getNodeSid()); - bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); - bv.setInstanceId(dto.getInstanceId()); - return complete(bv); - } - return rb; - } + public ResultBean submitHomeAppeal(SubmitHomeAppealDto dto) { + ResultBean rb = ResultBean.fireFail(); + int i = baseMapper.selectKcSid(dto.getKcSid()); + if (i > 0) { + return rb.setMsg("该家访考察申诉已存在"); + } + dto.getKcSid(); + LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(dto.getSsSid()); + int r = submitBusinessData(dto, loanHomevisitAppeal); + if (r == 3) { + return rb.setMsg("该申请不存在"); + } + if (r == 0) { + return rb.setMsg("操作失败!提交的数据不一致"); + } + //新增修改保存 + String businessSid = saveOrUpdateDto(dto); + loanHomevisitAppeal = fetchBySid(businessSid); + //查询家访考察信息 + LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(loanHomevisitAppeal.getHomeVisitSid()); + //查询销售订单信息 + BusSalesOrder data = busSalesOrderFeign.fetchBySid(loanHomevisitInvestigate.getSaleOrderSid()).getData(); + //创建BusinessVariables实体对象 + BusinessVariables bv = new BusinessVariables(); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //用户的部门全路径sid + bv.setOrgSidPath(data.getOrgSidPath()); + //业务sid + bv.setBusinessSid(businessSid); + //用户sid + bv.setUserSid(data.getCreateBySid()); + //若app移动端有此功能，则传递appMap参数 + Map appMap = new HashMap<>(); + //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。 + appMap.put("kcSid", loanHomevisitAppeal.getHomeVisitSid()); + appMap.put("ssSid", loanHomevisitAppeal.getSid()); + variables.put("app", appMap); + //流程定义id + bv.setModelId(ProcDefEnum.LOANHOMEVISITAPPEALAPPLY.getProDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(bv.getModelId()); + flowProcessMapQuery.setVariables(variables); + BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(loanHomevisitInvestigate.getSaleOrderBorrowerSid()).getData(); + flowProcessMapQuery.setDkrName(busSalesOrderBorrowerDetailsVo.getBorrowerName()); + variables = flowableFeign.getMapJFKCSS(flowProcessMapQuery).getData(); + //======================================= + bv.setFormVariables(variables); + if (r == 1) { + ResultBean voResultBean = flowFeign.startProcess(bv); + UpdateFlowFieldVo ufVo = voResultBean.getData(); + updateFlowFiled(BeanUtil.beanToMap(ufVo)); + //极光推送 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new java.util.concurrent.ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusSalesOrder finalBusSalesOrder = data; + Future future1 = pool.submit(() -> { + //极光推送 + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("信用审核申诉"); + messageFlowableQuery.setMsgContent(finalBusSalesOrder.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("信用审核申诉"); + messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } + return voResultBean; + } + if (r == 2) { + // ToDo:驳回到发起人后再次提交 + if (StringUtils.isBlank(dto.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); + } + bv.setTaskId(loanHomevisitAppeal.getTaskId()); + bv.setTaskDefKey(loanHomevisitAppeal.getNodeSid()); + bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); + bv.setInstanceId(dto.getInstanceId()); + return complete(bv); + } + return rb; + } - public ResultBean complete(BusinessVariables bv) { - ResultBean rb = ResultBean.fireFail(); - String businessSid = bv.getBusinessSid(); - LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(businessSid); - Map variables = new HashMap<>(); - Map appMap = new HashMap<>(); - appMap.put("kcSid", loanHomevisitAppeal.getHomeVisitSid()); - appMap.put("ssSid", loanHomevisitAppeal.getSid()); - variables.put("app", appMap); - //查询家访考察信息 - LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(loanHomevisitAppeal.getHomeVisitSid()); - //======================================== - FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); - flowProcessMapQuery.setProDefKey(loanHomevisitAppeal.getProcDefId()); - flowProcessMapQuery.setVariables(variables); - BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(loanHomevisitInvestigate.getSaleOrderBorrowerSid()).getData(); - flowProcessMapQuery.setDkrName(busSalesOrderBorrowerDetailsVo.getBorrowerName()); - variables = flowableFeign.getMapJFKCSS(flowProcessMapQuery).getData(); - //======================================= - bv.setFormVariables(variables); - //查询销售订单信息 - BusSalesOrder data = busSalesOrderFeign.fetchBySid(loanHomevisitInvestigate.getSaleOrderSid()).getData(); - bv.setOrgSidPath(data.getOrgSidPath()); - if (bv.getTaskId().equals(loanHomevisitAppeal.getTaskId())) { - ResultBean resultBean = flowFeign.handleProsess(bv); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - UpdateFlowFieldVo ufVo = resultBean.getData(); - updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); - if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { - //修改贷款人状态为正常(1正常，0作废) - busSalesOrderBorrowerFeign.updateState(loanHomevisitInvestigate.getSaleOrderBorrowerSid(),"1"); - //家访通过后推送家访资料审核 - LoanHomevisitFileexamineDto loanHomevisitFileexamineDto = new LoanHomevisitFileexamineDto(); - loanHomevisitFileexamineDto.setHomeVisitSid(loanHomevisitInvestigate.getSid()); - loanHomevisitFileexamineDto.setSaleOrderSid(loanHomevisitInvestigate.getSaleOrderSid()); - loanHomevisitFileexamineService.saveOrUpdateDto(loanHomevisitFileexamineDto); - //家访通过后修改贷款人阶段状态 - busSalesOrderBorrowerFeign.updateBusNo("303","家访资料审核",loanHomevisitInvestigate.getSaleOrderBorrowerSid()); - } else { - //极光推送 - try { - ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() - .setNameFormat("demo-pool-%d").build(); - ExecutorService pool = new java.util.concurrent.ThreadPoolExecutor(2, 100, - 0L, TimeUnit.MILLISECONDS, - new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - BusSalesOrder finalBusSalesOrder = data; - Future future1 = pool.submit(() -> { - //极光推送 - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - messageFlowableQuery.setUfVo(messageFlowVo); - messageFlowableQuery.setAppMap(appMap); - messageFlowableQuery.setBusinessSid(businessSid); - messageFlowableQuery.setModuleName("信用审核申诉"); - messageFlowableQuery.setMsgContent(finalBusSalesOrder.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - messageFlowableQuery.setMsgTitle("信用审核申诉"); - messageFeign.pushMessage(messageFlowableQuery); - }); - } catch (Exception e) { - e.printStackTrace(); - } - } - return rb.success().setData(resultBean.getData()); - } else { - return rb.setMsg("操作失败!提交的数据不一致"); - } - } + public ResultBean complete(BusinessVariables bv) { + ResultBean rb = ResultBean.fireFail(); + String businessSid = bv.getBusinessSid(); + LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(businessSid); + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("kcSid", loanHomevisitAppeal.getHomeVisitSid()); + appMap.put("ssSid", loanHomevisitAppeal.getSid()); + variables.put("app", appMap); + //查询家访考察信息 + LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(loanHomevisitAppeal.getHomeVisitSid()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(loanHomevisitAppeal.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(loanHomevisitInvestigate.getSaleOrderBorrowerSid()).getData(); + flowProcessMapQuery.setDkrName(busSalesOrderBorrowerDetailsVo.getBorrowerName()); + variables = flowableFeign.getMapJFKCSS(flowProcessMapQuery).getData(); + //======================================= + bv.setFormVariables(variables); + //查询销售订单信息 + BusSalesOrder data = busSalesOrderFeign.fetchBySid(loanHomevisitInvestigate.getSaleOrderSid()).getData(); + bv.setOrgSidPath(data.getOrgSidPath()); + if (bv.getTaskId().equals(loanHomevisitAppeal.getTaskId())) { + ResultBean resultBean = flowFeign.handleProsess(bv); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + UpdateFlowFieldVo ufVo = resultBean.getData(); + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { + //修改贷款人状态为正常(1正常，0作废) + busSalesOrderBorrowerFeign.updateState(loanHomevisitInvestigate.getSaleOrderBorrowerSid(), "1"); + //修改家访考察为待考察，并清空考察结果 + loanHomevisitInvestigateService.updateState(loanHomevisitInvestigate.getSid(), "1"); + } else { + //极光推送 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new java.util.concurrent.ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusSalesOrder finalBusSalesOrder = data; + Future future1 = pool.submit(() -> { + //极光推送 + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("信用审核申诉"); + messageFlowableQuery.setMsgContent(finalBusSalesOrder.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("信用审核申诉"); + messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + return rb.success().setData(resultBean.getData()); + } else { + return rb.setMsg("操作失败!提交的数据不一致"); + } + } - public ResultBean> getPreviousNodesForReject(LoanHomeAppealNodeQuery query) { - ResultBean> rb = ResultBean.fireFail(); - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.LOANHOMEVISITAPPEALAPPLY.getProDefId()); - ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); - //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo - List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanHomeAppealNodeVo.class)).collect(Collectors.toList()); - return rb.success().setData(voList); - } + public ResultBean> getPreviousNodesForReject(LoanHomeAppealNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.LOANHOMEVISITAPPEALAPPLY.getProDefId()); + ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanHomeAppealNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } - public ResultBean> getNextNodesForSubmit(LoanHomeAppealNodeQuery query) { - ResultBean> rb = ResultBean.fireFail(); - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.LOANHOMEVISITAPPEALAPPLY.getProDefId()); - ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); - //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo - List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanHomeAppealNodeVo.class)).collect(Collectors.toList()); - return rb.success().setData(voList); - } + public ResultBean> getNextNodesForSubmit(LoanHomeAppealNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.LOANHOMEVISITAPPEALAPPLY.getProDefId()); + ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanHomeAppealNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } - public ResultBean reject(LoanHomeAppealTaskQuery query) { - ResultBean rb = ResultBean.fireFail(); - String businessSid = query.getBusinessSid(); - LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(businessSid); - if (loanHomevisitAppeal == null) { - return rb.setMsg("该申请不存在"); - } - String businessTaskId = loanHomevisitAppeal.getTaskId(); - if (StringUtils.isNotBlank(businessTaskId)) { - if (businessTaskId.equals(query.getTaskId())) { - if (StringUtils.isBlank(query.getComment())) { - return rb.setMsg("请填写意见"); - } - if (StringUtils.isBlank(query.getUserSid())) { - return rb.setMsg("参数错误：userSid"); - } - FlowTaskVo flowTaskVo = new FlowTaskVo(); - BeanUtil.copyProperties(query, flowTaskVo); - Map variables = new HashMap<>(); - Map appMap = new HashMap<>(); - appMap.put("kcSid", loanHomevisitAppeal.getHomeVisitSid()); - appMap.put("ssSid", loanHomevisitAppeal.getSid()); - variables.put("app", appMap); - flowTaskVo.setValues(variables); - ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - UpdateFlowFieldVo ufVo = resultBean.getData(); - Map map = BeanUtil.beanToMap(ufVo); - //更新业务中的流程相关的参数 - updateFlowFiled(map); - //查询家访考察信息 - LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(loanHomevisitAppeal.getHomeVisitSid()); - //查询销售订单信息 - BusSalesOrder data = busSalesOrderFeign.fetchBySid(loanHomevisitInvestigate.getSaleOrderSid()).getData(); - //极光推送 - try { - ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() - .setNameFormat("demo-pool-%d").build(); - ExecutorService pool = new java.util.concurrent.ThreadPoolExecutor(2, 100, - 0L, TimeUnit.MILLISECONDS, - new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - BusSalesOrder finalBusSalesOrder = data; - Future future1 = pool.submit(() -> { - //极光推送 - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - String procId = loanHomevisitAppeal.getProcInstSid(); - ufVo.setProcInsId(procId); - ufVo.setProcDefId(loanHomevisitAppeal.getProcDefId()); - messageFlowableQuery.setUfVo(messageFlowVo); - messageFlowableQuery.setAppMap(appMap); - messageFlowableQuery.setBusinessSid(businessSid); - messageFlowableQuery.setModuleName("信用审核申诉"); - ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); - String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); - List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(data.getCreateBySid())) { - messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); - } else { - messageFlowableQuery.setMsgContent(data.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - } - messageFlowableQuery.setMsgTitle("信用审核申诉"); - messageFeign.pushMessage(messageFlowableQuery); - }); - } catch (Exception e) { - e.printStackTrace(); - } - return rb.success(); - } - } - return rb.setMsg("操作失败!提交的数据不一致!"); - } + public ResultBean reject(LoanHomeAppealTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + String businessSid = query.getBusinessSid(); + LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(businessSid); + if (loanHomevisitAppeal == null) { + return rb.setMsg("该申请不存在"); + } + String businessTaskId = loanHomevisitAppeal.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + if (StringUtils.isBlank(query.getComment())) { + return rb.setMsg("请填写意见"); + } + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("kcSid", loanHomevisitAppeal.getHomeVisitSid()); + appMap.put("ssSid", loanHomevisitAppeal.getSid()); + variables.put("app", appMap); + flowTaskVo.setValues(variables); + ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + UpdateFlowFieldVo ufVo = resultBean.getData(); + Map map = BeanUtil.beanToMap(ufVo); + //更新业务中的流程相关的参数 + updateFlowFiled(map); + //查询家访考察信息 + LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(loanHomevisitAppeal.getHomeVisitSid()); + //查询销售订单信息 + BusSalesOrder data = busSalesOrderFeign.fetchBySid(loanHomevisitInvestigate.getSaleOrderSid()).getData(); + //极光推送 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new java.util.concurrent.ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusSalesOrder finalBusSalesOrder = data; + Future future1 = pool.submit(() -> { + //极光推送 + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + String procId = loanHomevisitAppeal.getProcInstSid(); + ufVo.setProcInsId(procId); + ufVo.setProcDefId(loanHomevisitAppeal.getProcDefId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("信用审核申诉"); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); + String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); + if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(data.getCreateBySid())) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + messageFlowableQuery.setMsgContent(data.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + } + messageFlowableQuery.setMsgTitle("信用审核申诉"); + messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } + return rb.success(); + } + } + return rb.setMsg("操作失败!提交的数据不一致!"); + } - public ResultBean revokeProcess(LoanHomeAppealTaskQuery query) { - ResultBean rb = ResultBean.fireFail(); - if (StringUtils.isBlank(query.getUserSid())) { - return rb.setMsg("参数错误：userSid"); - } - LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(query.getBusinessSid()); - String businessTaskId = loanHomevisitAppeal.getTaskId(); - if (StringUtils.isNotBlank(businessTaskId)) { - if (businessTaskId.equals(query.getTaskId())) { - FlowTaskVo flowTaskVo = new FlowTaskVo(); - BeanUtil.copyProperties(query, flowTaskVo); - ResultBean resultBean = flowableFeign.revokeProcess(flowTaskVo); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); - return rb.success().setData(resultBean.getData()); - } - } - return rb.setMsg("操作失败，提交的数据不一致!"); - } + public ResultBean revokeProcess(LoanHomeAppealTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(query.getBusinessSid()); + String businessTaskId = loanHomevisitAppeal.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.revokeProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + return rb.success().setData(resultBean.getData()); + } + } + return rb.setMsg("操作失败，提交的数据不一致!"); + } - public ResultBean breakProcess(LoanHomeAppealTaskQuery query) { - ResultBean rb = ResultBean.fireFail(); - if (StringUtils.isBlank(query.getInstanceId())) { - return rb.setMsg("参数错误：instanceId"); - } - if (StringUtils.isBlank(query.getUserSid())) { - return rb.setMsg("参数错误：userSid"); - } - if (StringUtils.isBlank(query.getComment())) { - return rb.setMsg("请填写意见"); - } - LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(query.getBusinessSid()); - //查询家访考察信息 - LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(loanHomevisitAppeal.getHomeVisitSid()); - //查询销售订单信息 - BusSalesOrder data = busSalesOrderFeign.fetchBySid(loanHomevisitInvestigate.getSaleOrderSid()).getData(); - String businessTaskId = loanHomevisitAppeal.getTaskId(); - if (StringUtils.isNotBlank(businessTaskId)) { - if (query.getUserSid().equals(data.getCreateBySid())) { - FlowTaskVo flowTaskVo = new FlowTaskVo(); - BeanUtil.copyProperties(query, flowTaskVo); - ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - Map map = BeanUtil.beanToMap(resultBean.getData()); - updateFlowFiled(map); - return rb.success().setData(resultBean.getData()); - } else { - if (businessTaskId.equals(query.getTaskId())) { - FlowTaskVo flowTaskVo = new FlowTaskVo(); - BeanUtil.copyProperties(query, flowTaskVo); - ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - Map map = BeanUtil.beanToMap(resultBean.getData()); - updateFlowFiled(map); - return rb.success().setData(resultBean.getData()); - } - } + public ResultBean breakProcess(LoanHomeAppealTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(query.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); + } + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + if (StringUtils.isBlank(query.getComment())) { + return rb.setMsg("请填写意见"); + } + LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(query.getBusinessSid()); + //查询家访考察信息 + LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(loanHomevisitAppeal.getHomeVisitSid()); + //查询销售订单信息 + BusSalesOrder data = busSalesOrderFeign.fetchBySid(loanHomevisitInvestigate.getSaleOrderSid()).getData(); + String businessTaskId = loanHomevisitAppeal.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (query.getUserSid().equals(data.getCreateBySid())) { + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map map = BeanUtil.beanToMap(resultBean.getData()); + updateFlowFiled(map); + return rb.success().setData(resultBean.getData()); + } else { + if (businessTaskId.equals(query.getTaskId())) { + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map map = BeanUtil.beanToMap(resultBean.getData()); + updateFlowFiled(map); + return rb.success().setData(resultBean.getData()); + } + } - } - return rb.setMsg("操作失败!提交的数据不一致!"); - } + } + return rb.setMsg("操作失败!提交的数据不一致!"); + } - private int updateFlowFiled(Map map) { - return baseMapper.updateFlowFiled(map); - } + private int updateFlowFiled(Map map) { + return baseMapper.updateFlowFiled(map); + } - private synchronized int submitBusinessData(SubmitHomeAppealDto dto, LoanHomevisitAppeal loanHomevisitAppeal) { - int r = 0; - if (StringUtils.isBlank(dto.getSsSid())) { - r = 1; - } else { - if (loanHomevisitAppeal != null) { - String businessTaskId = loanHomevisitAppeal.getTaskId(); - if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) { - //新提交 - r = 1; - } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) { - //二次提交//只有数据一致的时候才能进行下一步 - r = 2; - } - } else { - r = 3; - } + private synchronized int submitBusinessData(SubmitHomeAppealDto dto, LoanHomevisitAppeal loanHomevisitAppeal) { + int r = 0; + if (StringUtils.isBlank(dto.getSsSid())) { + r = 1; + } else { + if (loanHomevisitAppeal != null) { + String businessTaskId = loanHomevisitAppeal.getTaskId(); + if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) { + //新提交 + r = 1; + } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) { + //二次提交//只有数据一致的时候才能进行下一步 + r = 2; + } + } else { + r = 3; + } - } - return r; - } + } + return r; + } - public ResultBean getHomeVisitAppealInfo(String kcSid, String ssSid) { - ResultBean rb = ResultBean.fireFail(); - LoanHomeVisitInitAppealVo loanHomeVisitInitAppealVo = new LoanHomeVisitInitAppealVo(); - LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(kcSid); - loanHomeVisitInitAppealVo.setKcSid(kcSid); - loanHomeVisitInitAppealVo.setInvestigateValue(loanHomevisitInvestigate.getInvestigateValue()); - loanHomeVisitInitAppealVo.setRemarks(loanHomevisitInvestigate.getRemarks()); - loanHomeVisitInitAppealVo.setSaleOrderSid(loanHomevisitInvestigate.getSaleOrderSid()); - if (StringUtils.isNotBlank(ssSid)){//详情 - LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(ssSid); - loanHomeVisitInitAppealVo.setAppealReason(loanHomevisitAppeal.getAppealReason()); - List loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(ssSid, LoanAttachTypeEnum.SSFJ.getAttachType()); - List ssImages = new ArrayList<>(); - if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos) { - ssImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); - } - } - loanHomeVisitInitAppealVo.setSsImages(ssImages); - loanHomeVisitInitAppealVo.setSsSid(ssSid); - loanHomeVisitInitAppealVo.setProcInsId(loanHomevisitAppeal.getProcInstSid()); - loanHomeVisitInitAppealVo.setTaskId(loanHomevisitAppeal.getTaskId()); - } - return rb.success().setData(loanHomeVisitInitAppealVo); - } + public ResultBean getHomeVisitAppealInfo(String kcSid, String ssSid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInitAppealVo loanHomeVisitInitAppealVo = new LoanHomeVisitInitAppealVo(); + LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(kcSid); + loanHomeVisitInitAppealVo.setKcSid(kcSid); + loanHomeVisitInitAppealVo.setInvestigateValue(loanHomevisitInvestigate.getInvestigateValue()); + loanHomeVisitInitAppealVo.setRemarks(loanHomevisitInvestigate.getRemarks()); + loanHomeVisitInitAppealVo.setSaleOrderSid(loanHomevisitInvestigate.getSaleOrderSid()); + if (StringUtils.isNotBlank(ssSid)) {//详情 + LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(ssSid); + loanHomeVisitInitAppealVo.setAppealReason(loanHomevisitAppeal.getAppealReason()); + List loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(ssSid, LoanAttachTypeEnum.SSFJ.getAttachType()); + List ssImages = new ArrayList<>(); + if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos) { + ssImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + } + loanHomeVisitInitAppealVo.setSsImages(ssImages); + loanHomeVisitInitAppealVo.setSsSid(ssSid); + loanHomeVisitInitAppealVo.setProcInsId(loanHomevisitAppeal.getProcInstSid()); + loanHomeVisitInitAppealVo.setTaskId(loanHomevisitAppeal.getTaskId()); + } + return rb.success().setData(loanHomeVisitInitAppealVo); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java index 9a787c556c..0436153195 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java @@ -81,4 +81,7 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper companyResultDict = new ArrayList<>(); @ApiModelProperty("资方风控结果") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java index e8c30773d5..8db25d6422 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java @@ -650,6 +650,7 @@ public class CreditReviewService { creditReviewDetailsOffVo.setExamineResult2(loanPreloanCreditApplyDetailsVo.getZffkjg()); creditReviewDetailsOffVo.setExamineDate2(loanPreloanCreditApplyDetailsVo.getZfshDate()); creditReviewDetailsOffVo.setExamineRemarks2(loanPreloanCreditApplyDetailsVo.getZfshRemarks()); + creditReviewDetailsOffVo.setDateTo(loanPreloanCreditApplyDetailsVo.getDateTo()); return rb.success().setData(creditReviewDetailsOffVo); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java index 6bc1631c2e..9983cd44cb 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java @@ -95,6 +95,10 @@ public class LoanHomeVisitInvestigateService { loanHomeVisitInvestigatePageVo.setNodeState("未预约"); loanHomeVisitInvestigatePageVo.setShowAppointmentBtn(true); } + if (StringUtils.isNotBlank(record.getInvestigateValue())){ + loanHomeVisitInvestigatePageVo.setNodeState(record.getInvestigateValue()); + loanHomeVisitInvestigatePageVo.setShowAppointmentBtn(false); + } loanHomeVisitInvestigatePageVo.setSalesName(record.getStaffName()); loanHomeVisitInvestigatePageVo.setCreateDate(record.getCreateDate()); loanHomeVisitInvestigatePageVo.setLenderName(record.getBorrowerName());