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

fixbug

This commit is contained in:
Harryxzy 2024-07-10 16:51:26 +08:00
parent c1bdcc94fe
commit 0d7ee6c72d
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/mapper/datacollection/EmployMapper.java
View File

@ -19,7 +19,7 @@ public interface EmployMapper {
* 只查人力资源表
* @return
*/
List<DataCollectionEmployee> listAll(int yggx);
List<DataCollectionEmployee> listAll(@Param("yggx")int yggx);
/**
* 获取所有员工，关联部门

4
src/com/engine/salary/mapper/datacollection/EmployMapper.xml
View File

@ -116,7 +116,7 @@
</if>
<if test="param.targetType == 'YGGX'">
f.field#{param.yggxfeildId} IN
f.field${param.yggxfeildId} IN
<foreach collection="param.targetIds" open="(" item="targetId" separator="," close=")">
#{targetId}
</foreach>
@ -294,7 +294,7 @@
d.DEPARTMENTNAME as departmentName,
e.jobtitle as jobtitleId,
e.managerid as managerid,
f.field#{yggx} as yggx
f.field${yggx} as yggx
from hrmresource e
left join hrmdepartment d on e.departmentid = d.id
left join cus_fielddata f on f.id = e.id and f.SCOPEID=3

2
src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml
View File

@ -424,7 +424,7 @@
</foreach>
</if>
<if test="param.targetType == 'YGGX'">
f.field#{param.yggxfeildId} IN
f.field${param.yggxfeildId} IN
<foreach collection="param.targetIds" open="(" item="targetId" separator="," close=")">
#{targetId}
</foreach>

15
src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
View File

@ -1617,17 +1617,18 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
*/
private List<GwSalaryItemRelation> getGwReportItems(RecordSet rs) {
List<GwSalaryItemRelation> resultList = new ArrayList<>();
rs.execute("select item.id,item.name,xsmc,px from uf_fygsdxzxm a " +
"left join hrsa_salary_item item on a.xzxm=item.name " +
"where item.delete_type=0 order by px");
List<SalaryItemPO> salaryItemPOList = getSalaryItemService(user).listAll();
Map<String, Long> salaryItemMap = SalaryEntityUtil.convert2Map(salaryItemPOList, item -> Util.formatMultiLang(item.getName(), "7"), item -> item.getId());
rs.execute("select xzxm,xsmc,px from uf_fygsdxzxm a order by px");
while (rs.next()) {
String itemStr = rs.getString(1);
if (NumberUtils.isCreatable(itemStr)) {
String itemName = rs.getString(1);
Long itemId = salaryItemMap.get(itemName);
if (itemId != null) {
GwSalaryItemRelation itemRelation = new GwSalaryItemRelation();
itemRelation.setSalaryItemId(Long.valueOf(itemStr));
itemRelation.setSalaryItemName(rs.getString(2));
itemRelation.setSalaryItemName(rs.getString(1));
itemRelation.setSalaryItemShowName(rs.getString("xsmc"));
itemRelation.setSortedId(rs.getInt("px"));
itemRelation.setSalaryItemId(itemId);
resultList.add(itemRelation);
}
}