Commit f21881fd by HlQ

[chg] 重点项目看板负责人字段返回优化

1 parent b3cd91f9
...@@ -216,13 +216,11 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp ...@@ -216,13 +216,11 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp
public List<StoreVO> storeScreen() { public List<StoreVO> storeScreen() {
MPJLambdaWrapper<Store> wrapper = new MPJLambdaWrapper<Store>() MPJLambdaWrapper<Store> wrapper = new MPJLambdaWrapper<Store>()
.select(Store::getTaskDetail, Store::getFinishDate, Store::getPercentage, Store::getStuckPoint, Store::getIsImportant) .select(Store::getTaskDetail, Store::getFinishDate, Store::getPercentage, Store::getStuckPoint, Store::getIsImportant)
.selectCollection(RStoreUser.class, StoreVO::getStoreUserList) .selectCollection(User.class, StoreVO::getUserNameList, map -> map.result(User::getUsername))
.selectCollection(StoreLog.class, StoreVO::getStoreLog)
.leftJoin(RStoreUser.class, on -> on.eq(RStoreUser::getStoreId, Store::getId).eq(RStoreUser::getIsMain, 1)) .leftJoin(RStoreUser.class, on -> on.eq(RStoreUser::getStoreId, Store::getId).eq(RStoreUser::getIsMain, 1))
.leftJoin(StoreLog.class, StoreLog::getStoreId, Store::getId) .leftJoin(User.class, User::getId, RStoreUser::getUserId)
.eq(Store::getIsImportant, 1) .eq(Store::getIsImportant, 1)
.orderByAsc(Store::getFinishDate) .orderByAsc(Store::getFinishDate);
.orderByDesc(StoreLog::getCreateTime);
return this.selectJoinList(StoreVO.class, wrapper); return this.selectJoinList(StoreVO.class, wrapper);
} }
} }
...@@ -2,7 +2,6 @@ package vion.vo; ...@@ -2,7 +2,6 @@ package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import vion.model.RStoreUser;
import vion.model.StoreLog; import vion.model.StoreLog;
import java.util.Date; import java.util.Date;
...@@ -56,7 +55,7 @@ public class StoreVO { ...@@ -56,7 +55,7 @@ public class StoreVO {
/** 当前卡点 */ /** 当前卡点 */
private String stuckPoint; private String stuckPoint;
private List<RStoreUser> storeUserList; private List<String> userNameList;
private List<StoreLog> storeLog; private List<StoreLog> storeLog;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!