WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目库-项目详情-相关人员名单-bug:勾选导出缺失数据

Browse Source
This commit is contained in:
liyawei
2022-08-05 10:52:08 +08:00
parent 33df55a791
commit ad34f231a4
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml
+4 -5
View File
@@ -60,13 +60,12 @@
</select> </select>
<select id="queryById" resultType="com.jero.modules.project.entity.ProjectRelatedPersonnel"> <select id="queryById" resultType="com.jero.modules.project.entity.ProjectRelatedPersonnel">
SELECT SELECT *
<include refid="select_item"/>
FROM FROM
project_related_personnel AS prp project_related_personnel
<where> <where>
prp.id=#{id} id=#{id}
</where> </where>
order by prp.create_time desc order by create_time desc
</select> </select>
</mapper> </mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+7 -9
View File
@@ -34,14 +34,7 @@ import org.apache.poi.hssf.usermodel.HSSFRichTextString;
import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.usermodel.WorkbookFactory;
import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -475,8 +468,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
if (id.contains(",")) {//多个id if (id.contains(",")) {//多个id
List<String> idList = Arrays.asList(id.split(",")); List<String> idList = Arrays.asList(id.split(","));
QueryWrapper<ProjectRelatedPersonnel> queryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectRelatedPersonnel> queryWrapper = new QueryWrapper<>();
queryWrapper.in("id",idList); queryWrapper.lambda().in(ProjectRelatedPersonnel::getId, idList);
records = list(queryWrapper); records = list(queryWrapper);
disposeData(records);
} else {//1个id } else {//1个id
records = queryById(id); records = queryById(id);
@@ -486,8 +480,12 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
} }
//id无值,传全部 //id无值,传全部
disposeDutyTerritory(records,cut); disposeDutyTerritory(records,cut);
records = records.stream()
.sorted(Comparator.comparing(ProjectRelatedPersonnel::getDutyTerritory))
.collect(Collectors.toList());
return records; return records;
} }
public void disposeDutyTerritory(List<ProjectRelatedPersonnel> records,String cut) { public void disposeDutyTerritory(List<ProjectRelatedPersonnel> records,String cut) {
//查标签内容里的责任领域数据 //查标签内容里的责任领域数据
List<SysDictItem> sysDictItemValueList = sysDictItemMapper.selectItemsByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue()); List<SysDictItem> sysDictItemValueList = sysDictItemMapper.selectItemsByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue());