admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

包头bug修改

Browse Source
This commit is contained in:
guoshengxiong 2024-12-02 18:50:00 +08:00
parent c47e31a8cb
commit 20f3083904
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/xz/entity/XzProjectOrg.java
View File

@ -103,4 +103,7 @@ public class XzProjectOrg implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private List<XzProjectOrg> children; private List<XzProjectOrg> children;
@TableField(exist = false)
private Integer userCount;
} }

1
src/main/java/com/zhgd/xmgl/modules/xz/service/IXzProjectOrgService.java
View File

@ -66,4 +66,5 @@ public interface IXzProjectOrgService extends IService<XzProjectOrg> {
* @return * @return
*/ */
IPage<XzProjectOrg> treePageList(HashMap<String, Object> paramMap); IPage<XzProjectOrg> treePageList(HashMap<String, Object> paramMap);
} }

19
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzProjectOrgServiceImpl.java
View File

@ -17,6 +17,7 @@ import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
import com.zhgd.xmgl.modules.xz.entity.XzProjectOrg; import com.zhgd.xmgl.modules.xz.entity.XzProjectOrg;
import com.zhgd.xmgl.modules.xz.mapper.XzProjectOrgMapper; import com.zhgd.xmgl.modules.xz.mapper.XzProjectOrgMapper;
import com.zhgd.xmgl.modules.xz.service.IXzProjectOrgService; import com.zhgd.xmgl.modules.xz.service.IXzProjectOrgService;
@ -25,7 +26,6 @@ import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.flowable.engine.HistoryService; import org.flowable.engine.HistoryService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.history.HistoricProcessInstance;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@ -44,9 +44,10 @@ import java.util.stream.Collectors;
@Service @Service
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public class XzProjectOrgServiceImpl extends ServiceImpl<XzProjectOrgMapper, XzProjectOrg> implements IXzProjectOrgService { public class XzProjectOrgServiceImpl extends ServiceImpl<XzProjectOrgMapper, XzProjectOrg> implements IXzProjectOrgService {
@Autowired
ISystemUserService systemUserService;
@Autowired @Autowired
private XzProjectOrgMapper xzProjectOrgMapper; private XzProjectOrgMapper xzProjectOrgMapper;
@Autowired @Autowired
private HistoryService historyService; private HistoryService historyService;
@Autowired @Autowired
@ -59,14 +60,14 @@ public class XzProjectOrgServiceImpl extends ServiceImpl<XzProjectOrgMapper, XzP
QueryWrapper<XzProjectOrg> queryWrapper = getQueryWrapper(paramMap); QueryWrapper<XzProjectOrg> queryWrapper = getQueryWrapper(paramMap);
Page<XzProjectOrg> page = PageUtil.getPage(paramMap); Page<XzProjectOrg> page = PageUtil.getPage(paramMap);
IPage<XzProjectOrg> pageList = this.page(page, queryWrapper); IPage<XzProjectOrg> pageList = this.page(page, queryWrapper);
pageList.setRecords(dealList(pageList.getRecords())); pageList.setRecords(dealList(pageList.getRecords(), paramMap));
return pageList; return pageList;
} }
@Override @Override
public List<XzProjectOrg> queryList(HashMap<String, Object> paramMap) { public List<XzProjectOrg> queryList(HashMap<String, Object> paramMap) {
QueryWrapper<XzProjectOrg> queryWrapper = getQueryWrapper(paramMap); QueryWrapper<XzProjectOrg> queryWrapper = getQueryWrapper(paramMap);
return dealList(this.list(queryWrapper)); return dealList(this.list(queryWrapper), paramMap);
} }
private QueryWrapper<XzProjectOrg> getQueryWrapper(HashMap<String, Object> paramMap) { private QueryWrapper<XzProjectOrg> getQueryWrapper(HashMap<String, Object> paramMap) {
@ -76,7 +77,15 @@ public class XzProjectOrgServiceImpl extends ServiceImpl<XzProjectOrgMapper, XzP
return queryWrapper; return queryWrapper;
} }
private List<XzProjectOrg> dealList(List<XzProjectOrg> list) { private List<XzProjectOrg> dealList(List<XzProjectOrg> list, HashMap<String, Object> paramMap) {
if (CollUtil.isNotEmpty(list)) {
Map<String, Object> param = new HashMap<>();
param.put("projectSn", MapUtils.getString(paramMap, "projectSn"));
Map<Long, List<SystemUser>> orgMap = systemUserService.getProjectChildernSystemUserList(param).stream().collect(Collectors.groupingBy(SystemUser::getXzProjectOrgId));
for (XzProjectOrg org : list) {
org.setUserCount(Optional.ofNullable(orgMap.get(org.getId())).map(m -> m.size()).orElse(0));
}
}
return list; return list;
} }