Browse Source

userw 更改状态枚举

master
chenchaod 2 months ago
parent
commit
4597495f54

+ 2
- 3
zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/agency/AgencyEnableRequestDTO.java View File

@@ -1,8 +1,7 @@
package cn.com.taiji.userw.dto.agency;

import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
import cn.com.taiji.core.entity.dict.basic.EnableFlag;
import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
import cn.com.taiji.core.entity.dict.EnableStatus;
import io.swagger.annotations.ApiModel;
import lombok.Getter;
import lombok.Setter;
@@ -18,5 +17,5 @@ public class AgencyEnableRequestDTO extends AbstractStaffBizRequestDTO {
@NotBlank(message = "渠道编号不能为空")
private String agencyId;
@NotNull(message = "状态不能为空")
private EnableFlag status;
private EnableStatus status;
}

+ 2
- 2
zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/serviceHall/ServiceHallEnableRequestDTO.java View File

@@ -1,7 +1,7 @@
package cn.com.taiji.userw.dto.serviceHall;

import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
import cn.com.taiji.core.entity.dict.basic.EnableFlag;
import cn.com.taiji.core.entity.dict.EnableStatus;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -17,7 +17,7 @@ public class ServiceHallEnableRequestDTO extends AbstractStaffBizRequestDTO {

@NotNull
@ApiModelProperty(value = "状态")
private EnableFlag status;
private EnableStatus status;




+ 2
- 2
zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/agency/AgencyManagerImpl.java View File

@@ -7,7 +7,7 @@ import cn.com.taiji.common.model.dao.Pagination;
import cn.com.taiji.core.entity.basic.QtkAgency;
import cn.com.taiji.core.entity.basic.QtkAgencyMap;
import cn.com.taiji.core.entity.basic.QtkAgencyModel;
import cn.com.taiji.core.entity.dict.basic.EnableFlag;
import cn.com.taiji.core.entity.dict.EnableStatus;
import cn.com.taiji.core.repo.jpa.basic.QtkAgencyMapRepo;
import cn.com.taiji.core.repo.jpa.basic.QtkAgencyModelRepo;
import cn.com.taiji.core.repo.jpa.basic.QtkAgencyRepo;
@@ -142,7 +142,7 @@ public class AgencyManagerImpl extends AbstractManager implements AgencyManager
return sortAndFilter(qtkAgencyRepo.listByNameLike("%" + req.getName().trim() + "%"));
}
private List<StringKeyValue> sortAndFilter(List<QtkAgency> dbList) {
return dbList.stream().filter(a -> EnableFlag.ENABLE.equals(a.getStatus()))
return dbList.stream().filter(a -> EnableStatus.ENABLE.equals(a.getStatus()))
.sorted(Comparator.comparing(QtkAgency::getName).thenComparing(QtkAgency::getAgencyId)).map(a->new StringKeyValue(a.getAgencyId(),a.getName())).collect(Collectors.toList());
}
}

Loading…
Cancel
Save