Преглед изворни кода

[首页统计][修改][优化展示]

release_toaliyun_real
luozukai пре 7 година
родитељ
комит
abc0da93d8
4 измењених фајлова са 29 додато и 7 уклоњено
  1. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java
  2. +27
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  3. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  4. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 2
- 0
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 = "费用收缴数据-欠缴商户列表-导出")


+ 27
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Прегледај датотеку

@@ -741,11 +741,32 @@ public class WxBillAllServiceImpl implements WxBillAllService {
@Override
public Map<String, Object> getOweBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize) {
PageInfo<Map<String, Object>> pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBillAllMapper.getOweBillAsPage(record));
List<Map<String, Object>> list = pageInfo.getList();
for (Map<String, Object> 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<String, Object> 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<String, Object> 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 = "欠缴商户列表";


+ 0
- 1
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<WxBillProperty> resultList = wxBillPropertyMapper.findList(wxBillRent);
result.put("previewBillRentList",resultList);



+ 0
- 1
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<WxBillRent> resultList = wxBillRentMapper.findList(wxBillRent);
result.put("previewBillRentList",resultList);



Loading…
Откажи
Сачувај