|
|
@@ -11,6 +11,7 @@ import com.google.common.collect.Maps;
|
|
|
import com.yvan.Model;
|
|
|
import com.yvan.ModelOps;
|
|
|
import com.yvan.PageDb;
|
|
|
+import com.yvan.mvc.JsonBody;
|
|
|
import com.yvan.mvc.Pd;
|
|
|
import com.yvan.platform.Conv;
|
|
|
import com.yvan.platform.JsonWapper;
|
|
|
@@ -20,10 +21,7 @@ import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.SneakyThrows;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.ui.ModelMap;
|
|
|
-import org.springframework.web.bind.annotation.GetMapping;
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestParam;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
@@ -33,359 +31,388 @@ import java.util.Map;
|
|
|
@RestController
|
|
|
public class YeWeiHuiController {
|
|
|
|
|
|
- @Autowired
|
|
|
- private QzTaskService qzTaskService;
|
|
|
- @Autowired
|
|
|
- private RbService rbService;
|
|
|
+ @Autowired
|
|
|
+ private QzTaskService qzTaskService;
|
|
|
+ @Autowired
|
|
|
+ private RbService rbService;
|
|
|
|
|
|
- @Autowired
|
|
|
- private QzTaskReplyService qzTaskReplyService;
|
|
|
+ @Autowired
|
|
|
+ private QzTaskReplyService qzTaskReplyService;
|
|
|
|
|
|
- @Autowired
|
|
|
- private HomeService homeService;
|
|
|
+ @Autowired
|
|
|
+ private HomeService homeService;
|
|
|
|
|
|
- @Autowired
|
|
|
- private JmTuangouService jmTuangouService;
|
|
|
+ @Autowired
|
|
|
+ private JmTuangouService jmTuangouService;
|
|
|
|
|
|
- @Autowired
|
|
|
- private UptownMapper uptownMapper;
|
|
|
+ @Autowired
|
|
|
+ private UptownMapper uptownMapper;
|
|
|
|
|
|
- @Autowired
|
|
|
- private RbMapper rbMapper;
|
|
|
+ @Autowired
|
|
|
+ private RbMapper rbMapper;
|
|
|
|
|
|
- @Autowired
|
|
|
- private JmTuangouMemberService jmTuangouMemberService;
|
|
|
+ @Autowired
|
|
|
+ private JmTuangouMemberService jmTuangouMemberService;
|
|
|
|
|
|
- @GetMapping("/yeweihui/home.html")
|
|
|
- public ModelAndView yeweihui(ModelMap model,@RequestParam(value = "userId") Long userId, @RequestParam(value = "show", required = false, defaultValue = "-") String show) {
|
|
|
+ @GetMapping("/yeweihui/home.html")
|
|
|
+ public ModelAndView yeweihui(ModelMap model, @RequestParam(value = "userId") Long userId, @RequestParam(value = "show", required = false, defaultValue = "-") String show) {
|
|
|
|
|
|
// List<QzTask> taskList = qzTaskService.selectAll(1225321682867105793L);
|
|
|
// List<sysUptownUnit> rbList = rbService.selectAll(1225321682867105793L);
|
|
|
- List<QzTask> taskList = qzTaskService.selectAll(userId);
|
|
|
- List<sysUptownUnit> rbList = rbService.selectAll(userId);
|
|
|
- model.put("taskList", YvanUtil.toJsonPretty(taskList));
|
|
|
- model.put("rbList", YvanUtil.toJsonPretty(rbList));
|
|
|
- model.put("user_id", "\""+userId+"\"");
|
|
|
- model.put("show", "\""+show+"\"");
|
|
|
-
|
|
|
- return new ModelAndView("/yeweihui/home.ftl", model);
|
|
|
- }
|
|
|
+ List<QzTask> taskList = qzTaskService.selectAll(userId);
|
|
|
+ List<sysUptownUnit> rbList = rbService.selectAll(userId);
|
|
|
+ model.put("taskList", YvanUtil.toJsonPretty(taskList));
|
|
|
+ model.put("rbList", YvanUtil.toJsonPretty(rbList));
|
|
|
+ model.put("user_id", "\"" + userId + "\"");
|
|
|
+ model.put("show", "\"" + show + "\"");
|
|
|
+
|
|
|
+ return new ModelAndView("/yeweihui/home.ftl", model);
|
|
|
+ }
|
|
|
+
|
|
|
+ @GetMapping("/yeweihui/tuangouHome.html")
|
|
|
+ public ModelAndView yeweihuiTuangouHome(ModelMap model, @RequestParam(value = "userId") Long userId, @RequestParam(value = "show", required = false, defaultValue = "-") String show) {
|
|
|
+
|
|
|
+ model.put("user_id", "\"" + userId + "\"");
|
|
|
+ model.put("show", "\"" + show + "\"");
|
|
|
|
|
|
- @GetMapping("/yeweihui/qiuzhuDetail.html")
|
|
|
- public ModelAndView qiuzhudetail(@Pd(name = "taskId") Long taskId,@Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
|
|
|
+ return new ModelAndView("/yeweihui/tuangouHome.ftl", model);
|
|
|
+ }
|
|
|
|
|
|
- QzTask task = qzTaskService.queryByTaskId(taskId);
|
|
|
+ @GetMapping("/yeweihui/qiuzhuDetail.html")
|
|
|
+ public ModelAndView qiuzhudetail(@Pd(name = "taskId") Long taskId, @Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
|
|
|
+
|
|
|
+ QzTask task = qzTaskService.queryByTaskId(taskId);
|
|
|
// A业委会，B居委会，C物业，D志愿者
|
|
|
- StringBuffer target = new StringBuffer();
|
|
|
- if (task.getTaskTarget().equals("A")) {
|
|
|
- target.append("业委会");
|
|
|
- }
|
|
|
- else if (task.getTaskTarget().equals("B")) {
|
|
|
- if (target.length() > 0) {
|
|
|
- target.append("、居委会");
|
|
|
- }
|
|
|
- else {
|
|
|
- target.append("居委会");
|
|
|
- }
|
|
|
- }
|
|
|
- else if (task.getTaskTarget().equals("C")) {
|
|
|
- if (target.length() > 0) {
|
|
|
- target.append("、物业");
|
|
|
- }
|
|
|
- else {
|
|
|
- target.append("物业");
|
|
|
- }
|
|
|
- }
|
|
|
- else if (task.getTaskTarget().equals("D")) {
|
|
|
- if (target.length() > 0) {
|
|
|
- target.append("、志愿者");
|
|
|
- }
|
|
|
- else {
|
|
|
- target.append("志愿者");
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- task.setTaskTarget(target.toString());
|
|
|
-
|
|
|
- model.put("taskJson", new JsonWapper(task));
|
|
|
- model.put("task", task);
|
|
|
- model.put("userId", "\""+userId+"\"");
|
|
|
-
|
|
|
- return new ModelAndView("/yeweihui/qiuzhuDetail.ftl", model);
|
|
|
+ StringBuffer target = new StringBuffer();
|
|
|
+ if (task.getTaskTarget().equals("A")) {
|
|
|
+ target.append("业委会");
|
|
|
+ } else if (task.getTaskTarget().equals("B")) {
|
|
|
+ if (target.length() > 0) {
|
|
|
+ target.append("、居委会");
|
|
|
+ } else {
|
|
|
+ target.append("居委会");
|
|
|
+ }
|
|
|
+ } else if (task.getTaskTarget().equals("C")) {
|
|
|
+ if (target.length() > 0) {
|
|
|
+ target.append("、物业");
|
|
|
+ } else {
|
|
|
+ target.append("物业");
|
|
|
+ }
|
|
|
+ } else if (task.getTaskTarget().equals("D")) {
|
|
|
+ if (target.length() > 0) {
|
|
|
+ target.append("、志愿者");
|
|
|
+ } else {
|
|
|
+ target.append("志愿者");
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- @PostMapping("/yeweihui/qiuzhu/queryTasksByStatus.json")
|
|
|
- public Model queryTasksByStatus(@Pd(name = "status") Integer status) {
|
|
|
+ task.setTaskTarget(target.toString());
|
|
|
|
|
|
- List<QzTask> taskList = qzTaskService.queryQzTaskByStatus(status);
|
|
|
+ model.put("taskJson", new JsonWapper(task));
|
|
|
+ model.put("task", task);
|
|
|
+ model.put("userId", "\"" + userId + "\"");
|
|
|
|
|
|
- return Model.newSuccess(taskList);
|
|
|
- }
|
|
|
+ return new ModelAndView("/yeweihui/qiuzhuDetail.ftl", model);
|
|
|
+ }
|
|
|
|
|
|
- @PostMapping("/yeweihui/qiuzhu/reply/add.json")
|
|
|
- public ModelOps replyQiuzhuInsert(QzTaskReply qzTaskReply) {
|
|
|
+ @PostMapping("/yeweihui/qiuzhu/queryTasksByStatus.json")
|
|
|
+ public Model queryTasksByStatus(@Pd(name = "status") Integer status) {
|
|
|
|
|
|
- Integer success = qzTaskReplyService.insertQzTaskReply(qzTaskReply);
|
|
|
+ List<QzTask> taskList = qzTaskService.queryQzTaskByStatus(status);
|
|
|
|
|
|
- if (success > 0) {
|
|
|
- return ModelOps.newSuccess();
|
|
|
- }
|
|
|
- else {
|
|
|
- return ModelOps.newFail("操作失败");
|
|
|
- }
|
|
|
- }
|
|
|
+ return Model.newSuccess(taskList);
|
|
|
+ }
|
|
|
|
|
|
- @PostMapping("/yeweihui/qiuzhu/reply/querybytaskid.json")
|
|
|
- public Model replyQiuzhuQueryByTaskId(@Pd(name = "taskId") Long taskId) {
|
|
|
+ @PostMapping("/yeweihui/qiuzhu/reply/add.json")
|
|
|
+ public ModelOps replyQiuzhuInsert(QzTaskReply qzTaskReply) {
|
|
|
|
|
|
- List<QzTaskReply> reply = qzTaskReplyService.queryQzTaskReplyByTaskId(taskId);
|
|
|
+ Integer success = qzTaskReplyService.insertQzTaskReply(qzTaskReply);
|
|
|
|
|
|
- return Model.newSuccess(reply);
|
|
|
+ if (success > 0) {
|
|
|
+ return ModelOps.newSuccess();
|
|
|
+ } else {
|
|
|
+ return ModelOps.newFail("操作失败");
|
|
|
}
|
|
|
+ }
|
|
|
+
|
|
|
+ @PostMapping("/yeweihui/qiuzhu/reply/querybytaskid.json")
|
|
|
+ public Model replyQiuzhuQueryByTaskId(@Pd(name = "taskId") Long taskId) {
|
|
|
|
|
|
- @PostMapping("/yeweihui/qiuzhu/list.json")
|
|
|
- public Model queryByHouseNumber(String houseNumber, @Pd(name = "status") Integer status) {
|
|
|
+ List<QzTaskReply> reply = qzTaskReplyService.queryQzTaskReplyByTaskId(taskId);
|
|
|
|
|
|
- if (houseNumber.length() <= 0) {
|
|
|
- return Model.newSuccess(qzTaskService.queryQzTaskByStatus(status));
|
|
|
- }
|
|
|
+ return Model.newSuccess(reply);
|
|
|
+ }
|
|
|
|
|
|
- List<QzTask> list = qzTaskService.queryByHouseNumber(houseNumber, status);
|
|
|
+ @PostMapping("/yeweihui/qiuzhu/list.json")
|
|
|
+ public Model queryByHouseNumber(String houseNumber, @Pd(name = "status") Integer status) {
|
|
|
|
|
|
- return Model.newSuccess(list);
|
|
|
+ if (houseNumber.length() <= 0) {
|
|
|
+ return Model.newSuccess(qzTaskService.queryQzTaskByStatus(status));
|
|
|
}
|
|
|
|
|
|
- @GetMapping("/yeweihui/ribao.html")
|
|
|
- public ModelAndView yeweihuiRibao(ModelMap model) {
|
|
|
+ List<QzTask> list = qzTaskService.queryByHouseNumber(houseNumber, status);
|
|
|
+
|
|
|
+ return Model.newSuccess(list);
|
|
|
+ }
|
|
|
+
|
|
|
+ @GetMapping("/yeweihui/ribao.html")
|
|
|
+ public ModelAndView yeweihuiRibao(ModelMap model) {
|
|
|
|
|
|
// List<QzTask> taskList = qzTaskService.selectAll();
|
|
|
//
|
|
|
// model.put("taskList", YvanUtil.toJsonPretty(taskList));
|
|
|
|
|
|
- return new ModelAndView("/yeweihui/ribao.ftl", model);
|
|
|
- }
|
|
|
+ return new ModelAndView("/yeweihui/ribao.ftl", model);
|
|
|
+ }
|
|
|
|
|
|
- @GetMapping("/yeweihui/ribaoDy")
|
|
|
- public Model<List<SysUptownHouse>> yeweihuiRibaoDy(Long str) {
|
|
|
+ @GetMapping("/yeweihui/ribaoDy")
|
|
|
+ public Model<List<SysUptownHouse>> yeweihuiRibaoDy(Long str) {
|
|
|
// String[] split = str.split("&");
|
|
|
- List<SysUptownHouse> rbList = rbService.selectXq(str);
|
|
|
+ List<SysUptownHouse> rbList = rbService.selectXq(str);
|
|
|
+
|
|
|
+ return Model.newSuccess(rbList);
|
|
|
+ }
|
|
|
+
|
|
|
+ @GetMapping("/yeweihui/ribaoXq.html")
|
|
|
+ public ModelAndView yeweihuiRibaoYcXq(ModelMap model) {
|
|
|
+ Map<String, Object> queryParam = Maps.newLinkedHashMap();
|
|
|
+ queryParam.put("userId", "12345677");
|
|
|
+ queryParam.put("statistics", "M");
|
|
|
+ return new ModelAndView("/yeweihui/ribaoXq.ftl", model);
|
|
|
+ }
|
|
|
+
|
|
|
+ @GetMapping("/yeweihui/ribaoDyYcXq")
|
|
|
+ public Model<List<MsSuspected>> yeweihuiRibaoYcXq(Long houseId) {
|
|
|
+ List<MsSuspected> rbList = rbService.selectYcXq(houseId);
|
|
|
+ return Model.newSuccess(rbList);
|
|
|
+ }
|
|
|
+
|
|
|
+ @GetMapping("/yeweihui/ribaohuiz.html")
|
|
|
+ public ModelAndView yeweihuiRibaohuiz(ModelMap model) {
|
|
|
+ return new ModelAndView("/yeweihui/ribaohuiz.ftl", model);
|
|
|
+ }
|
|
|
+
|
|
|
+ @GetMapping("/whepi/yeweihui/ribaohuiz")
|
|
|
+ public Model<Map<String, Object>> yeweihuiRibaohuiz(Long userCreate, String reportDate) {
|
|
|
+// Long userCreate = 1225321682867105793L;
|
|
|
|
|
|
- return Model.newSuccess(rbList);
|
|
|
+ List<Uptown> uptowns = rbMapper.selectUptown(userCreate);
|
|
|
+
|
|
|
+ if (uptowns != null && uptowns.size() > 0) {
|
|
|
+ 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("reportCount")));
|
|
|
+ nums.add(Conv.NI(map2.get("yichangCount")));
|
|
|
+ nums.add(Conv.NI(map1.get("safetyNum")));
|
|
|
+ nums.add(Conv.NI(map1.get("suspectedNum")));
|
|
|
+ reMap.put("nums", nums);
|
|
|
+ return Model.newSuccess(reMap);
|
|
|
}
|
|
|
-
|
|
|
- @GetMapping("/yeweihui/ribaoXq.html")
|
|
|
- public ModelAndView yeweihuiRibaoYcXq(ModelMap model) {
|
|
|
- Map<String, Object> queryParam = Maps.newLinkedHashMap();
|
|
|
- queryParam.put("userId", "12345677");
|
|
|
- queryParam.put("statistics", "M");
|
|
|
- return new ModelAndView("/yeweihui/ribaoXq.ftl", model);
|
|
|
+ return Model.newFail("没有数据");
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ @ApiOperation("导出正常家庭上报明细")
|
|
|
+ @GetMapping("/whepi/yeweihui/exportRiBao")
|
|
|
+ @SneakyThrows
|
|
|
+ public void exportRiBao(@Pd(name = "uptownId") Long uptownId,
|
|
|
+ @Pd(name = "date") String date,
|
|
|
+ HttpServletResponse resp) {
|
|
|
+ if (uptownId == 1238790987234L) {
|
|
|
+ return;
|
|
|
}
|
|
|
-
|
|
|
- @GetMapping("/yeweihui/ribaoDyYcXq")
|
|
|
- public Model<List<MsSuspected>> yeweihuiRibaoYcXq(Long houseId) {
|
|
|
- List<MsSuspected> rbList = rbService.selectYcXq(houseId);
|
|
|
- return Model.newSuccess(rbList);
|
|
|
+ Uptown uptown = uptownMapper.selectById(uptownId);
|
|
|
+ if (uptown != null && uptown.getUptownId() > 0) {
|
|
|
+ Long upId = uptown.getUptownId();
|
|
|
+ String fileName = uptown.getUptownName();
|
|
|
+ fileName += "上报信息-";
|
|
|
+ fileName += date;
|
|
|
+ List<ExcelRiBao> list = rbMapper.selectExcelRiBao(upId, date);
|
|
|
+ ExcelUtils.writeSheet(ExcelRiBao.class, list).export(resp, fileName);
|
|
|
}
|
|
|
-
|
|
|
- @GetMapping("/yeweihui/ribaohuiz.html")
|
|
|
- public ModelAndView yeweihuiRibaohuiz(ModelMap model) {
|
|
|
- return new ModelAndView("/yeweihui/ribaohuiz.ftl", model);
|
|
|
+ }
|
|
|
+
|
|
|
+ @ApiOperation("导出凌云家庭上报明细")
|
|
|
+ @GetMapping("/whepi/lun/exportRiBao")
|
|
|
+ @SneakyThrows
|
|
|
+ public void lunExportRiBao(@Pd(name = "date") String date,
|
|
|
+ HttpServletResponse resp) {
|
|
|
+
|
|
|
+ Uptown uptown = uptownMapper.selectById("1238790987234");
|
|
|
+ Long upId = uptown.getUptownId();
|
|
|
+ String fileName = uptown.getUptownName();
|
|
|
+ fileName += "上报信息-";
|
|
|
+ fileName += date;
|
|
|
+ List<ExcelRiBaoLY> list = rbMapper.selectExcelRiBaoLY(upId, date);
|
|
|
+ ExcelUtils.writeSheet(ExcelRiBaoLY.class, list).export(resp, fileName);
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ @ApiOperation("导出小区家庭上报明细")
|
|
|
+ @GetMapping("/whepi/yeweihui/EXR")
|
|
|
+ @SneakyThrows
|
|
|
+ public void exportRiBaoByXiaoQu(@Pd(name = "uptownId") Long uptownId,
|
|
|
+ @Pd(name = "date") String date,
|
|
|
+ HttpServletResponse resp) {
|
|
|
+ Uptown uptown = uptownMapper.selectById(uptownId);
|
|
|
+ if (uptown != null && uptown.getUptownId() > 0) {
|
|
|
+ Long upId = uptown.getUptownId();
|
|
|
+ String fileName = uptown.getUptownName();
|
|
|
+ fileName += "上报信息-";
|
|
|
+ fileName += date;
|
|
|
+ List<ExcelRiBaoPrivate> list = rbMapper.selectExcelRiBaoPrivate(upId, date);
|
|
|
+ ExcelUtils.writeSheet(ExcelRiBaoPrivate.class, list).export(resp, fileName);
|
|
|
}
|
|
|
+ }
|
|
|
|
|
|
- @GetMapping("/whepi/yeweihui/ribaohuiz")
|
|
|
- public Model<Map<String, Object>> yeweihuiRibaohuiz(Long userCreate,String reportDate) {
|
|
|
-// Long userCreate = 1225321682867105793L;
|
|
|
-
|
|
|
- List<Uptown> uptowns = rbMapper.selectUptown(userCreate);
|
|
|
-
|
|
|
- if (uptowns!=null && uptowns.size()>0) {
|
|
|
- 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("reportCount")));
|
|
|
- nums.add(Conv.NI(map2.get("yichangCount")));
|
|
|
- nums.add(Conv.NI(map1.get("safetyNum")));
|
|
|
- nums.add(Conv.NI(map1.get("suspectedNum")));
|
|
|
- reMap.put("nums", nums);
|
|
|
- return Model.newSuccess(reMap);
|
|
|
- }
|
|
|
- return Model.newFail("没有数据");
|
|
|
+ @GetMapping("/yeweihui/tgPublish.html")
|
|
|
+ public ModelAndView tgPublish(@Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
|
|
|
+ model.put("userId", "\"" + userId + "\"");
|
|
|
|
|
|
- }
|
|
|
+ return new ModelAndView("/yeweihui/tgPublish.ftl", model);
|
|
|
+ }
|
|
|
|
|
|
- @ApiOperation("导出正常家庭上报明细")
|
|
|
- @GetMapping("/whepi/yeweihui/exportRiBao")
|
|
|
- @SneakyThrows
|
|
|
- public void exportRiBao(@Pd(name = "uptownId") Long uptownId,
|
|
|
- @Pd(name = "date") String date,
|
|
|
- HttpServletResponse resp) {
|
|
|
- if (uptownId == 1238790987234L) {
|
|
|
- return;
|
|
|
- }
|
|
|
- Uptown uptown = uptownMapper.selectById(uptownId);
|
|
|
- if (uptown!=null && uptown.getUptownId()>0) {
|
|
|
- Long upId = uptown.getUptownId();
|
|
|
- String fileName = uptown.getUptownName();
|
|
|
- fileName += "上报信息-";
|
|
|
- fileName += date;
|
|
|
- List<ExcelRiBao> list = rbMapper.selectExcelRiBao(upId,date);
|
|
|
- ExcelUtils.writeSheet(ExcelRiBao.class, list).export(resp, fileName);
|
|
|
- }
|
|
|
- }
|
|
|
+ @GetMapping("/yeweihui/groupBuyingCx.html")
|
|
|
+ public ModelAndView groupBuyingCx(@Pd(name = "jmId") Long jmId, @Pd(name = "userId") Long userId, @Pd(name = "operation") String operation, ModelMap model) throws JsonProcessingException {
|
|
|
|
|
|
- @ApiOperation("导出凌云家庭上报明细")
|
|
|
- @GetMapping("/whepi/lun/exportRiBao")
|
|
|
- @SneakyThrows
|
|
|
- public void lunExportRiBao(@Pd(name = "date") String date,
|
|
|
- HttpServletResponse resp) {
|
|
|
+ JmTuangou item = jmTuangouService.queryByJmId(jmId);
|
|
|
|
|
|
- Uptown uptown = uptownMapper.selectById("1238790987234");
|
|
|
- Long upId = uptown.getUptownId();
|
|
|
- String fileName = uptown.getUptownName();
|
|
|
- fileName += "上报信息-";
|
|
|
- fileName += date;
|
|
|
- List<ExcelRiBaoLY> list = rbMapper.selectExcelRiBaoLY(upId, date);
|
|
|
- ExcelUtils.writeSheet(ExcelRiBaoLY.class, list).export(resp, fileName);
|
|
|
+ model.put("tgItemJson", new JsonWapper(item));
|
|
|
+ model.put("tgItem", item);
|
|
|
|
|
|
- }
|
|
|
+ model.put("userId", "\"" + userId + "\"");
|
|
|
|
|
|
- @ApiOperation("导出小区家庭上报明细")
|
|
|
- @GetMapping("/whepi/yeweihui/EXR")
|
|
|
- @SneakyThrows
|
|
|
- public void exportRiBaoByXiaoQu(@Pd(name = "uptownId") Long uptownId,
|
|
|
- @Pd(name = "date") String date,
|
|
|
- HttpServletResponse resp) {
|
|
|
- Uptown uptown = uptownMapper.selectById(uptownId);
|
|
|
- if (uptown!=null && uptown.getUptownId()>0) {
|
|
|
- Long upId = uptown.getUptownId();
|
|
|
- String fileName = uptown.getUptownName();
|
|
|
- fileName += "上报信息-";
|
|
|
- fileName += date;
|
|
|
- List<ExcelRiBaoPrivate> list = rbMapper.selectExcelRiBaoPrivate(upId,date);
|
|
|
- ExcelUtils.writeSheet(ExcelRiBaoPrivate.class, list).export(resp, fileName);
|
|
|
- }
|
|
|
- }
|
|
|
+ model.put("operation", "\"" + operation + "\"");
|
|
|
|
|
|
- @GetMapping("/yeweihui/tgPublish.html")
|
|
|
- public ModelAndView tgPublish(@Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
|
|
|
- model.put("userId", "\""+userId+"\"");
|
|
|
+ return new ModelAndView("/groupBuying/groupBuyingCx.ftl", model);
|
|
|
+ }
|
|
|
|
|
|
- return new ModelAndView("/yeweihui/tgPublish.ftl", model);
|
|
|
- }
|
|
|
+ @GetMapping("/yeweihui/groupBuyingXx.html")
|
|
|
+ public ModelAndView groupBuyingXx(@Pd(name = "jmId") Long jmId, @Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
|
|
|
|
|
|
- @GetMapping("/yeweihui/groupBuyingCx.html")
|
|
|
- public ModelAndView groupBuyingCx(@Pd(name = "jmId") Long jmId, @Pd(name = "userId") Long userId, @Pd(name = "operation") String operation, ModelMap model) throws JsonProcessingException {
|
|
|
+ JmTuangou item = jmTuangouService.queryByJmId(jmId);
|
|
|
|
|
|
- JmTuangou item = jmTuangouService.queryByJmId(jmId);
|
|
|
+ if (item.getUserId().equals(userId)) {
|
|
|
+ model.put("isMine", "mine");
|
|
|
+ } else {
|
|
|
+ model.put("isMine", "notMine");
|
|
|
+ }
|
|
|
|
|
|
- model.put("tgItemJson", new JsonWapper(item));
|
|
|
- model.put("tgItem", item);
|
|
|
+ model.put("userId", "\"" + userId + "\"");
|
|
|
+ model.put("tgItemJson", new JsonWapper(item));
|
|
|
+ model.put("tgItem", item);
|
|
|
|
|
|
- model.put("userId", "\""+userId+"\"");
|
|
|
+ return new ModelAndView("/groupBuying/groupBuyingXx.ftl", model);
|
|
|
+ }
|
|
|
|
|
|
- model.put("operation", "\""+operation+"\"");
|
|
|
+ @GetMapping("/yeweihui/tuangou/member/list.html")
|
|
|
+ public ModelAndView tuangouMemberList(@Pd(name = "jmId") Long jmId, @Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
|
|
|
|
|
|
- return new ModelAndView("/groupBuying/groupBuyingCx.ftl", model);
|
|
|
- }
|
|
|
+ JmTuangou item = jmTuangouService.queryByJmId(jmId);
|
|
|
|
|
|
- @GetMapping("/yeweihui/groupBuyingXx.html")
|
|
|
- public ModelAndView groupBuyingXx(@Pd(name = "jmId") Long jmId, @Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
|
|
|
+ List<JmTuangouMember> members = jmTuangouMemberService.querMemberListByJmId(jmId);
|
|
|
|
|
|
- JmTuangou item = jmTuangouService.queryByJmId(jmId);
|
|
|
+ model.put("tgItemJson", new JsonWapper(item));
|
|
|
+ model.put("tgItem", item);
|
|
|
|
|
|
- if (item.getUserId().equals(userId)) {
|
|
|
- model.put("isMine", "mine");
|
|
|
- }
|
|
|
- else {
|
|
|
- model.put("isMine", "notMine");
|
|
|
- }
|
|
|
+ model.put("members", YvanUtil.toJsonPretty(members));
|
|
|
|
|
|
- model.put("userId", "\""+userId+"\"");
|
|
|
- model.put("tgItemJson", new JsonWapper(item));
|
|
|
- model.put("tgItem", item);
|
|
|
+ model.put("userId", "\"" + userId + "\"");
|
|
|
|
|
|
- return new ModelAndView("/groupBuying/groupBuyingXx.ftl", model);
|
|
|
- }
|
|
|
+ return new ModelAndView("/yeweihui/tuangouMemberList.ftl", model);
|
|
|
+ }
|
|
|
|
|
|
- @GetMapping("/yeweihui/tuangou/member/list.html")
|
|
|
- public ModelAndView tuangouMemberList(@Pd(name = "jmId") Long jmId, @Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
|
|
|
+ @ApiOperation("导出团购家庭信息")
|
|
|
+ @GetMapping("/yeweihui/tuangou/member/list/export")
|
|
|
+ @SneakyThrows
|
|
|
+ public void tgMembersExport(@Pd(name = "jmId") Long jmId,
|
|
|
+ HttpServletResponse resp) {
|
|
|
|
|
|
- JmTuangou item = jmTuangouService.queryByJmId(jmId);
|
|
|
+ List<JmTuangouMember> members = jmTuangouMemberService.querMemberListByJmId(jmId);
|
|
|
|
|
|
- List<JmTuangouMember> members = jmTuangouMemberService.querMemberListByJmId(jmId);
|
|
|
+ String fileName = "团购家庭信息";
|
|
|
+ ExcelUtils.writeSheet(JmTuangouMember.class, members).export(resp, fileName);
|
|
|
|
|
|
- model.put("tgItemJson", new JsonWapper(item));
|
|
|
- model.put("tgItem", item);
|
|
|
+ }
|
|
|
|
|
|
- model.put("members", YvanUtil.toJsonPretty(members));
|
|
|
+ @PostMapping("/yeweihui/groupBuyingCx/remark/add.json")
|
|
|
+ public Model groupBuyingCxRemarkAdd(@Pd(name = "jmId") Long jmId, @Pd(name = "status", required = false, defaultValue = "0") Long status, @Pd(name = "remark", required = false) String remark) {
|
|
|
|
|
|
- model.put("userId", "\""+userId+"\"");
|
|
|
+ Integer success = jmTuangouService.updateRemarkByJmId(jmId, status, remark);
|
|
|
|
|
|
- return new ModelAndView("/yeweihui/tuangouMemberList.ftl", model);
|
|
|
+ if (success == 1) {
|
|
|
+ return Model.newSuccess("操作成功");
|
|
|
+ } else {
|
|
|
+ return Model.newFail("操作失败");
|
|
|
}
|
|
|
+ }
|
|
|
|
|
|
- @ApiOperation("导出团购家庭信息")
|
|
|
- @GetMapping("/yeweihui/tuangou/member/list/export")
|
|
|
- @SneakyThrows
|
|
|
- public void tgMembersExport(@Pd(name = "jmId") Long jmId,
|
|
|
- HttpServletResponse resp) {
|
|
|
+ @PostMapping("/yeweihui/tgPublish.json")
|
|
|
+ public Model tuangouPublish(JmTuangou jmTuangou) {
|
|
|
|
|
|
- List<JmTuangouMember> members = jmTuangouMemberService.querMemberListByJmId(jmId);
|
|
|
+ Integer success = jmTuangouService.tuangouPublish(jmTuangou);
|
|
|
+ if (success == 1) {
|
|
|
+ return Model.newSuccess("操作成功");
|
|
|
+ } else {
|
|
|
+ return Model.newFail("操作失败");
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- String fileName = "团购家庭信息";
|
|
|
- ExcelUtils.writeSheet(JmTuangouMember.class, members).export(resp, fileName);
|
|
|
+ @PostMapping("/whepi/yeweihui/tglist")
|
|
|
+ public Model whepiTuangoulist(@Pd(name = "userId", required = false) Long userId, @Pd(name = "uptownIds", required = false) String uptownIds, @Pd(name = "queryProperties", required = false) String queryProperties, @Pd(name = "tgStatus", required = false) Long tgStatus,
|
|
|
+ PageDb pageDb) {
|
|
|
+ //系统管理员只有一个人 获取当前userId
|
|
|
+ JmTuangou jmTuangou = jmTuangouService.selectByUserId();
|
|
|
|
|
|
- }
|
|
|
+ List<JmTuangou> myList = jmTuangouService.whepiTuangoulist(jmTuangou.getUserId(),
|
|
|
+ uptownIds, queryProperties, tgStatus, pageDb);
|
|
|
|
|
|
- @PostMapping("/yeweihui/groupBuyingCx/remark/add.json")
|
|
|
- public Model groupBuyingCxRemarkAdd(@Pd(name = "jmId") Long jmId, @Pd(name = "status", required = false, defaultValue = "0") Long status, @Pd(name = "remark", required = false) String remark) {
|
|
|
+ return Model.newSuccess(pageDb, myList);
|
|
|
+ }
|
|
|
|
|
|
- Integer success = jmTuangouService.updateRemarkByJmId(jmId, status, remark);
|
|
|
+ @PostMapping("/whepi/yeweihui/tgPublish")
|
|
|
+ public ModelOps whepiTuangouPublish(@JsonBody JmTuangou jmTuangou) {
|
|
|
|
|
|
- if (success == 1) {
|
|
|
- return Model.newSuccess("操作成功");
|
|
|
- }
|
|
|
- else {
|
|
|
- return Model.newFail("操作失败");
|
|
|
- }
|
|
|
- }
|
|
|
+ int success = jmTuangouService.whepiTuangouPublish(jmTuangou.getUptownIds(), jmTuangou);
|
|
|
+ return ModelOps.newSuccess(success);
|
|
|
+ }
|
|
|
|
|
|
- @PostMapping("/yeweihui/tgPublish.json")
|
|
|
- public Model tuangouPublish(JmTuangou jmTuangou) {
|
|
|
+ @PostMapping("/yeweihui/tuangou/list/query.json")
|
|
|
+ public Model queryTuangouListByTitle(@Pd(name = "userId") Long userId, @Pd(name = "title", required = false) String title) {
|
|
|
|
|
|
- Integer success = jmTuangouService.tuangouPublish(jmTuangou);
|
|
|
- if (success == 1) {
|
|
|
- return Model.newSuccess("操作成功");
|
|
|
- }
|
|
|
- else {
|
|
|
- return Model.newFail("操作失败");
|
|
|
- }
|
|
|
- }
|
|
|
+ List<JmTuangou> list = jmTuangouService.queryTuangouListByTitle(userId, title);
|
|
|
|
|
|
- @PostMapping("/yeweihui/tuangou/list/query.json")
|
|
|
- public Model queryTuangouListByTitle(@Pd(name = "userId") Long userId, @Pd(name = "title", required = false) String title) {
|
|
|
+ return Model.newSuccess(list);
|
|
|
+ }
|
|
|
|
|
|
- List<JmTuangou> list = jmTuangouService.queryTuangouListByTitle(userId, title);
|
|
|
+ @PostMapping("/yeweihui/tuangou/mylist/query.json")
|
|
|
+ public Model queryTuangouMyListByTitle(@Pd(name = "userId") Long userId, @Pd(name = "title", required = false) String title) {
|
|
|
|
|
|
- return Model.newSuccess(list);
|
|
|
- }
|
|
|
+ List<JmTuangou> myList = jmTuangouService.queryTuangouMyListByTitle(userId, title);
|
|
|
|
|
|
- @PostMapping("/yeweihui/tuangou/mylist/query.json")
|
|
|
- public Model queryTuangouMyListByTitle(@Pd(name = "userId") Long userId, @Pd(name = "title", required = false) String title) {
|
|
|
+ return Model.newSuccess(myList);
|
|
|
+ }
|
|
|
|
|
|
- List<JmTuangou> myList = jmTuangouService.queryTuangouMyListByTitle(userId, title);
|
|
|
+ @PostMapping("/whepi/yeweihui/tgStatus")
|
|
|
+ public ModelOps whepiYeweihuiTgStatus(@JsonBody JmTuangou jmTuangou) {
|
|
|
+ int success = jmTuangouService.updateRemarkByJmId(jmTuangou.getJmId(),4L, jmTuangou.getRemark());
|
|
|
+ return ModelOps.newSuccess(success);
|
|
|
+ }
|
|
|
|
|
|
- return Model.newSuccess(myList);
|
|
|
- }
|
|
|
+ @PostMapping("/whepi/getAllUptown")
|
|
|
+ public Model<List<Uptown>> getAllUptown(HttpParameterParser parser, PageDb pageDb) {
|
|
|
+ return Model.newSuccess(pageDb, uptownMapper.getUptowns(pageDb, parser.getMap()));
|
|
|
+ }
|
|
|
|
|
|
- @PostMapping("/whepi/getAllUptown")
|
|
|
- public Model<List<Uptown>> getAllUptown(HttpParameterParser parser, PageDb pageDb) {
|
|
|
- return Model.newSuccess(pageDb, uptownMapper.getUptowns(pageDb, parser.getMap()));
|
|
|
- }
|
|
|
+ @PostMapping("/whepi/getSelectOne")
|
|
|
+ public Model<JmTuangou> getSelectOne(@Pd(name = "jmId")Long jmId){
|
|
|
+ return Model.newSuccess(jmTuangouService.getSelectOne(jmId));
|
|
|
+ }
|
|
|
}
|
lange