diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java index 1f5c80c78..9003fb596 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java @@ -95,6 +95,8 @@ public class WxBillAllController extends BaseController { return new ResultData(result); } + + @ApiOperation("导出欠缴商户列表") @GetMapping("/exportOweMerchantlist") @SystemControllerLog(description = "费用收缴数据-欠缴商户列表-导出") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index f23adc733..019848b75 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -741,11 +741,32 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Override public Map getOweBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize) { PageInfo> pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBillAllMapper.getOweBillAsPage(record)); + List> list = pageInfo.getList(); + for (Map map:list) { + map.put("rentOwe",subZeroAndDot(map.get("rentOwe").toString())); + map.put("propertyOwe",subZeroAndDot(map.get("propertyOwe").toString())); + map.put("depositOwe",subZeroAndDot(map.get("depositOwe").toString())); + map.put("otherOwe",subZeroAndDot(map.get("otherOwe").toString())); + map.put("totalOwe",subZeroAndDot(map.get("totalOwe").toString())); + } + pageInfo.setList(list); Map result = new HashMap<>(); result.put("pageInfo", pageInfo); return result; } + /** + * 使用java正则表达式去掉多余的.与0 + * @param s + * @return + */ + public static String subZeroAndDot(String s){ + if(s.indexOf(".") > 0){ + s = s.replaceAll("0+?$", "");//去掉多余的0 + s = s.replaceAll("[.]$", "");//如最后一位是.则去掉 + } + return s; + } @Override public void exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response) { @@ -754,15 +775,16 @@ public class WxBillAllServiceImpl implements WxBillAllService { for (Map map:data) { OweMerchantVo oweMerchantVo = new OweMerchantVo(); oweMerchantVo.setBuilding((Long)map.get("building")); - oweMerchantVo.setDepositOwe((BigDecimal) map.get("depositOwe")); oweMerchantVo.setFloor((Long)map.get("floor")); oweMerchantVo.setLinkPerson((String)map.get("manager")); oweMerchantVo.setName((String)map.get("merchantName")); oweMerchantVo.setLinkPhone((String)map.get("managerPhone")); - oweMerchantVo.setOtherOwe((BigDecimal) map.get("otherOwe")); - oweMerchantVo.setPropertyOwe((BigDecimal) map.get("propertyOwe")); - oweMerchantVo.setRentOwe((BigDecimal) map.get("rentOwe")); - oweMerchantVo.setTotalOwe((BigDecimal) map.get("totalOwe")); + + oweMerchantVo.setDepositOwe(new BigDecimal(subZeroAndDot(map.get("depositOwe").toString()))); + oweMerchantVo.setOtherOwe(new BigDecimal(subZeroAndDot(map.get("otherOwe").toString()))); + oweMerchantVo.setPropertyOwe(new BigDecimal(subZeroAndDot(map.get("propertyOwe").toString()))); + oweMerchantVo.setRentOwe(new BigDecimal(subZeroAndDot(map.get("rentOwe").toString()))); + oweMerchantVo.setTotalOwe(new BigDecimal(subZeroAndDot(map.get("totalOwe").toString()))); list.add(oweMerchantVo); } String name = "欠缴商户列表"; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 68a5514c9..4aede0d2e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -145,7 +145,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService WxBillProperty wxBillRent = new WxBillProperty(); wxBillRent.setPropertyContractId(id); wxBillRent.setSortColumns(WxBillProperty.Field.Period_ASC); - wxBillRent.setIsPreview(EnumIsPreview.YES.getCode()); List resultList = wxBillPropertyMapper.findList(wxBillRent); result.put("previewBillRentList",resultList); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 877428ef9..0b86f0dce 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -186,7 +186,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setRentContractId(id); wxBillRent.setSortColumns(WxBillRent.Field.Period_ASC); - wxBillRent.setIsPreview(EnumIsPreview.YES.getCode()); List resultList = wxBillRentMapper.findList(wxBillRent); result.put("previewBillRentList",resultList);