From 1d1f473057eaaba7d0bb2c5039aab2e65c2e2f6b Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 30 Oct 2023 14:46:17 +0800 Subject: [PATCH] =?UTF-8?q?app=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectInformationMapper.java | 2 + .../ProjectInformationRest.java | 16 +++++++- .../ProjectInformationService.java | 41 ++++++++++++++++++- 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java index 729448a0..44aef473 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java @@ -20,6 +20,8 @@ public interface ProjectInformationMapper extends BaseMapper IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); @Select("select info.* from project_information info join user_project up on up.projectSid =info.sid where up.userSid= #{userSid}") List listAll(@Param("userSid")String userSid); + @Select("select * from project_information") + List listsAll(); ProjectInformationVo getProjectBySid( @Param("sid") String sid); @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid left join user_project u on u.projectSid =p.sid where u.userSid=#{sid}") List getProjectByUserSid( @Param("sid") String sid); 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 8778150b..f1f1336e 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 @@ -46,13 +46,20 @@ public class ProjectInformationRest implements ProjectInformationFeign { PagerVo pv = ProjectInformationService.listPageVo(pq,token); return rb.success().setData(pv); } - @ApiOperation("查询全部") + @ApiOperation("查询全部（有权限控制）") @GetMapping("/listAll") public ResultBean> listAll(@RequestHeader("token") String token) { ResultBean rb = ResultBean.fireFail(); List list =ProjectInformationService.listAll(token); return rb.success().setData(list); } + @ApiOperation("查询全部（没有权限控制）") + @GetMapping("/listsAll") + public ResultBean> listsAll(@RequestHeader("token") String token) { + ResultBean rb = ResultBean.fireFail(); + List list =ProjectInformationService.listsAll(token); + return rb.success().setData(list); + } @ApiOperation("保存") @PostMapping("/save") public ResultBean save(@RequestBody ProjectInfoDto dto) { @@ -104,6 +111,13 @@ public class ProjectInformationRest implements ProjectInformationFeign { List r=ProjectInformationService.getProjectByUserSid(userSid); return rb.success().setData(r); } + @ApiOperation("根据用户sid查询项目名称App") + @GetMapping("/getProjectByUserSidApp/{userSid}") + public ResultBean getProjectByUserSidApp (@PathVariable("userSid")String userSid){ + ResultBean rb=new ResultBean(); + List r=ProjectInformationService.getProjectByUserSidApp(userSid); + return rb.success().setData(r); + } @ApiOperation("项目绑定或修改仓库") @GetMapping("/saveOrUpdateDto") public ResultBean saveOrUpdateDto (@RequestBody StoreHouseProjectDto dto){ 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 7b435e6e..d8b91542 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 @@ -113,7 +113,15 @@ public class ProjectInformationService extends MybatisBaseService listsAll(String token) { +// SysUserVo sysUserVo=sysUserFeign.loginDetailsNew(token).getData(); + List pagging = baseMapper.listsAll(); + for(ProjectInformationVo projectInformationVo:pagging){ + BigDecimal balance=projectAccountService.getBalanceByProjectSid(projectInformationVo.getSid()).getData(); + projectInformationVo.setBalance(balance); + } + return pagging; + } @Transactional public ResultBean save(ProjectInfoDto dto) { ResultBean rb = new ResultBean(); @@ -320,7 +328,38 @@ public class ProjectInformationService extends MybatisBaseService getProjectByUserSidApp(String sid) { + SysUser s = sysUserFeign.getUserBySid(sid).getData(); + //银行人员 + if (s.getUserType() == 3) { + BankManager b = bankManagerService.getOne(new QueryWrapper().eq("sid", s.getStaffSid())); +// bankInformationService. + if (s.getRoleNames().size() > 0) { + for (String name : s.getRoleNames()) { + if (name.equals("银行行长")) { + List bank = baseMapper.getProjectByBankSid(b.getBankSid()); + return bank; + } + } + } + List bank = baseMapper.getProjectByUserSid(s.getSid()); + return bank; + } else if (s.getUserType() == 1) { + //监管人员 + List projectSidListByUserSid = userProjectService.getProjectSidListByUserSid(sid); + List list = new ArrayList<>(); + for (UserProject userProject : projectSidListByUserSid) { + ProjectInformationVo project = getEnterpriseBySid(userProject.getProjectSid()); + if (StringUtils.isNotBlank(project.getSid())) { + list.add(project); + } + } + return list; + } + List bank = baseMapper.getProjectByUser(s.getStaffSid()); + return bank; + } public ResultBean delete(String sid) { ResultBean rb = new ResultBean(); baseMapper.delete(new QueryWrapper().eq("sid", sid));