Просмотр исходного кода

Merge branch 'release_real_202008' of https://git.youlane.cn/server/formallProject into release_real_202008

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
5fc77ea46d
3 измененных файлов: 2 добавлений и 5 удалений
  1. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java
  2. +1
    -3
      mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java

+ 0
- 1
mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java Просмотреть файл

@@ -195,7 +195,6 @@ public class WxUserStructureController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserPhoneBandStructure"); logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserPhoneBandStructure");
TenantEntity tenantEntity = ifParentUpdateTenantInfo(); TenantEntity tenantEntity = ifParentUpdateTenantInfo();
WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto();
dto.updateTenantInfo(tenantEntity);
dto.setStartTime(startTime); dto.setStartTime(startTime);
dto.setEndTime(endTime); dto.setEndTime(endTime);
long total = wxCUserBasicInfoService.findCount(tenantEntity,dto); long total = wxCUserBasicInfoService.findCount(tenantEntity,dto);


+ 1
- 3
mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java Просмотреть файл

@@ -1,7 +1,6 @@
package com.iformall.domain.dto; package com.iformall.domain.dto;


import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.po.base.BaseTenantEntity; import com.iformall.domain.po.base.BaseTenantEntity;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;


@@ -19,7 +18,7 @@ import java.util.List;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxCUserBasicInfoDto extends BaseEntity {
public class WxCUserBasicInfoDto extends TenantEntity {


protected Long id; protected Long id;


@@ -81,7 +80,6 @@ public class WxCUserBasicInfoDto extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
protected List<WxCUserBasicInfoFilterDto> filterList; protected List<WxCUserBasicInfoFilterDto> filterList;



public void undateFinalTenantId(TenantEntity tenantEntity){ public void undateFinalTenantId(TenantEntity tenantEntity){
setFinalTenantId(tenantEntity.getTenantId()); setFinalTenantId(tenantEntity.getTenantId());
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java Просмотреть файл

@@ -12,7 +12,7 @@ public interface WxCUserCarMapper extends CommonMapper<WxCUserCar, Long> {


List<WxCUserCar> findList(WxCUserCar wxCUserCar); List<WxCUserCar> findList(WxCUserCar wxCUserCar);
Integer countList(WxCUserCar wxCUserCar); Integer countList(WxCUserCar wxCUserCar);
Integer countUser(WxCUserCar wxCUserCar);
Integer countUser(WxCUserBasicInfoDto dto);


long queryCarCount(Map<String,Object> carParams); long queryCarCount(Map<String,Object> carParams);




Загрузка…
Отмена
Сохранить