From 99264f7cc990195e5bb02ad92b0208c94caca017 Mon Sep 17 00:00:00 2001 From: T-95707 Date: Fri, 17 Jul 2020 09:08:33 +0800 Subject: [PATCH] =?UTF-8?q?2020071=20zjt=20=E4=BF=AE=E6=94=B9app=E7=BD=91?= =?UTF-8?q?=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/wb/ribs/biz/ApproveRoleBiz.java | 44 +++++++++++++++++++ .../wb/ribs/controller/RibsController.java | 7 +++ .../wb/ribs/mapper/ApproveRoleMapper.java | 4 ++ .../resources/mapper/ribs/ApproRoleMapper.xml | 37 ++++++++++++++++ 4 files changed, 92 insertions(+) diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/ApproveRoleBiz.java b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/ApproveRoleBiz.java index b300ca8..0547a05 100644 --- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/ApproveRoleBiz.java +++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/ApproveRoleBiz.java @@ -110,4 +110,48 @@ public class ApproveRoleBiz extends BaseBiz { List list = approveRoleMapper.page(query); return list; } + + /** + * 获取每种报销类型的待审批总条数 + * */ + public List count(Map param, String staffId, String type){ + ApproveRoleVo approveRoleVo = new ApproveRoleVo(); + approveRoleVo.setStaffId(staffId); + List roleIds = new ArrayList<>(); + if("approve".equals(type)){ + roleIds = super.selectList(approveRoleVo); + // 查询页面和审批页面各角色可见范围 + // 如果是负责人，则只能看见自己部门的人员 + if(roleIds!=null && roleIds.size()!=0){ + if("1".equals(roleIds.get(0).getRoleId())){ + param.put("staffId",staffId); + } + } + } + /* 审批页面各角色可见范围 + 审批角色（ 1、部门审批负责人 2、总经理 3、会计 4、财务总监 ） + 报销状态（ 1、已保存 2、已提交 3、已初审 4、已复审 5、驳回 6、已复核 7、已打款 ） + 角色-状态 + 1-2，2-3，3-4，3-6 */ + if("approve".equals(type)){ + if("1".equals(roleIds.get(0).getRoleId())){ + param.put("bxzt","2"); + }else if("2".equals(roleIds.get(0).getRoleId())){ + param.put("bxzt","3"); + }else if("3".equals(roleIds.get(0).getRoleId())){ + param.put("bxzt","4"); + }else if("4".equals(roleIds.get(0).getRoleId())){ + param.put("bxzt","6"); + } + + } + String[] arr = { "1","2","3"}; + List list = new ArrayList<>(); + for(String str:arr){ + param.put("bxlx",str); + list.add(approveRoleMapper.count(param)); + } + + return list; + } } diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/controller/RibsController.java b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/controller/RibsController.java index 8a0defb..351e19e 100644 --- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/controller/RibsController.java +++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/controller/RibsController.java @@ -12,6 +12,7 @@ import com.gitee.neuray.security.mail.vo.SysMailSourceVo; import com.gitee.neuray.security.wb.ribs.biz.*; import com.gitee.neuray.security.wb.ribs.feign.StaffFeign; import com.gitee.neuray.security.wb.ribs.vo.*; +import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -508,4 +509,10 @@ public class RibsController { vo.setYjsj(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); client.addMail(vo); }*/ + + @RequestMapping(value = "allCount",method = RequestMethod.GET) + public ListRestResponse> allCount(@RequestParam Map map,HttpServletRequest request){ + String userId = request.getHeader("userid"); + return new ListRestResponse>("查询成功",3,approveRoleBiz.count(map,userId,map.get("type").toString())); + } } diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/mapper/ApproveRoleMapper.java b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/mapper/ApproveRoleMapper.java index 72ee58f..191bd88 100644 --- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/mapper/ApproveRoleMapper.java +++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/mapper/ApproveRoleMapper.java @@ -7,9 +7,13 @@ import org.springframework.stereotype.Repository; import tk.mybatis.mapper.common.Mapper; import java.util.List; +import java.util.Map; + @Repository public interface ApproveRoleMapper extends Mapper { List page(Query query); + Integer count(Map map); + } diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/ApproRoleMapper.xml b/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/ApproRoleMapper.xml index 9501b9d..e20d638 100644 --- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/ApproRoleMapper.xml +++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/ApproRoleMapper.xml @@ -86,4 +86,41 @@ + + -- Gitee