diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountRest.java index 1c54fa4d..e88cab38 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountRest.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountRest.java @@ -61,6 +61,12 @@ public class ProjectAccountRest { ResultBean r=ProjectAccountService.getAccountByProjectSid(projectSid); return r; } + @ApiOperation("根据项目sid查询账户信息 app") + @GetMapping("/getAccountByProjectSidApp/{projectSid}") + public ResultBean getAccountByProjectSidApp (@PathVariable("projectSid") String projectSid){ + ResultBean r=ProjectAccountService.getAccountByProjectSidApp(projectSid); + return r; + } @ApiOperation("根据项目sid查询账户余额") @GetMapping("/getBalanceByProjectSid/{projectSid}") public ResultBean getBalanceByProjectSid (@PathVariable("projectSid") String projectSid){ diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountService.java index c8fa2388..666bd5bc 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountService.java @@ -90,6 +90,15 @@ public class ProjectAccountService extends MybatisBaseService> getAccountByProjectSidApp(String projectSid) { + ResultBean rb=new ResultBean(); + List projectStateBySid=baseMapper.getAccountByProjectSid(projectSid); + if(projectStateBySid.size()<0){ + return rb.success().setData(new ArrayList<>()); + } + return rb.success().setData(projectStateBySid); + } + public ResultBean getBalanceByProjectSid(String projectSid) { ResultBean rb=new ResultBean(); BigDecimal balance=baseMapper.getBalanceByProjectSid(projectSid); diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java index f1f1336e..8f3cc3ab 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java @@ -79,6 +79,13 @@ public class ProjectInformationRest implements ProjectInformationFeign { ProjectInfoVo projectInfoVo=ProjectInformationService.getProjectBySid(sid); return rb.success().setData(projectInfoVo); } + @ApiOperation("根据sid查项目等相关信息") + @GetMapping("/getProjectBySidApp/{sid}") + public ResultBean getEnterpriseBySidApp(@PathVariable String sid){ + ResultBean rb = ResultBean.fireFail(); + ProjectInfoVo projectInfoVo=ProjectInformationService.getProjectBySidApp(sid); + return rb.success().setData(projectInfoVo); + } @ApiOperation("根据sid查询仓库信息") @GetMapping("/getStorehouseBySid/{sid}") public ResultBean getStorehouseBySid (@PathVariable String sid){ diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java index d8b91542..38a3d3f8 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java @@ -295,7 +295,49 @@ public class ProjectInformationService extends MybatisBaseService enterpriseProjectVoList = enterpriseProjectService.getEnterpriseByProjectSid(sid); + projectInfoVo.setEnterpriseList(enterpriseProjectVoList); + //章证 + List projectZzFilesVos = projectZzFilesService.getZzFilesByProjectSid(bank.getSid()).getData(); + if (projectZzFilesVos.size() != 0) { + projectZzFilesVos.forEach(j -> { + List> maps =new ArrayList<>(); + for(String r:j.getUrl().split(",")){ + Map map=new HashMap<>(); + map.put("url",r); + maps.add(map); + } + j.setUrls(maps); + }); + } + projectInfoVo.setIdCardList(projectZzFilesVos); + //账户 + List ProjectAccountVos = projectAccountService.getAccountByProjectSid(bank.getSid()).getData(); + projectInfoVo.setBankList(ProjectAccountVos); + //仓库 +// sh + List storeHouseProjectVos = storeHouseProjectService.selectStoreBySid(bank.getSid()); + projectInfoVo.setWarehouse(storeHouseProjectVos); + return projectInfoVo; + } + return new ProjectInfoVo(); + } public List getProjectByUserSid(String sid) { SysUser s = sysUserFeign.getUserBySid(sid).getData(); //银行人员