1、调整优化

fs-company-app/src/main/java/com/fs/app/controller/FsUserController.java

@@ -91,32 +91,11 @@ public class FsUserController extends AppBaseController {
     public ResponseResult<PageInfo<FsUserPageListVO>> pageList(@RequestBody FsUserPageListParam param) {
         log.debug("用户会员分页列表 param: {}", JSON.toJSONString(param));
         param.setUserId(Long.parseLong(getUserId()));
-//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
         param.setIsHidePhoneMiddle(false);
         PageInfo<FsUserPageListVO> fsUserPageListVOPageInfo = fsUserService.selectFsUserPageList(param);
-//        PageInfo<FsUserPageListVO> pageInfo = new PageInfo<>(list);
         return ResponseResult.ok(fsUserPageListVOPageInfo);
     }
-    @Login
-    @PostMapping("/pageListByApp")
-    @ApiOperation("用户会员分页列表")
-    public ResponseResult<PageInfo<FsUser>> pageListByApp(@RequestBody FsUser param) {
-        log.debug("用户会员分页列表 param: {}", JSON.toJSONString(param));
-        param.setUserId(Long.parseLong(getUserId()));
-        List<FsUser> fsUsers = fsUserService.selectFsUserList(param);
-        List<DictVO> dictVOS = dictDataMapper.selectDictDataListByType("sys_course_project");
-        Map<String, String> projectMap = dictVOS.stream()
-                .collect(Collectors.toMap(DictVO::getDictValue, DictVO::getDictLabel));
-        for (FsUser vo : fsUsers) {
-            if (vo.getProjectId() != null) {
-                String projectName = projectMap.get(vo.getProjectId().toString());
-                if (projectName != null) {
-                    vo.setProjectName(projectName);
-                }
-            }
-        }
-        return ResponseResult.ok( new PageInfo<>(fsUsers));
-    }
+
     @Login
     @GetMapping("/allCompanyUser")
     @ApiOperation("获取所有公司销售")

fs-service/src/main/java/com/fs/his/service/impl/FsUserServiceImpl.java

@@ -65,7 +65,6 @@ import com.fs.im.config.ImTypeConfig;
 import com.fs.im.service.OpenIMService;
 import com.fs.hisStore.domain.FsStoreOrderScrm;
 import com.fs.hisStore.domain.FsUserBillScrm;
-import com.fs.hisStore.domain.FsUserScrm;
 import com.fs.hisStore.enums.BillDetailEnum;
 import com.fs.hisStore.mapper.FsStoreOrderScrmMapper;
 import com.fs.hisStore.service.IFsUserBillScrmService;
@@ -90,14 +89,7 @@ import com.fs.watch.service.WatchUserService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.Asserts;
-import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -1610,5 +1602,4 @@ public class FsUserServiceImpl implements IFsUserService {
         fsUserMapper.updatePasswordByPhone(password, encryptPhone);
         return R.ok();
     }
-
 }

fs-service/src/main/resources/mapper/course/FsCourseAnswerLogsMapper.xml

@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null "> and company_id = #{companyId}</if>
             <if test="qwUserId != null "> and qw_user_id = #{qwUserId}</if>
             <if test="beginTime != null "> and create_time &gt;= #{beginTime}</if>
-            <if test="endTime != null "> and create_time &lt;= #{endTime}</if>
+            <if test="endTime != null "> and create_time &lt; #{endTime}</if>
         </where>
     </select>
 

fs-service/src/main/resources/mapper/course/FsCourseWatchLogMapper.xml

@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="project != null "> and project = #{project}</if>
             <if test="watchType != null "> and watch_type = #{watchType}</if>
             <if test="beginTime != null "> and create_time &gt;= #{beginTime}</if>
-            <if test="endTime != null "> and create_time &lt;= #{endTime}</if>
+            <if test="endTime != null "> and create_time &lt; #{endTime}</if>
         </where>
     </select>