|
|
@@ -1,7 +1,6 @@
|
|
|
package com.bofeng.wx.controller;
|
|
|
|
|
|
import com.bofeng.dao.RbMapper;
|
|
|
-import com.bofeng.dao.UptownMapper;
|
|
|
import com.bofeng.entity.*;
|
|
|
import com.bofeng.excel.ExcelUtils;
|
|
|
import com.bofeng.service.HomeService;
|
|
|
@@ -46,13 +45,10 @@ public class YeWeiHuiController {
|
|
|
private HomeService homeService;
|
|
|
|
|
|
@Autowired
|
|
|
- private UptownMapper uptownMapper;
|
|
|
-
|
|
|
- @Autowired
|
|
|
private RbMapper rbMapper;
|
|
|
|
|
|
@GetMapping("/yeweihui/home.html")
|
|
|
- public ModelAndView yeweihui(ModelMap model,@RequestParam(value = "userId") Long userId, @RequestParam(value = "showQZ", required = false, defaultValue = "-") String showQZ) {
|
|
|
+ public ModelAndView yeweihui(ModelMap model,@RequestParam(value = "userId") Long userId) {
|
|
|
|
|
|
// List<QzTask> taskList = qzTaskService.selectAll(1225321682867105793L);
|
|
|
// List<sysUptownUnit> rbList = rbService.selectAll(1225321682867105793L);
|
|
|
@@ -61,7 +57,6 @@ public class YeWeiHuiController {
|
|
|
model.put("taskList", YvanUtil.toJsonPretty(taskList));
|
|
|
model.put("rbList", YvanUtil.toJsonPretty(rbList));
|
|
|
model.put("user_id", "\""+userId+"\"");
|
|
|
- model.put("showQZ", "\""+showQZ+"\"");
|
|
|
|
|
|
return new ModelAndView("/yeweihui/home.ftl", model);
|
|
|
}
|
|
|
@@ -188,8 +183,8 @@ public class YeWeiHuiController {
|
|
|
}
|
|
|
|
|
|
@GetMapping("/yeweihui/ribaohuiz")
|
|
|
- public Model<Map<String, Object>> yeweihuiRibaohuiz(Long userCreate,String reportDate) {
|
|
|
-// Long userCreate = 1225321682867105793L;
|
|
|
+ public Model<Map<String, Object>> yeweihuiRibaohuiz(/*Long userCreate,*/String reportDate) {
|
|
|
+ Long userCreate = 1226159827797225474L;
|
|
|
|
|
|
List<Uptown> uptowns = rbMapper.selectUptown(userCreate);
|
|
|
|
|
|
@@ -197,12 +192,11 @@ public class YeWeiHuiController {
|
|
|
Long upId = uptowns.get(0).getUptownId();
|
|
|
Map<String, Integer> map1 = rbMapper.selecthuiz(upId,reportDate);
|
|
|
Map<String, Integer> map2 = rbMapper.selectyicahng(upId,reportDate);
|
|
|
- Map<String, Integer> map3 = rbMapper.selecthuiz1(upId);
|
|
|
|
|
|
Map<String, Object> reMap = Maps.newHashMap();
|
|
|
reMap.put("uptownName", uptowns.get(0).getUptownName());
|
|
|
List<Integer> nums = Lists.newArrayList();
|
|
|
- nums.add(Conv.NI(map3.get("houseCount")));
|
|
|
+ nums.add(Conv.NI(map1.get("houseCount")));
|
|
|
nums.add(Conv.NI(map1.get("reportCount")));
|
|
|
nums.add(Conv.NI(map2.get("yichangCount")));
|
|
|
nums.add(Conv.NI(map1.get("safetyNum")));
|
|
|
@@ -232,23 +226,4 @@ public class YeWeiHuiController {
|
|
|
ExcelUtils.writeSheet(ExcelRiBao.class, list).export(resp, fileName);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- @ApiOperation("导出家庭上报明细")
|
|
|
- @GetMapping("/yeweihui/EXR")
|
|
|
- @SneakyThrows
|
|
|
- public void exportRiBaoByXiaoQu(@Pd(name = "xid") Long xid,
|
|
|
- @Pd(name = "d") String d,
|
|
|
- HttpServletResponse resp) {
|
|
|
-
|
|
|
- Uptown uptown = uptownMapper.selectById(xid);
|
|
|
-
|
|
|
- if (uptown!=null && uptown.getUptownId()>0) {
|
|
|
- Long upId = uptown.getUptownId();
|
|
|
- String fileName = uptown.getUptownName();
|
|
|
- fileName += "上报信息-";
|
|
|
- fileName += d;
|
|
|
- List<ExcelRiBaoPrivate> list = rbMapper.selectExcelRiBaoPrivate(upId,d);
|
|
|
- ExcelUtils.writeSheet(ExcelRiBaoPrivate.class, list).export(resp, fileName);
|
|
|
- }
|
|
|
- }
|
|
|
}
|
maoyunfeng