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

甘特图bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-07-01 09:08:35 +08:00
parent e099a6d971
commit b8a3fd258a
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressContentMapper.java
View File

@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -26,9 +27,9 @@ import java.util.Map;
public interface XzTaskProgressContentMapper extends BaseMapper<XzTaskProgressContent> {
@DataScope(includeTable = "xz_task_progress_content")
List<XzTaskProgressContent> queryList(@Param(Constants.WRAPPER) QueryWrapper<XzTaskProgressContent> queryWrapper);
List<XzTaskProgressContent> queryList(@Param(Constants.WRAPPER) QueryWrapper<XzTaskProgressContent> queryWrapper, @Param("param") HashMap<String, Object> param);
IPage<XzTaskProgressContent> queryList(Page<XzTaskProgressContent> page, @Param(Constants.WRAPPER) QueryWrapper<XzTaskProgressContent> queryWrapper);
IPage<XzTaskProgressContent> queryList(Page<XzTaskProgressContent> page, @Param(Constants.WRAPPER) QueryWrapper<XzTaskProgressContent> queryWrapper, @Param("param") HashMap<String, Object> param);
ArrayList<SectorOneVo> statsDelayEventType(Map<String, Object> paramMap);

11
src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressContentMapper.xml
View File

@ -2,11 +2,18 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.xz.mapper.XzTaskProgressContentMapper">
<select id="queryList" resultType="com.zhgd.xmgl.modules.xz.entity.XzTaskProgressContent">
select c.*,qr.region_name,ei.enterprise_name,xtp.task_name
select distinct c.*,qr.region_name,ei.enterprise_name,xtp.task_name
from xz_task_progress_content c
join xz_task_progress xtp on c.task_progress_id = xtp.id
left join quality_region qr on xtp.quality_region_id = qr.id
join quality_region qr on xtp.quality_region_id = qr.id
left join enterprise_info ei on ei.id=c.enterprise_id
<if test="param.accountType == '6'.toString()">
join quality_region_to_enterprise qrte on qrte.quality_region_id = qr.id
join worker_info wi on wi.enterprise_id= qrte.enterprise_id
join system_user su on su.worker_id = wi.id
join base_role_user bru on bru.user_id = su.user_id
join base_role br on br.role_name = '监理'
</if>
${ew.customSqlSegment}
</select>

8
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressContentServiceImpl.java
View File

@ -77,7 +77,11 @@ public class XzTaskProgressContentServiceImpl extends ServiceImpl<XzTaskProgress
public IPage<XzTaskProgressContent> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<XzTaskProgressContent> queryWrapper = getQueryWrapper(paramMap);
Page<XzTaskProgressContent> page = PageUtil.getPage(paramMap);
IPage<XzTaskProgressContent> pageList = baseMapper.queryList(page, queryWrapper);
if (SecurityUtils.getUser() != null) {
Integer accountType = SecurityUtils.getUser().getAccountType();
paramMap.put("accountType", accountType);
}
IPage<XzTaskProgressContent> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;
}
@ -156,7 +160,7 @@ public class XzTaskProgressContentServiceImpl extends ServiceImpl<XzTaskProgress
@Override
public List<XzTaskProgressContent> queryList(HashMap<String, Object> paramMap) {
QueryWrapper<XzTaskProgressContent> queryWrapper = getQueryWrapper(paramMap);
return dealList(baseMapper.queryList(queryWrapper));
return dealList(baseMapper.queryList(queryWrapper, null));
}
private List<XzTaskProgressContent> dealList(List<XzTaskProgressContent> list) {