From 9dc29b2b3cf8032a11c630cebf1bc96704c3497b Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Fri, 22 Apr 2022 16:42:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dxml=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/annotation/TableTitle.java | 1 + src/com/engine/salary/biz/SIAccountBiz.java | 2 -- .../salary/entity/sischeme/dto/InsuranceSchemeListDTO.java | 4 ++-- src/com/engine/salary/mapper/InsuranceExportMapper.xml | 4 ++-- .../engine/salary/service/impl/SIAccountServiceImpl.java | 4 ++-- src/com/engine/salary/util/page/Column.java | 7 +++++++ src/com/engine/salary/util/page/PageInfo.java | 3 ++- 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/com/engine/salary/annotation/TableTitle.java b/src/com/engine/salary/annotation/TableTitle.java index 6f96beeb1..427aa8862 100644 --- a/src/com/engine/salary/annotation/TableTitle.java +++ b/src/com/engine/salary/annotation/TableTitle.java @@ -9,4 +9,5 @@ public @interface TableTitle { String title(); String dataIndex(); String key(); + boolean display() default true; } diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 1bea2de72..95ab6356c 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -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); }); diff --git a/src/com/engine/salary/entity/sischeme/dto/InsuranceSchemeListDTO.java b/src/com/engine/salary/entity/sischeme/dto/InsuranceSchemeListDTO.java index d5d0d97bb..925526aeb 100644 --- a/src/com/engine/salary/entity/sischeme/dto/InsuranceSchemeListDTO.java +++ b/src/com/engine/salary/entity/sischeme/dto/InsuranceSchemeListDTO.java @@ -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") diff --git a/src/com/engine/salary/mapper/InsuranceExportMapper.xml b/src/com/engine/salary/mapper/InsuranceExportMapper.xml index 3875624d9..8b478e300 100644 --- a/src/com/engine/salary/mapper/InsuranceExportMapper.xml +++ b/src/com/engine/salary/mapper/InsuranceExportMapper.xml @@ -11,7 +11,7 @@ LEFT JOIN hrmresource e ON e.ID = a.employee_id LEFT JOIN hrmdepartment d ON d.id = e.departmentid - 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 a.*,e.lastname AS userName,e.MOBILE AS telephone,d.departmentname AS departmentName,e.STATUS AS userStatus FROM( diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 006bd0ee3..398bac626 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -523,9 +523,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { List conditionItems = new ArrayList<>(); List 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)); diff --git a/src/com/engine/salary/util/page/Column.java b/src/com/engine/salary/util/page/Column.java index 71dad2257..31c046a42 100644 --- a/src/com/engine/salary/util/page/Column.java +++ b/src/com/engine/salary/util/page/Column.java @@ -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; + } } diff --git a/src/com/engine/salary/util/page/PageInfo.java b/src/com/engine/salary/util/page/PageInfo.java index d40ba7554..86f73f742 100644 --- a/src/com/engine/salary/util/page/PageInfo.java +++ b/src/com/engine/salary/util/page/PageInfo.java @@ -51,7 +51,8 @@ public class PageInfo extends com.github.pagehelper.PageInfo { 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); } }