依赖调整

ccic-exam/pom.xml

@@ -16,11 +16,11 @@
 
     <dependencies>
 
-        <dependency>
+<!--        <dependency>-->
-            <groupId>org.yaml</groupId>
+<!--            <groupId>org.yaml</groupId>-->
-            <artifactId>snakeyaml</artifactId>
+<!--            <artifactId>snakeyaml</artifactId>-->
-            <version>2.3-ccic</version>
+<!--            <version>2.3-ccic</version>-->
-        </dependency>
+<!--        </dependency>-->
         <!--nacos-config-->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
@@ -158,11 +158,11 @@
             <version>1.4.01</version>
         </dependency>
 
-        <dependency>
+<!--        <dependency>-->
-            <groupId>com.bes.appserv-web</groupId>
+<!--            <groupId>com.bes.appserv-web</groupId>-->
-            <artifactId>bes-lite-spring-boot-2.x-starter</artifactId>
+<!--            <artifactId>bes-lite-spring-boot-2.x-starter</artifactId>-->
-            <version>9.5.2.008</version>
+<!--            <version>9.5.2.008</version>-->
-        </dependency>
+<!--        </dependency>-->
 
         <dependency>
             <groupId>cn.hutool</groupId>
@@ -175,12 +175,12 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
         </dependency>
-        <dependency>
+<!--        <dependency>-->
-            <groupId>com.ccic.safeliab</groupId>
+<!--            <groupId>com.ccic.safeliab</groupId>-->
-            <artifactId>ccic-business</artifactId>
+<!--            <artifactId>ccic-business</artifactId>-->
-            <version>1.0-SNAPSHOT</version>
+<!--            <version>1.0-SNAPSHOT</version>-->
-            <scope>compile</scope>
+<!--            <scope>compile</scope>-->
-        </dependency>
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -199,4 +199,18 @@
             </plugin>
         </plugins>
     </build>
+
+    <repositories>
+        <repository>
+            <id>local-repo</id>
+            <url>file:///D:/apache-maven-3.6.3/repository</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
 </project>

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<String, Object> param) {
-//        User user = CcicUtill.mapToEntity(param, User.class);
-//        Map<String, Object> map = userService.login(user);
-//        if (map == null) {
-//            return R.error().message("账号错误,无此用户!").code(500);
-//        }
-//        return R.ok().data(map);
-//    }
-
 
 }

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<String, Object> param) {
+    public R getOrganByParam(@RequestParam Map<String, Object> 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<Organ> list = statisticsService.getOrganByParam(param);
         if (list == null || list.size() <= 0) {

ccic-exam/src/main/resources/mappers/ServiceStatMapper.xml

@@ -103,10 +103,10 @@
                 </if>
             </if>
             <if test="policy.startDate != null and policy.startDate != ''">
-                AND p.start_date &gt;= #{policy.startDate}
+                AND p.start_date &gt;= #{policy.startDate} || ' 00:00:00'
             </if>
             <if test="policy.doneDate != null and policy.doneDate != ''">
-                AND p.done_date &lt;= #{policy.doneDate}
+                AND p.done_date &lt;= #{policy.doneDate} || ' 23:59:59'
             </if>
         </where>
     </sql>