From 775b39074d959914e2995ad7c2f5d027b0ab9e2f Mon Sep 17 00:00:00 2001 From: MustangDeng <670124965@qq.com> Date: Thu, 14 Apr 2022 16:11:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E5=8F=91=E6=94=BE-?= =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E5=8F=91=E6=94=BE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/annotation/SalaryTableColumn.java | 2 + .../salary/component/SalaryWeaTable.java | 5 + .../salaryBill/dto/SalarySendListDTO.java | 3 + .../param/SalarySendQueryParam.java | 4 +- .../salaryBill/po/SalarySendInfoPO.java | 2 +- .../salarybill/SalarySendInfoMapper.xml | 835 ++++++++++++++++++ .../salarybill/SalaryTemplateMapper.java | 2 +- .../salarybill/SalaryTemplateMapper.xml | 20 +- .../salary/web/SalaryBillController.java | 28 +- .../salary/wrapper/SalaryArchiveWrapper.java | 2 +- .../salary/wrapper/SalarySendWrapper.java | 164 +++- 11 files changed, 997 insertions(+), 70 deletions(-) create mode 100644 src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml diff --git a/src/com/engine/salary/annotation/SalaryTableColumn.java b/src/com/engine/salary/annotation/SalaryTableColumn.java index 67de1f0fb..94d93a5cf 100644 --- a/src/com/engine/salary/annotation/SalaryTableColumn.java +++ b/src/com/engine/salary/annotation/SalaryTableColumn.java @@ -29,4 +29,6 @@ public @interface SalaryTableColumn { String transmethod() default ""; + // 额外参数 + String otherPara() default ""; } diff --git a/src/com/engine/salary/component/SalaryWeaTable.java b/src/com/engine/salary/component/SalaryWeaTable.java index 9e7cddddc..b4e41a76c 100644 --- a/src/com/engine/salary/component/SalaryWeaTable.java +++ b/src/com/engine/salary/component/SalaryWeaTable.java @@ -96,9 +96,14 @@ public class SalaryWeaTable extends WeaTable { boolean display = columnAnn.display(); WeaTableColumn weaTableColumn = new WeaTableColumn(width, text, column, orderkey); String transmethod = columnAnn.transmethod(); + if (StringUtils.isNotBlank(transmethod)) { weaTableColumn.setTransmethod(transmethod); } + String otherPara = columnAnn.otherPara(); + if(StringUtils.isNotBlank(otherPara)) { + weaTableColumn.setOtherpara(otherPara); + } if (!display) { weaTableColumn.setDisplay(WeaBoolAttr.FALSE); } diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalarySendListDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalarySendListDTO.java index a23ca4b29..a65b86f96 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalarySendListDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalarySendListDTO.java @@ -76,18 +76,21 @@ public class SalarySendListDTO { // @ApiModelProperty("工资单模板Id") // 工资单模板Id + @SalaryTableColumn(text = "工资单模板id", width = "0%", column = "templateId", display = false) private Long templateId; /** * 已发送数量 */ // @JsonIgnore + @SalaryTableColumn(text = "已发送数量", width = "0%", column = "sendNum", display = false) private Integer sendNum; /** * 发送总数 */ // @JsonIgnore + @SalaryTableColumn(text = "发送总数", width = "0%", column = "sendTotal", display = false) private Integer sendTotal; // @ApiModelProperty("已发放") diff --git a/src/com/engine/salary/entity/salaryBill/param/SalarySendQueryParam.java b/src/com/engine/salary/entity/salaryBill/param/SalarySendQueryParam.java index 14266a733..5d6e4dc98 100644 --- a/src/com/engine/salary/entity/salaryBill/param/SalarySendQueryParam.java +++ b/src/com/engine/salary/entity/salaryBill/param/SalarySendQueryParam.java @@ -22,8 +22,8 @@ import java.util.List; @AllArgsConstructor public class SalarySendQueryParam extends BaseQueryParam { - private List salaryYearMonth; + private List salaryYearMonth; @JsonIgnore - private List salaryMonth; + private List salaryMonth; } diff --git a/src/com/engine/salary/entity/salaryBill/po/SalarySendInfoPO.java b/src/com/engine/salary/entity/salaryBill/po/SalarySendInfoPO.java index 58af915c9..818da9c59 100644 --- a/src/com/engine/salary/entity/salaryBill/po/SalarySendInfoPO.java +++ b/src/com/engine/salary/entity/salaryBill/po/SalarySendInfoPO.java @@ -34,7 +34,7 @@ public class SalarySendInfoPO { * 薪资所属月 */ // @ElogTransform(name = "薪资所属月") - private LocalDate salaryMonth; + private Date salaryMonth; /** * 薪资核算表的主键id diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml new file mode 100644 index 000000000..a9d5e1a24 --- /dev/null +++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml @@ -0,0 +1,835 @@ + + + + + + + + + + + + + + + + + + + + + + + t.id + , t.salary_send_id + , t.salary_month + , t.salary_acct_record_id + , t.employee_id + , t.tax_agent_id + , t.send_status + , t.send_time + , t.salary_template + , t.creator + , t.create_time + , t.update_time + , t.delete_type + , t.tenant_key + + + + INSERT INTO hrsa_salary_send_info ( + id, + salary_send_id, + salary_month, + salary_acct_record_id, + tax_agent_id, + employee_id, + send_status, + creator, + create_time, + update_time, + tenant_key + ) + VALUES + + ( + #{item.id}, + #{item.salarySendId}, + #{item.salaryMonth}, + #{item.salaryAcctRecordId}, + #{item.taxAgentId}, + #{item.employeeId}, + #{item.sendStatus}, + #{item.creator}, + #{item.createTime}, + #{item.updateTime}, + #{item.tenantKey} + ) + + + + INSERT INTO hrsa_salary_send_info ( + id, + salary_send_id, + salary_month, + salary_acct_record_id, + tax_agent_id, + employee_id, + send_status, + creator, + create_time, + update_time, + tenant_key + ) + + + select + #{item.id}, + #{item.salarySendId}, + #{item.salaryMonth}, + #{item.salaryAcctRecordId}, + #{item.taxAgentId}, + #{item.employeeId}, + #{item.sendStatus}, + #{item.creator}, + #{item.createTime}, + #{item.updateTime}, + #{item.tenantKey} + from dual + + + + INSERT INTO hrsa_salary_send_info ( + id, + salary_send_id, + salary_month, + salary_acct_record_id, + tax_agent_id, + employee_id, + send_status, + creator, + create_time, + update_time, + tenant_key + ) + VALUES + + ( + #{item.id}, + #{item.salarySendId}, + #{item.salaryMonth}, + #{item.salaryAcctRecordId}, + #{item.taxAgentId}, + #{item.employeeId}, + #{item.sendStatus}, + #{item.creator}, + #{item.createTime}, + #{item.updateTime}, + #{item.tenantKey} + ) + + + + + t1.id, + e.lastname, + t2.name AS tax_agent, + d.departmentname AS department, + e.mobile, + e.workcode, + t1.send_status, + t1.employee_id, + t1.salary_month, + e.email + + + + + AND t1.id IN + + #{id} + + + + + AND t1.salary_send_id = #{param.salarySendId} + + + + AND e.lastname like CONCAT('%',#{param.keyword},'%') + + + + AND e.lastname like CONCAT('%',#{param.username},'%') + + + + AND t2.id = #{param.taxAgentId} + + + + AND d.id IN + + #{id} + + + + + AND e.position IN + + #{id} + + + + + AND e.status = #{param.userstatus} + + + + AND t1.send_status IN + + #{status} + + + + + AND (e.hiredate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]}) + + + + + AND t1.id IN + + #{id} + + + + + AND t1.salary_send_id = #{param.salarySendId} + + + + AND e.lastname like '%'||#{param.keyword}||'%' + + + + AND e.lastname like '%'||#{param.username}||'%' + + + + AND t2.id = #{param.taxAgentId} + + + + AND d.id IN + + #{id} + + + + + AND e.position IN + + #{id} + + + + + AND e.status = #{param.userstatus} + + + + AND t1.send_status IN + + #{status} + + + + + AND (e.hiredate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]}) + + + + + AND t1.id IN + + #{id} + + + + + AND t1.salary_send_id = #{param.salarySendId} + + + + AND e.lastname like '%'+#{param.keyword}+'%' + + + + AND e.lastname like '%'+#{param.username}+'%' + + + + AND t2.id = #{param.taxAgentId} + + + + AND d.id IN + + #{id} + + + + + AND e.position IN + + #{id} + + + + + AND e.status = #{param.userstatus} + + + + AND t1.send_status IN + + #{status} + + + + + AND (e.hiredate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]}) + + + + + + + + + + + + + + + + UPDATE + hrsa_salary_send_info + + + + send_status = #{po.sendStatus}, + + + send_time = #{po.sendTime}, + + + salary_template = #{po.salaryTemplate} + + + + WHERE + + status IN + + #{status} + + + + + AND id IN + + #{id} + + + + AND salary_send_id = #{salarySendId} + + + + + + + + + UPDATE hrsa_salary_send_info + + + salary_send_id=#{salarySendId}, + + + salary_month=#{salaryMonth}, + + + use_type=#{useType}, + + + salary_acct_record_id=#{salaryAcctRecordId}, + + + employee_id=#{employeeId}, + + + tax_agent_id=#{taxAgentId}, + + + send_status=#{sendStatus}, + + + send_time=#{sendTime}, + + + salary_template=#{salaryTemplate}, + + + creator=#{creator}, + + + create_time=#{createTime}, + + + update_time=#{updateTime}, + + + delete_type=#{deleteType}, + + + tenant_key=#{tenantKey}, + + + WHERE id = #{id} AND delete_type = 0 + + + + diff --git a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.java b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.java index 3527c649f..aaeff4d26 100644 --- a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.java +++ b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.java @@ -65,5 +65,5 @@ public interface SalaryTemplateMapper { /** * 查询默认模板 */ - List listDefaultTemplates(List ids); + List listDefaultTemplates(@Param("ids")List ids); } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml index 80b9a82c5..9367b39f7 100644 --- a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml @@ -287,17 +287,19 @@ diff --git a/src/com/engine/salary/web/SalaryBillController.java b/src/com/engine/salary/web/SalaryBillController.java index c888eea97..8fcc996c5 100644 --- a/src/com/engine/salary/web/SalaryBillController.java +++ b/src/com/engine/salary/web/SalaryBillController.java @@ -230,13 +230,13 @@ public class SalaryBillController { * * @return */ -// @GET -// @Path("/send/getInfoSearchCondition") -// @Produces(MediaType.APPLICATION_JSON) -// public String getInfoSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) { -// User user = HrmUserVarify.getUser(request, response); -// return new ResponseResult<>().run(getSalarySendWrapper(user)::getInfoSearchCondition); -// } + @GET + @Path("/send/getInfoSearchCondition") + @Produces(MediaType.APPLICATION_JSON) + public String getInfoSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult<>().run(getSalarySendWrapper(user)::getInfoSearchCondition); + } /** * 工资单发放信息列表 @@ -257,13 +257,13 @@ public class SalaryBillController { * * @return */ -// @POST -// @Path("/send/exportInfoList") -// @Produces(MediaType.APPLICATION_JSON) -// public String exportInfoList(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalarySendInfoQueryParam queryParam) { -// User user = HrmUserVarify.getUser(request, response); -// return new ResponseResult>().run(getSalarySendWrapper(user)::exportInfoList, queryParam); -// } + @POST + @Path("/send/exportInfoList") + @Produces(MediaType.APPLICATION_JSON) + public String exportInfoList(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalarySendInfoQueryParam queryParam) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult>().run(getSalarySendWrapper(user)::exportInfoList, queryParam); + } /** * 工资单批量发放信息列表 diff --git a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java index 21d12e6aa..50f3f7de3 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java @@ -272,7 +272,7 @@ public class SalaryArchiveWrapper extends Service { } public Map searchCondition() { - List> userStatus = UserStatusEnum.getList(); + List> userStatus = UserStatusEnum.getList(); List> itemAdjustReasons = SalaryArchiveItemAdjustReasonEnum.getList(); List> TaxAgentAdjustReason = SalaryArchiveTaxAgentAdjustReasonEnum.getList(); Collection taxAgentList = getTaxAgentService(user).findAll(); diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java index e12514003..f9e37cb9a 100644 --- a/src/com/engine/salary/wrapper/SalarySendWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java @@ -1,5 +1,10 @@ package com.engine.salary.wrapper; +import com.api.browser.bean.SearchConditionGroup; +import com.api.browser.bean.SearchConditionItem; +import com.api.browser.bean.SearchConditionOption; +import com.api.browser.util.ConditionFactory; +import com.api.browser.util.ConditionType; import com.cloudstore.eccom.constant.WeaBoolAttr; import com.cloudstore.eccom.pc.table.WeaTable; import com.cloudstore.eccom.pc.table.WeaTableCheckboxpopedom; @@ -7,6 +12,7 @@ import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.salary.component.SalaryWeaTable; import com.engine.salary.constant.SalaryItemConstant; import com.engine.salary.entity.salaryBill.dto.*; import com.engine.salary.entity.salaryBill.param.*; @@ -14,6 +20,8 @@ import com.engine.salary.entity.salaryBill.po.SalarySendPO; import com.engine.salary.entity.salaryBill.po.SalaryTemplatePO; import com.engine.salary.entity.salaryarchive.bo.SalaryArchiveBO; import com.engine.salary.entity.salaryarchive.dto.TaxAgentListDTO; +import com.engine.salary.entity.taxrate.TaxAgent; +import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.salarybill.SalarySendStatusEnum; import com.engine.salary.enums.sicategory.WelfareTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; @@ -25,14 +33,17 @@ import com.engine.salary.service.impl.SalarySendServiceImpl; import com.engine.salary.service.impl.SalaryTemplateServiceImpl; import com.engine.salary.service.impl.TaxAgentServiceImpl; import com.engine.salary.util.SalaryI18nUtil; +import com.engine.salary.util.db.DBType; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.PageUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.session.SqlSession; import org.springframework.stereotype.Component; +import weaver.conn.RecordSet; import weaver.conn.mybatis.MyBatisFactory; import weaver.hrm.User; +import weaver.systeminfo.SystemEnv; import java.util.*; import java.util.concurrent.ExecutorService; @@ -57,6 +68,9 @@ public class SalarySendWrapper extends Service { return ServiceUtil.getService(SalaryTemplateServiceImpl.class, user); } +// private SalaryBatchService getSalaryBatchService(User user) { +// } + // @Resource // private SalaryBatchService salaryBatchService; @@ -74,7 +88,7 @@ public class SalarySendWrapper extends Service { Map datas = new HashMap<>(16); try { queryParam.setSalaryMonth( - queryParam.getSalaryYearMonth().stream().map(m -> m.atDay(1)).collect(Collectors.toList())); + queryParam.getSalaryYearMonth().stream().map(e -> e + "-01 00:00:00").collect(Collectors.toList())); SalarySendMapper salarySendMapper = sqlSession.getMapper(SalarySendMapper.class); PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize()); @@ -83,18 +97,19 @@ public class SalarySendWrapper extends Service { List pageList = pageInfo.getList(); List salarySobIds = pageList.stream().map(SalarySendListDTO::getSalarySobId).distinct().collect(Collectors.toList()); // 获取默认模板 - List salaryTemplates = getSalaryTemplateService(user).getDefaultTemplates(salarySobIds); - pageList.forEach(e -> { - // 已发放 - e.setSendSituation(e.getSendNum() + "/" + e.getSendTotal()); - // 工资单模板 - Optional optional = salaryTemplates.stream().filter(s -> s.getSalarySobId().equals(e.getSalarySobId())).findFirst(); - if (optional.isPresent()) { - e.setTemplate(optional.get().getName()); - e.setTemplateId(optional.get().getId()); - } - }); - + if(salarySobIds.size() > 0) { + List salaryTemplates = getSalaryTemplateService(user).getDefaultTemplates(salarySobIds); + pageList.forEach(e -> { + // 已发放 + e.setSendSituation(e.getSendNum() + "/" + e.getSendTotal()); + // 工资单模板 + Optional optional = salaryTemplates.stream().filter(s -> s.getSalarySobId().equals(e.getSalarySobId())).findFirst(); + if (optional.isPresent()) { + e.setTemplate(optional.get().getName()); + e.setTemplateId(optional.get().getId()); + } + }); + } List columns = buildWeaTableColumns(); WeaTable table = new WeaTable(); @@ -112,18 +127,18 @@ public class SalarySendWrapper extends Service { result.putAll(table.makeDataResult()); result.success(); - datas.put("pageInfo", pageInfo); datas.put("datas", pageList); datas.put("columns", columns); datas.put("dataKey",result.getResultMap()); return datas; - }finally { + }catch(Exception e) { + throw new SalaryRunTimeException(e.getMessage()); + } finally { sqlSession.close(); } } - /** * 创建表展示字段 * @return @@ -140,8 +155,6 @@ public class SalarySendWrapper extends Service { return list; } - - /** * 工资单发放基本信息 * @@ -157,23 +170,91 @@ public class SalarySendWrapper extends Service { * * @return */ -// public Map getInfoSearchCondition() { -// List taxAgentList = new ArrayList<>(); -// // 获取所有个税扣缴义务人 -// Collection taxAgentLists = taxAgentService.findAll(tenantKey); -// taxAgentLists.forEach(e -> taxAgentList.add(new WeaSearchConditionOption(e.getId().toString(), e.getName()))); -// -// WeaSearchCondition weaSearchCondition = SalaryFormatUtil.getInstance() -// .buildCondition(SalarySendInfoSearchConditionDTO.class, -// SalarySendInfoSearchConditionDTO.builder().taxAgentOptions(taxAgentList).build(), -// "salarySendInfo"); -// // 入职日期-添加范围 -// SalaryArchiveBO.addDatePickerRangeOtherParams(weaSearchCondition, "hiredate", employeeId, tenantKey); -// // 只保留常用条件 -// weaSearchCondition.setGroups(weaSearchCondition.getGroups().stream().filter(e -> "commonGroup".equals(e.getId())).collect(Collectors.toList())); -// -// return weaSearchCondition; -// } + public Map getInfoSearchCondition() { + Map apidatas = new HashMap(); + ConditionFactory conditionFactory = new ConditionFactory(user); + + //条件组 + List addGroups = new ArrayList(); + List conditionItems = new ArrayList(); + + //文本输入框 + SearchConditionItem username = conditionFactory.createCondition(ConditionType.INPUT,25034, "username"); + username.setColSpan(2);//定义一行显示条件数，默认值为2,当值为1时标识该条件单独占一行 + username.setFieldcol(16); //条件输入框所占宽度，默认值18 + username.setLabelcol(8); + username.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 + username.setLabel("姓名"); //设置文本值 这个将覆盖多语言标签的值 + conditionItems.add(username); + + // 个税扣缴义务人 + SearchConditionItem taxAgent = conditionFactory.createCondition(ConditionType.SELECT,25034, "taxAgent"); + taxAgent.setColSpan(2);//定义一行显示条件数，默认值为2,当值为1时标识该条件单独占一行 + taxAgent.setFieldcol(16); //条件输入框所占宽度，默认值18 + taxAgent.setLabelcol(8); + List searchConditionOptions = new ArrayList<>(); + Collection taxAgentLists = getTaxAgentService(user).findAll(); + taxAgentLists.forEach(e -> searchConditionOptions.add(new SearchConditionOption(e.getId().toString(), e.getName()))); + taxAgent.setOptions(searchConditionOptions); + taxAgent.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 + taxAgent.setLabel("个税扣缴义务人"); //设置文本值 这个将覆盖多语言标签的值 + conditionItems.add(taxAgent); + + // 部门 + SearchConditionItem departmentName = conditionFactory.createCondition(ConditionType.BROWSER,502227,"department","4"); + departmentName.setColSpan(2); + departmentName.setFieldcol(12); + departmentName.setLabelcol(8); + departmentName.setViewAttr(2); + departmentName.setIsQuickSearch(false); + departmentName.setLabel("部门"); + conditionItems.add(departmentName); + + // 岗位 + SearchConditionItem position = conditionFactory.createCondition(ConditionType.BROWSER,502227,"position","24"); + position.setColSpan(2); + position.setFieldcol(12); + position.setLabelcol(8); + position.setViewAttr(2); + position.setIsQuickSearch(false); + position.setLabel("岗位"); + conditionItems.add(position); + + //状态 + SearchConditionItem status = conditionFactory.createCondition(ConditionType.SELECT,25034, "taxAgent"); + status.setColSpan(2);//定义一行显示条件数，默认值为2,当值为1时标识该条件单独占一行 + status.setFieldcol(16); //条件输入框所占宽度，默认值18 + status.setLabelcol(8); + List userStatusOptions = new ArrayList<>(); + UserStatusEnum.getList().forEach(e -> userStatusOptions.add(new SearchConditionOption(e.get("id"), e.get("content")))); + status.setOptions(userStatusOptions); + status.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 + status.setLabel("状态"); //设置文本值 这个将覆盖多语言标签的值 + conditionItems.add(status); + + //入职日期 + SearchConditionItem hiredate = conditionFactory.createCondition(ConditionType.DATEPICKER, 25034, "hiredate"); + hiredate.setColSpan(2);//定义一行显示条件数，默认值为2,当值为1时标识该条件单独占一行 + hiredate.setFieldcol(16); //条件输入框所占宽度，默认值18 + hiredate.setLabelcol(8); + hiredate.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 + hiredate.setLabel("入职日期"); //设置文本值 这个将覆盖多语言标签的值 + conditionItems.add(hiredate); + + //合并计税 + SearchConditionItem mergeCountTax = conditionFactory.createCondition(ConditionType.DATEPICKER, 25034, "mergeCountTax"); + mergeCountTax.setColSpan(2);//定义一行显示条件数，默认值为2,当值为1时标识该条件单独占一行 + mergeCountTax.setFieldcol(16); //条件输入框所占宽度，默认值18 + mergeCountTax.setLabelcol(8); + mergeCountTax.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 + mergeCountTax.setLabel("合并计税"); //设置文本值 这个将覆盖多语言标签的值 + conditionItems.add(mergeCountTax); + + addGroups.add(new SearchConditionGroup("常用条件",true,conditionItems)); + + apidatas.put("condition",addGroups); + return apidatas; + } /** * 工资单发放信息列表 @@ -248,24 +329,23 @@ public class SalarySendWrapper extends Service { * @param queryParam * @return */ -// public Map exportInfoList(SalarySendInfoQueryParam queryParam) { -// // 构建异步导出参数 -// Map map = salaryBatchService.buildeExportParam("exportSalarySendInfo"); + public Map exportInfoList(SalarySendInfoQueryParam queryParam) { + // 构建异步导出参数 +// Map map = getSalaryBatchService(user).buildeExportParam("exportSalarySendInfo"); // // String username = UserContext.getCurrentUser().getUsername(); // String eteamsId = TenantRpcContext.getEteamsId(); // taskExecutor.execute(() -> { // try { -// DSTenantKeyThreadVar.tenantKey.set(tenantKey); +// DSTenantKeyThreadVar.tenantKey.set(); // salarySendService.exportInfoList(map, username, eteamsId, queryParam, employeeId, tenantKey); // } finally { // DSTenantKeyThreadVar.tenantKey.remove(); // } // }); // return map; -// // TODO -// return null; -// } + return null; + } /** * 工资单发放