diff --git a/ccic-exam/pom.xml b/ccic-exam/pom.xml index 7f62376..c191808 100644 --- a/ccic-exam/pom.xml +++ b/ccic-exam/pom.xml @@ -16,11 +16,11 @@ - - org.yaml - snakeyaml - 2.3-ccic - + + + + + com.alibaba.cloud @@ -158,11 +158,11 @@ 1.4.01 - - com.bes.appserv-web - bes-lite-spring-boot-2.x-starter - 9.5.2.008 - + + + + + cn.hutool @@ -175,12 +175,12 @@ org.apache.commons commons-pool2 - - com.ccic.safeliab - ccic-business - 1.0-SNAPSHOT - compile - + + + + + + com.alibaba @@ -199,4 +199,18 @@ + + + + local-repo + file:///D:/apache-maven-3.6.3/repository + + true + + + true + + + + diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/web/DemoController.java b/ccic-exam/src/main/java/com/ccic/safeliab/web/DemoController.java index 5fe880d..2da929a 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/web/DemoController.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/web/DemoController.java @@ -1,15 +1,7 @@ package com.ccic.safeliab.web; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.bes.enterprise.webtier.servlet4preview.http.HttpServletRequest; -import com.ccic.safeliab.entity.Customer; -import com.ccic.safeliab.entity.Grid; -import com.ccic.safeliab.entity.Organ; -import com.ccic.safeliab.entity.User; -import com.ccic.safeliab.exceptionhandler.CcicException; import com.ccic.safeliab.service.DemoService; import com.ccic.safeliab.support.Condition; -import com.ccic.safeliab.util.CcicUtill; import com.ccic.safeliab.util.JwtUtils; import com.ccic.safeliab.util.R; import com.ccic.safeliab.vo.InsDemoVO; @@ -17,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.HashMap; -import java.util.List; import java.util.Map; @RestController @@ -49,15 +40,5 @@ public class DemoController { } -// @PostMapping("testLogin") -// public R testLogin(@RequestParam Map param) { -// User user = CcicUtill.mapToEntity(param, User.class); -// Map map = userService.login(user); -// if (map == null) { -// return R.error().message("账号错误,无此用户!").code(500); -// } -// return R.ok().data(map); -// } - } diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/web/StatisticsController.java b/ccic-exam/src/main/java/com/ccic/safeliab/web/StatisticsController.java index e605272..a94f2a1 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/web/StatisticsController.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/web/StatisticsController.java @@ -7,6 +7,7 @@ import com.ccic.safeliab.excel.ServiceStatExcel; import com.ccic.safeliab.service.CustomerRetService; import com.ccic.safeliab.service.StatisticsService; import com.ccic.safeliab.util.CcicUtill; +import com.ccic.safeliab.util.JwtUtils; import com.ccic.safeliab.util.R; import com.ccic.safeliab.vo.CustomerRetentionVO; import com.ccic.safeliab.vo.CustomerVO; @@ -17,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URLEncoder; @@ -32,7 +34,7 @@ import java.util.Map; @Slf4j @RestController @RequestMapping("/ex/statistics") -public class StatisticsController extends BaseController{ +public class StatisticsController{ @Autowired private StatisticsService statisticsService; @@ -102,10 +104,10 @@ public class StatisticsController extends BaseController{ } @GetMapping("/getOrganByOrganId") - public R getOrganByParam(@RequestParam Map param) { + public R getOrganByParam(@RequestParam Map param, HttpServletRequest request) { String organId = CcicUtill.checkStr(param.get("organId")); if (StringUtils.isEmpty(organId)) { - param.put("organId", getUserMsg().getOrganId()); + param.put("organId", JwtUtils.getMemberIdByJwtToken(request, "organId")); } List list = statisticsService.getOrganByParam(param); if (list == null || list.size() <= 0) { diff --git a/ccic-exam/src/main/resources/mappers/ServiceStatMapper.xml b/ccic-exam/src/main/resources/mappers/ServiceStatMapper.xml index 177b8a4..35d31ef 100644 --- a/ccic-exam/src/main/resources/mappers/ServiceStatMapper.xml +++ b/ccic-exam/src/main/resources/mappers/ServiceStatMapper.xml @@ -103,10 +103,10 @@ - AND p.start_date >= #{policy.startDate} + AND p.start_date >= #{policy.startDate} || ' 00:00:00' - AND p.done_date <= #{policy.doneDate} + AND p.done_date <= #{policy.doneDate} || ' 23:59:59'