qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

报表fixbug

This commit is contained in:
Harryxzy 2023-09-19 13:59:08 +08:00
parent c7713353dd
commit 897a7731bf
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/mapper/report/SalaryStatisticsPushMapper.java
View File

@ -79,5 +79,5 @@ public interface SalaryStatisticsPushMapper {
* @param reportId
* @return
*/
List<SalaryStatisticsPushPO> listListReportIdAndIds(@Param("reportId") Long reportId, @Param("ids") List<Long> ids);
List<SalaryStatisticsPushPO> listByReportIdAndIds(@Param("reportId") Long reportId, @Param("ids") List<Long> ids);
}

6
src/com/engine/salary/mapper/report/SalaryStatisticsPushMapper.xml
View File

@ -124,7 +124,7 @@
ORDER BY create_time DESC
</select>
<select id="listListReportIdAndIds" resultType="com.engine.salary.report.entity.po.SalaryStatisticsPushPO">
<select id="listByReportIdAndIds" resultType="com.engine.salary.report.entity.po.SalaryStatisticsPushPO">
SELECT
<include refid="baseColumns" />
FROM hrsa_report_push t
@ -140,7 +140,7 @@
</if>
</select>
<select id="listListReportId" resultType="com.engine.salary.report.entity.po.SalaryStatisticsPushPO" databaseId="oracle">
<select id="listByReportIdAndIds" resultType="com.engine.salary.report.entity.po.SalaryStatisticsPushPO" databaseId="oracle">
SELECT
<include refid="baseColumns" />
FROM hrsa_report_push t
@ -156,7 +156,7 @@
</if>
</select>
<select id="listListReportId" resultType="com.engine.salary.report.entity.po.SalaryStatisticsPushPO" databaseId="sqlserver">
<select id="listByReportIdAndIds" resultType="com.engine.salary.report.entity.po.SalaryStatisticsPushPO" databaseId="sqlserver">
SELECT
<include refid="baseColumns" />
FROM hrsa_report_push t

8
src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java
View File

@ -83,9 +83,9 @@ public class SalaryStatisticsPushServiceImpl extends Service implements SalarySt
data.put("pushTitle", pushPO.getPushTitle());
data.put("mark", pushPO.getMark());
if (pushPO.getRemind() == null) {
data.put("remind", 1);
data.put("remind", "1");
} else {
data.put("remind", pushPO.getRemind());
data.put("remind", pushPO.getRemind().toString());
}
return data;
}
@ -107,7 +107,7 @@ public class SalaryStatisticsPushServiceImpl extends Service implements SalarySt
po.getCreator().compareTo(employeeId) == 0
).forEach( po -> {
Map<String, Object> option = new HashMap<>();
option.put("id", po.getId());
option.put("id", po.getId().toString());
option.put("reportName", po.getReportName());
reportIdsOptions.add(option);
});
@ -718,7 +718,7 @@ public class SalaryStatisticsPushServiceImpl extends Service implements SalarySt
@Override
public List<SalaryStatisticsPushPO> getPushListByReportIdAndIds(Long reportId, List<Long> ids) {
List<SalaryStatisticsPushPO> pushList = getSalaryStatisticsPushMapper().listListReportIdAndIds(reportId, ids);
List<SalaryStatisticsPushPO> pushList = getSalaryStatisticsPushMapper().listByReportIdAndIds(reportId, ids);
pushList = pushList.stream().filter( push -> {
return Arrays.asList(push.getReportIds().split(",")).contains(reportId.toString());
}).collect(Collectors.toList());