bug54017相关人员责任领域展示顺序修改
This commit is contained in:
+1
-1
@@ -44,7 +44,7 @@
|
||||
</if>
|
||||
AND sd.dict_code = #{dictCode}
|
||||
</where>
|
||||
ORDER BY sdi.create_time
|
||||
ORDER BY sdi.sort_order
|
||||
</select>
|
||||
|
||||
<select id="queryById" resultType="com.jero.modules.project.entity.ProjectRelatedPersonnel">
|
||||
|
||||
+1
-1
@@ -665,7 +665,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
|
||||
cell.setCellStyle(cellStyleTemp);
|
||||
|
||||
//查标签内容里的责任领域数据
|
||||
List<SysDictItem> dutyTerritory = sysDictItemMapper.selectItemsOrderByCreateTime(ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
|
||||
List<SysDictItem> dutyTerritory = sysDictItemMapper.selectItemsOrderBySortOrder(ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
|
||||
List<String> dataList = dutyTerritory.stream().filter(e->e.getDelFlag()== CommonConstant.DEL_FLAG_0).map(e -> e.getItemText()).collect(Collectors.toList());
|
||||
//设置导出数据
|
||||
if(CollectionUtils.isNotEmpty(dataList)) {
|
||||
|
||||
Reference in New Issue
Block a user