From 69853f6d0ad8df0f974f2cf9fcf8c0534c08dff8 Mon Sep 17 00:00:00 2001 From: leewand <1005070037@qq.com> Date: Mon, 13 Jul 2020 11:17:35 +0800 Subject: [PATCH] wb --- .../security/wb/ribs/biz/ApproveRoleBiz.java | 31 +++++++++++++++++ .../security/wb/ribs/biz/WechatBiz.java | 22 +++++++----- .../wb/ribs/constants/WbApiConstants.java | 2 +- .../wb/ribs/controller/RibsController.java | 34 ++++++++++++++++--- 4 files changed, 75 insertions(+), 14 deletions(-) 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 fb25727..b300ca8 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 @@ -78,5 +78,36 @@ public class ApproveRoleBiz extends BaseBiz { return new TableResultResponse( result.getPageSize(), result.getPageNum(), result.getPages(), result.getTotal(), list); } + public List exportQuery(Query query, String staffId) { + ApproveRoleVo approveRoleVo = new ApproveRoleVo(); + approveRoleVo.setStaffId(staffId); + List roleIds = new ArrayList<>(); + roleIds = super.selectList(approveRoleVo); + // 查询页面和审批页面各角色可见范围 + // 如果是负责人，则只能看见自己部门的人员 + if(roleIds!=null && roleIds.size()!=0){ + if("1".equals(roleIds.get(0).getRoleId())){ + query.put("staffId",staffId); + } + } + + /* 审批页面各角色可见范围 + 审批角色（ 1、部门审批负责人 2、总经理 3、会计 4、财务总监 ） + 报销状态（ 1、已保存 2、已提交 3、已初审 4、已复审 5、驳回 6、已复核 7、已打款 ） + 角色-状态 + 1-2，2-3，3-4，3-6 */ + if("1".equals(roleIds.get(0).getRoleId())){ + query.put("bxzt","2"); + }else if("2".equals(roleIds.get(0).getRoleId())){ + query.put("bxzt","3"); + }else if("3".equals(roleIds.get(0).getRoleId())){ + query.put("bxzt","4"); + }else if("4".equals(roleIds.get(0).getRoleId())){ + query.put("bxzt","6"); + } + //Query query = new Query(query); + List list = approveRoleMapper.page(query); + return list; + } } diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/WechatBiz.java b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/WechatBiz.java index 5ca2f3c..87a503f 100644 --- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/WechatBiz.java +++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/WechatBiz.java @@ -257,6 +257,7 @@ public class WechatBiz { } public XSSFSheet jtfSheet(XSSFWorkbook wb,List jtfVos,Map staffInfo){ + String name = staffInfo.get("name").toString(); XSSFSheet jtfSheet = wb.getSheetAt(2); // BigDecimalUtils.add(); //计算需要新增的行数 @@ -285,7 +286,7 @@ public class WechatBiz { String je = jtfSheet.getRow(11+insertRows).getCell(2).getStringCellValue().substring(1); String jeC = MoneyUtil.toChinese(je); jtfSheet.getRow(10+insertRows).getCell(2).setCellValue(jeC); - + jtfSheet.getRow(13+insertRows).createCell(7).setCellValue(name); return jtfSheet; } @@ -324,18 +325,18 @@ public class WechatBiz { clfSheet.getRow(position).getCell(2).setCellValue(clfVos.get(i).getGMdd()); /** 去_出行方式 codelist name = CXFS 1、火车及动车 2、火车及动车一等座 3、飞机 4其他 */ if("1".equals(clfVos.get(i).getGCxfs()) || "2".equals(clfVos.get(i).getGCxfs())){ - clfSheet.getRow(position).getCell(3).setCellValue(Double.valueOf(clfVos.get(i).getGJtf())); + clfSheet.getRow(position).getCell(3).setCellValue(Double.valueOf(clfVos.get(i).getGJtf() == null || "".equals(clfVos.get(i).getGJtf()) ? "0" : clfVos.get(i).getGJtf())); }else if("3".equals(clfVos.get(i).getGCxfs())){ - clfSheet.getRow(position).getCell(4).setCellValue(Double.valueOf(clfVos.get(i).getGJtf())); + clfSheet.getRow(position).getCell(4).setCellValue(Double.valueOf(clfVos.get(i).getGJtf() == null || "".equals(clfVos.get(i).getGJtf()) ? "0" : clfVos.get(i).getGJtf())); }else if("4".equals(clfVos.get(i).getGCxfs())){ - clfSheet.getRow(position).getCell(5).setCellValue(Double.valueOf(clfVos.get(i).getGJtf())); + clfSheet.getRow(position).getCell(5).setCellValue(Double.valueOf(clfVos.get(i).getGJtf() == null || "".equals(clfVos.get(i).getGJtf()) ? "0" : clfVos.get(i).getGJtf())); } - clfSheet.getRow(position).getCell(6).setCellValue(Double.valueOf(clfVos.get(i).getCcbz())); + clfSheet.getRow(position).getCell(6).setCellValue(Double.valueOf(clfVos.get(i).getCcbz() == null || "".equals(clfVos.get(i).getCcbz()) ? "0" : clfVos.get(i).getCcbz())); clfSheet.getRow(position).getCell(7).setCellValue(clfVos.get(i).getZsts()); clfSheet.getRow(position).getCell(8).setCellValue(clfVos.get(i).getZsrs()); - clfSheet.getRow(position).getCell(9).setCellValue(Double.valueOf(clfVos.get(i).getZsje())); - clfSheet.getRow(position).getCell(10).setCellValue(Double.valueOf(clfVos.get(i).getZsbz())); + clfSheet.getRow(position).getCell(9).setCellValue(clfVos.get(i).getZsje() == null || "".equals(clfVos.get(i).getZsje()) ? "0" : clfVos.get(i).getZsje()); + clfSheet.getRow(position).getCell(10).setCellValue(clfVos.get(i).getZsbz() == null || "".equals(clfVos.get(i).getZsbz()) ? "0" : clfVos.get(i).getZsbz()); String qtfy = ""; String qtfysm = ""; @@ -375,11 +376,13 @@ public class WechatBiz { String jeC = MoneyUtil.toChinese(je); clfSheet.getRow(15+insertRows).getCell(1).setCellValue(jeC); clfSheet.getRow(14+insertRows).getCell(1).setCellValue(je); + clfSheet.getRow(20+insertRows).createCell(11).setCellValue(name); return clfSheet; } public XSSFSheet cyfSheet(XSSFWorkbook wb,List cyfVos,Map staffInfo){ + String name = staffInfo.get("name").toString(); XSSFSheet cyfSheet = wb.getSheetAt(3); // BigDecimalUtils.add(); //计算需要新增的行数 @@ -419,12 +422,12 @@ public class WechatBiz { String je = cyfSheet.getRow(11+insertRows).getCell(2).getStringCellValue().substring(1); String jeC = MoneyUtil.toChinese(je); cyfSheet.getRow(10+insertRows).getCell(2).setCellValue(jeC);*/ - + cyfSheet.getRow(9+insertRows).getCell(8).setCellValue(name); return cyfSheet; } public XSSFSheet ribsSheet(XSSFSheet ribsSheet,RibsVo ribsVo,Map staffInfo){ - + String name = staffInfo.get("name").toString(); //取第三行，报销单号 ribsSheet.getRow(2).getCell(7).setCellValue(ribsVo.getBxdh()); //取第四行，签发日期，结算方式 @@ -493,6 +496,7 @@ public class WechatBiz { ribsSheet.getRow(8).getCell(1).setCellValue(ribsVo.getBxsy()); //取第10行 备注 ribsSheet.getRow(9).getCell(1).setCellValue(ribsVo.getBz()); + ribsSheet.getRow(11).getCell(11).setCellValue(name); return ribsSheet; } diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/constants/WbApiConstants.java b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/constants/WbApiConstants.java index 411dcbc..f8b7ccd 100644 --- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/constants/WbApiConstants.java +++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/constants/WbApiConstants.java @@ -9,5 +9,5 @@ public final class WbApiConstants { public static final String DFSFILE_ADDRESS = "base-dfsfile"; public static final String ADMIN_ADDRESS = "neuray-pm-admin"; //public static final String FILE_ID = "2YJLAumd"; - public static final String FILE_ID = "0f4Hin86"; + public static final String FILE_ID = "NUo91oMT"; } \ No newline at end of file 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 f1f80f2..aad0430 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 @@ -7,6 +7,8 @@ import com.gitee.neuray.security.common.msg.ObjectRestResponse; import com.gitee.neuray.security.common.msg.TableResultResponse; import com.gitee.neuray.security.common.util.ExcelUtils; import com.gitee.neuray.security.common.util.Query; +import com.gitee.neuray.security.mail.feign.MailServiceFeignClient; +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.*; @@ -18,6 +20,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -353,12 +356,18 @@ public class RibsController { } @RequestMapping(value = "export", method = RequestMethod.GET) - public void export(@RequestParam Map params, HttpServletResponse response) + public void export(@RequestParam Map params, HttpServletResponse response, HttpServletRequest request) throws Exception { Query query = new Query(params); - List data = ribsBiz.nopage(query); - List execlData = - JSONArray.parseArray(JSONObject.toJSONString(data), RibsPageExcelVo.class); + /*List data = ribsBiz.nopage(query);*/ + String userId = request.getHeader("userid"); + //params.put("staffId",userId); + // 查询列表数据 + String type = "approve"; + List list = approveRoleBiz.exportQuery(query,userId); + List execlData = JSONObject.parseArray(JSONObject.toJSONString(list),RibsPageExcelVo.class); + /*List execlData = + JSONArray.parseArray(JSONObject.toJSONString(data), RibsPageExcelVo.class);*/ ExcelUtils.export(response, "报销列表查询", execlData, RibsPageExcelVo.class); } @@ -477,4 +486,21 @@ public class RibsController { } } } + /*@Autowired + MailServiceFeignClient client; + + public void testAdd() throws Exception { + SysMailSourceVo vo = new SysMailSourceVo(); + vo.setTitle("邮件标题"); + vo.setSjr("liwd@neuray.com"); + vo.setCsr("lisi@qq.com"); + vo.setAsr("wangwu@qq.com,zhaokiu@163.com"); + vo.setGnbh("123456"); + vo.setFjrbm("fjrbm"); + vo.setYjnrTe("你好 赵总 我们公司已经讨论了这个方案"); + vo.setCrtUser("userid"); + vo.setCrtName("系统管理员"); + vo.setYjsj(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); + client.addMail(vo); + }*/ } -- Gitee