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

修复xml文件报错

This commit is contained in:
Chengliang 2022-04-22 16:42:06 +08:00
parent ef4ffacbcc
commit 9dc29b2b3c
7 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/engine/salary/annotation/TableTitle.java
View File

@ -9,4 +9,5 @@ public @interface TableTitle {
String title();
String dataIndex();
String key();
boolean display() default true;
}

2
src/com/engine/salary/biz/SIAccountBiz.java
View File

@ -2,7 +2,6 @@ package com.engine.salary.biz;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.engine.common.util.ServiceUtil;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.salaryacct.dto.SalaryAcctProgressDTO;
@ -375,7 +374,6 @@ public class SIAccountBiz extends Service{
BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
;
otherComJsonMap.put(String.valueOf(e), result.toPlainString());
otherComList.add(result);
});

4
src/com/engine/salary/entity/sischeme/dto/InsuranceSchemeListDTO.java
View File

@ -25,7 +25,7 @@ import lombok.NoArgsConstructor;
})
public class InsuranceSchemeListDTO {
@TableTitle(title = "id", dataIndex = "id", key = "id")
@TableTitle(title = "id", dataIndex = "id", key = "id",display = false)
private Long id;
@TableTitle(title = "方案名称", dataIndex = "schemeName", key = "schemeName")
@ -42,7 +42,7 @@ public class InsuranceSchemeListDTO {
* 等前端组件，暂时频闭
/
*/
@TableTitle(title = "缴纳地区", dataIndex = "paymentArea", key = "paymentArea")
@TableTitle(title = "缴纳地区", dataIndex = "paymentArea", key = "paymentArea",display = false)
private String paymentArea;
@TableTitle(title = "缴纳范围", dataIndex = "paymentScope", key = "paymentScope")

4
src/com/engine/salary/mapper/InsuranceExportMapper.xml
View File

@ -11,7 +11,7 @@
LEFT JOIN hrmresource e ON e.ID = a.employee_id
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
</select>
<select id="exportAccount" resultType="com.weaver.hrm.salary.entity.siexport.po.AccountExportPO" databaseId="oracle">
<select id="exportAccount" resultType="com.engine.salary.entity.siexport.po.AccountExportPO" databaseId="oracle">
SELECT
a.*,e.lastname AS userName,e.MOBILE AS telephone,d.departmentname AS departmentName,e.STATUS AS userStatus
FROM(
@ -21,7 +21,7 @@
LEFT JOIN hrmresource e ON e.ID = a.employee_id
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
</select>
<select id="exportAccount" resultType="com.weaver.hrm.salary.entity.siexport.po.AccountExportPO" databaseId="sqlserver">
<select id="exportAccount" resultType="com.engine.salary.entity.siexport.po.AccountExportPO" databaseId="sqlserver">
SELECT
a.*,e.lastname AS userName,e.MOBILE AS telephone,d.departmentname AS departmentName,e.STATUS AS userStatus
FROM(

4
src/com/engine/salary/service/impl/SIAccountServiceImpl.java
View File

@ -523,9 +523,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
List<SearchConditionItem> conditionItems = new ArrayList<>();
List<SearchConditionItem> conditionItem = new ArrayList<>();
SearchConditionItem includes = SalaryFormItemUtil.browserItem(user, 18, 12, 2, true, "对象", "require", "17", "includes");
SearchConditionItem includes = SalaryFormItemUtil.browserItem(user, 18, 12, 2, true, "对象", "required", "17", "includes");
conditionItems.add(includes);
SearchConditionItem excludes = SalaryFormItemUtil.browserItem(user, 18, 12, 2, true, "选择人员", "require", "17", "excludes");
SearchConditionItem excludes = SalaryFormItemUtil.browserItem(user, 18, 12, 2, true, "选择人员", "required", "17", "excludes");
conditionItem.add(excludes);
addGroups.add(new SearchConditionGroup("人员范围",true,conditionItems));
addGroups.add(new SearchConditionGroup("人员范围排除",true,conditionItem));

7
src/com/engine/salary/util/page/Column.java
View File

@ -13,4 +13,11 @@ public class Column {
String title;
String dataIndex;
String key;
boolean display;
public Column(String title, String dataIndex, String key) {
this.title = title;
this.dataIndex = dataIndex;
this.key = key;
}
}

3
src/com/engine/salary/util/page/PageInfo.java
View File

@ -51,7 +51,8 @@ public class PageInfo<T> extends com.github.pagehelper.PageInfo<T> {
String title = annotation.title();
String dataIndex = annotation.dataIndex();
String key = annotation.key();
Column column = Column.builder().title(title).dataIndex(dataIndex).key(key).build();
boolean display = annotation.display();
Column column = Column.builder().title(title).dataIndex(dataIndex).key(key).display(display).build();
columns.add(column);
}
}