Commit fe3ae87a authored by zhuxiang's avatar zhuxiang
Browse files

增加用户是否使用

parent 6790884d
......@@ -24,5 +24,7 @@ public class CaseVO extends CasesEntity {
private String payUserName;
private boolean userFlag;
private List<ExcelDataVO> excelDataList;
}
......@@ -51,9 +51,14 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
List<CaseVO> caseVOList = Lists.newArrayList();
//遍历groupedMap
for (Map.Entry<String, List<ExcelDataVO>> entry : groupedMap.entrySet()) {
System.out.println("Key: " + entry.getKey() + ", Values: " + entry.getValue());
caseVOList.add(CaseVO.builder().excelDataList(entry.getValue())
List<ExcelDataVO> excelDataEntityListNew = entry.getValue();
boolean userFlag = false;
if (CollUtil.isNotEmpty(excelDataEntityListNew)) {
userFlag = excelDataEntityListNew.get(0).getUserFlag();
}
caseVOList.add(CaseVO.builder().excelDataList(excelDataEntityListNew)
.payUserName(entry.getKey())
.userFlag(userFlag)
.build());
}
return caseVOList;
......
......@@ -26,7 +26,7 @@
</if>
</where>
group by
ed.file_id,ed.pay_user_name,fu.file_name,fu.path,ed.use_flag
ed.file_id,ed.pay_user_name,fu.file_name,fu.path,ed.use_flag,ed.user_flag
</select>
<select id="queryList" resultType="com.platform.model.entity.ExcelDataEntity">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment