|
@@ -7,6 +7,7 @@ import com.bofeng.service.MsReportService;
|
|
|
import com.bofeng.service.MsTripService;
|
|
import com.bofeng.service.MsTripService;
|
|
|
import com.bofeng.word.WordUtils;
|
|
import com.bofeng.word.WordUtils;
|
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Lists;
|
|
|
|
|
+import com.yvan.platform.Conv;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
@@ -35,7 +36,7 @@ public class EpiLYExportController {
|
|
|
@GetMapping("/whepi/export/lyReport")
|
|
@GetMapping("/whepi/export/lyReport")
|
|
|
public @ResponseBody
|
|
public @ResponseBody
|
|
|
void exportSellPlan(HttpServletRequest request, HttpServletResponse response) {
|
|
void exportSellPlan(HttpServletRequest request, HttpServletResponse response) {
|
|
|
- Long userId = Long.parseLong(request.getParameter("userId"));
|
|
|
|
|
|
|
+ Long userId = Conv.NL(request.getParameter("userId"));
|
|
|
String userName = " ", workPlace = " ", telPhone = " ", isLeave = " ", trip = " ", blackTime = " ", veicle = " ", otherSymptom = " ", isTrue = " ";
|
|
String userName = " ", workPlace = " ", telPhone = " ", isLeave = " ", trip = " ", blackTime = " ", veicle = " ", otherSymptom = " ", isTrue = " ";
|
|
|
//用户姓名，电话
|
|
//用户姓名，电话
|
|
|
UserOpen userOpen = userOpenMapper.selectUserBaseByUserId(userId);
|
|
UserOpen userOpen = userOpenMapper.selectUserBaseByUserId(userId);
|
|
@@ -118,7 +119,7 @@ public class EpiLYExportController {
|
|
|
String[] listUserId = userIds.split(",");
|
|
String[] listUserId = userIds.split(",");
|
|
|
List<Map<String, Object>> list = Lists.newArrayList();
|
|
List<Map<String, Object>> list = Lists.newArrayList();
|
|
|
for (String userStringId : listUserId) {
|
|
for (String userStringId : listUserId) {
|
|
|
- Long userId = Long.parseLong(userStringId);
|
|
|
|
|
|
|
+ Long userId = Conv.NL(userStringId);
|
|
|
String userName = " ", workPlace = " ", telPhone = " ", isLeave = " ", trip = " ", blackTime = " ", veicle = " ", otherSymptom = " ", isTrue = " ";
|
|
String userName = " ", workPlace = " ", telPhone = " ", isLeave = " ", trip = " ", blackTime = " ", veicle = " ", otherSymptom = " ", isTrue = " ";
|
|
|
//用户姓名，电话
|
|
//用户姓名，电话
|
|
|
UserOpen userOpen = userOpenMapper.selectUserBaseByUserId(userId);
|
|
UserOpen userOpen = userOpenMapper.selectUserBaseByUserId(userId);
|
|
@@ -198,7 +199,7 @@ public class EpiLYExportController {
|
|
|
@GetMapping("/whepi/export/lyApprove")
|
|
@GetMapping("/whepi/export/lyApprove")
|
|
|
public @ResponseBody
|
|
public @ResponseBody
|
|
|
void lyApprove(HttpServletRequest request, HttpServletResponse response) {
|
|
void lyApprove(HttpServletRequest request, HttpServletResponse response) {
|
|
|
- Long userId = Long.parseLong(request.getParameter("userId"));
|
|
|
|
|
|
|
+ Long userId = Conv.NL(request.getParameter("userId"));
|
|
|
String userName = " ", org = " ", gander = " ", bAddr = " ", backDate = " ", otherSymptom = " ";
|
|
String userName = " ", org = " ", gander = " ", bAddr = " ", backDate = " ", otherSymptom = " ";
|
|
|
//用户姓名，部门
|
|
//用户姓名，部门
|
|
|
UserOpen userOpen = userOpenMapper.selectUserBaseByUserId(userId);
|
|
UserOpen userOpen = userOpenMapper.selectUserBaseByUserId(userId);
|
|
@@ -259,7 +260,7 @@ public class EpiLYExportController {
|
|
|
String[] listUserId = userIds.split(",");
|
|
String[] listUserId = userIds.split(",");
|
|
|
List<Map<String, Object>> list = Lists.newArrayList();
|
|
List<Map<String, Object>> list = Lists.newArrayList();
|
|
|
for (String userStringId : listUserId) {
|
|
for (String userStringId : listUserId) {
|
|
|
- Long userId = Long.parseLong(userStringId);
|
|
|
|
|
|
|
+ Long userId = Conv.NL(userStringId);
|
|
|
String userName = " ", org = " ", gander = " ", bAddr = " ", backDate = " ", otherSymptom = " ";
|
|
String userName = " ", org = " ", gander = " ", bAddr = " ", backDate = " ", otherSymptom = " ";
|
|
|
//用户姓名，部门
|
|
//用户姓名，部门
|
|
|
UserOpen userOpen = userOpenMapper.selectUserBaseByUserId(userId);
|
|
UserOpen userOpen = userOpenMapper.selectUserBaseByUserId(userId);
|
