业绩查询修改

src/main/java/com/ydtech/modules/admin/model/dto/QuTeamNumDto.java

@@ -31,11 +31,11 @@ public class QuTeamNumDto {
 
     @ApiModelProperty(value = "创建时间开始")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate createTimeStart;
+    private String createTimeStart;
 
     @ApiModelProperty(value = "创建时间结束")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate createTimeEnd;
+    private String createTimeEnd;
 
 
     @TableField(exist = false)

src/main/java/com/ydtech/modules/admin/model/dto/QuUserNumDto.java

@@ -20,11 +20,11 @@ public class QuUserNumDto {
 
     @ApiModelProperty(value = "创建时间开始")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate createTimeStart;
+    private String createTimeStart;
 
     @ApiModelProperty(value = "创建时间结束")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate createTimeEnd;
+    private String createTimeEnd;
 
     @ApiModelProperty(value = "省市区")
     private String areaCode;

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -128,6 +128,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Override
     public IPage<QuTeamNum> quTeamNum(QuTeamNumDto quTeamNumDto) {
+
+        if (StringUtils.isNotEmpty(quTeamNumDto.getCreateTimeStart()) && StringUtils.isNotEmpty(quTeamNumDto.getCreateTimeEnd())) {
+            quTeamNumDto.setCreateTimeStart(quTeamNumDto.getCreateTimeStart() + " 00:00:00");
+            quTeamNumDto.setCreateTimeEnd(quTeamNumDto.getCreateTimeEnd() + " 23:59:59");
+        }
+
         //判断必传标识是否为空
         if (quTeamNumDto.getTeamOrUserFlag() == null) {
             throw new SystemException("必传参数未传");
@@ -848,6 +854,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public IPage<QuUserNum> quUserNum(QuUserNumDto quUserNumDto) {
 
+        if (StringUtils.isNotEmpty(quUserNumDto.getCreateTimeStart()) && StringUtils.isNotEmpty(quUserNumDto.getCreateTimeEnd())) {
+            quUserNumDto.setCreateTimeStart(quUserNumDto.getCreateTimeStart() + " 00:00:00");
+            quUserNumDto.setCreateTimeEnd(quUserNumDto.getCreateTimeEnd() + " 23:59:59");
+        }
+
         //获取所有用户
         List<SysUser> users = list();
 
@@ -941,7 +952,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                         quUserNum.setMainAcceptInsuranceSum(mainAcceptInsuranceSum.getMainAcceptInsuranceSum());
                     }
                 }
-                if (quUserNum.getAreaName() != null){
+                if (quUserNum.getAreaName() != null) {
                     quUserNums.add(quUserNum);
                 }
 //                quUserNums.add(quUserNum);
@@ -975,6 +986,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Override
     public IPage<QuUserNum> getQuUserByCompany(QuUserNumDto quUserNumDto) {
+        if (StringUtils.isNotEmpty(quUserNumDto.getCreateTimeStart()) && StringUtils.isNotEmpty(quUserNumDto.getCreateTimeEnd())) {
+            quUserNumDto.setCreateTimeStart(quUserNumDto.getCreateTimeStart() + " 00:00:00");
+            quUserNumDto.setCreateTimeEnd(quUserNumDto.getCreateTimeEnd() + " 23:59:59");
+        }
 
         //查询单个用户的详情时不需要区域code
         if (!quUserNumDto.getQuMarks().equals(QuMarks.USER_COMPANY_MARK.getCode())) {
@@ -1124,6 +1139,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public IPage<QuUserNum> quAgentAreaAdmin(QuUserNumDto quUserNumDto) {
 
+        if (StringUtils.isNotEmpty(quUserNumDto.getCreateTimeStart()) && StringUtils.isNotEmpty(quUserNumDto.getCreateTimeEnd())) {
+            quUserNumDto.setCreateTimeStart(quUserNumDto.getCreateTimeStart() + " 00:00:00");
+            quUserNumDto.setCreateTimeEnd(quUserNumDto.getCreateTimeEnd() + " 23:59:59");
+        }
+
+
         //获取所有代理人用户
         List<SysUserBaseVO> agentUsers = baseMapper.getAgentUserIdsByAreaIds();
 
@@ -1237,6 +1258,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public IPage<QuUserNum> quAgentAreaAdminDetail(QuUserNumDto quUserNumDto) {
 
+        if (StringUtils.isNotEmpty(quUserNumDto.getCreateTimeStart()) && StringUtils.isNotEmpty(quUserNumDto.getCreateTimeEnd())) {
+            quUserNumDto.setCreateTimeStart(quUserNumDto.getCreateTimeStart() + " 00:00:00");
+            quUserNumDto.setCreateTimeEnd(quUserNumDto.getCreateTimeEnd() + " 23:59:59");
+        }
+
         //查询单个用户的详情时不需要区域code
         if (!quUserNumDto.getQuMarks().equals(QuMarks.USER_COMPANY_MARK.getCode())) {
             //获取所有代理人用户
@@ -1411,13 +1437,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 获取多条用户数据
-     * @param userIds   用户idList
+     *
+     * @param userIds 用户idList
      * @return
      */
     @Override
     public List<SysUser> getByIds(List<String> userIds) {
         LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        sysUserLambdaQueryWrapper.in(SysUser::getId,userIds);
+        sysUserLambdaQueryWrapper.in(SysUser::getId, userIds);
         return sysUserMapper.selectList(sysUserLambdaQueryWrapper);
     }
 }