Explorar o código

修改导出日期为签单时间

wks %!s(int64=2) %!d(string=hai) anos
pai
achega
2e547ee508

+ 1 - 0
src/main/java/com/ydtech/modules/admin/service/impl/AppCustomerManagementImpl.java

@@ -45,6 +45,7 @@ public class AppCustomerManagementImpl implements AppCustomerManagementService {
                     .eq(StringUtils.isEmpty(managementQueryVo.getPhoneNumber()), SysUser::getMobile, managementQueryVo.getPhoneNumber())
                     .eq(StringUtils.isEmpty(managementQueryVo.getPhoneNumber()), SysUser::getMobile, managementQueryVo.getPhoneNumber())
                     .eq(StringUtils.isEmpty(managementQueryVo.getUserId()), SysUser::getId, managementQueryVo.getUserId())
                     .eq(StringUtils.isEmpty(managementQueryVo.getUserId()), SysUser::getId, managementQueryVo.getUserId())
                     .eq(StringUtils.isEmpty(managementQueryVo.getUsername()), SysUser::getName, managementQueryVo.getUsername())
                     .eq(StringUtils.isEmpty(managementQueryVo.getUsername()), SysUser::getName, managementQueryVo.getUsername())
+                    .eq(StringUtils.isEmpty(managementQueryVo.getAuthenticationStatus()), SysUser::getName, managementQueryVo.getAuthenticationStatus())
                     .page(page);
                     .page(page);
 
 
             List<SysUserTeamDto> sysUserTeamDtos = sysUserPage.getRecords().stream().map(SysUserTeamDto::new).collect(Collectors.toList());
             List<SysUserTeamDto> sysUserTeamDtos = sysUserPage.getRecords().stream().map(SysUserTeamDto::new).collect(Collectors.toList());

+ 2 - 1
src/main/java/com/ydtech/modules/esm/dao/EsmUserReferrerMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.dto.SysUserDto;
 import com.ydtech.modules.admin.model.dto.SysUserDto;
 import com.ydtech.modules.admin.model.dto.SysUserTeamDto;
 import com.ydtech.modules.admin.model.dto.SysUserTeamDto;
+import com.ydtech.modules.admin.model.vo.AppCustomerManagementQueryVo;
 import com.ydtech.modules.admin.model.vo.SysReferrerVo;
 import com.ydtech.modules.admin.model.vo.SysReferrerVo;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserVO;
 import com.ydtech.modules.admin.model.vo.SysUserVO;
@@ -196,7 +197,7 @@ public interface EsmUserReferrerMapper extends BaseMapper<EsmUserReferrer> {
     Page<QueryChannel> getQueryChannelPage(Page page, QueryChannel queryChannel);
     Page<QueryChannel> getQueryChannelPage(Page page, QueryChannel queryChannel);
 
 
 
 
-    List<SysUserTeamDto> getByTeam(@Param("userId") String userId, @Param("level") int level);
+    List<SysUserTeamDto> getByTeam(@Param("managementQueryVo") AppCustomerManagementQueryVo managementQueryVo, @Param("userId") String userId, @Param("level") int level);
 
 
 
 
 
 

+ 1 - 1
src/main/java/com/ydtech/modules/esm/service/impl/EsmUserReferrerServiceImpl.java

@@ -447,7 +447,7 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
         }
         }
         int i = esmUserReferrers.get(0).getLevel() + 3;
         int i = esmUserReferrers.get(0).getLevel() + 3;
         PageHelper.startPage(managementQueryVo.getPageNum(), managementQueryVo.getPageSize());
         PageHelper.startPage(managementQueryVo.getPageNum(), managementQueryVo.getPageSize());
-        List<SysUserTeamDto> byTeam = baseMapper.getByTeam(userId, i);
+        List<SysUserTeamDto> byTeam = baseMapper.getByTeam(managementQueryVo, userId, i);
         PageResult<SysUserTeamDto> sysUserPageResult = new PageResult<>(byTeam);
         PageResult<SysUserTeamDto> sysUserPageResult = new PageResult<>(byTeam);
         return new BasePageResult<>(managementQueryVo.getPageNum(), managementQueryVo.getPageSize(), sysUserPageResult.getTotalPages(),
         return new BasePageResult<>(managementQueryVo.getPageNum(), managementQueryVo.getPageSize(), sysUserPageResult.getTotalPages(),
                 sysUserPageResult.getPageSize(), sysUserPageResult.getContent());
                 sysUserPageResult.getPageSize(), sysUserPageResult.getContent());

+ 12 - 0
src/main/resources/mapper/modules/esm/EsmUserReferrerMapper.xml

@@ -63,6 +63,18 @@
         select u.id, u.name, u.mobile, u.status
         select u.id, u.name, u.mobile, u.status
         from t1
         from t1
                  LEFT JOIN sys_user u on t1.id = u.id
                  LEFT JOIN sys_user u on t1.id = u.id
+        <if test="managementQueryVo.userId != null and managementQueryVo.userId != ''">
+            AND sd.id = #{managementQueryVo.userId}
+        </if>
+        <if test="managementQueryVo.username != null and managementQueryVo.username != ''">
+            AND sd.id = #{managementQueryVo.username}
+        </if>
+        <if test="managementQueryVo.phoneNumber != null and managementQueryVo.phoneNumber != ''">
+            AND sd.id = #{managementQueryVo.phoneNumber}
+        </if>
+        <if test="managementQueryVo.authenticationStatus != null and managementQueryVo.authenticationStatus != ''">
+            AND sd.id = #{managementQueryVo.authenticationStatus}
+        </if>
     </select>
     </select>
 
 
 
 

+ 2 - 2
src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -413,10 +413,10 @@
             and b.orderstatus = #{orderstatus}
             and b.orderstatus = #{orderstatus}
         </if>
         </if>
         <if test="startDate != null ">
         <if test="startDate != null ">
-            and a.createtime &gt;= #{startDate}
+            and a.signing_time &gt;= #{startDate}
         </if>
         </if>
         <if test="endDate != null ">
         <if test="endDate != null ">
-            and a.createtime &lt;= #{endDate}
+            and a.signing_time &lt;= #{endDate}
         </if>
         </if>
     </select>
     </select>