From 86d3604c7e459e8b5c1c63ffb783b2aed3bfa9e2 Mon Sep 17 00:00:00 2001 From: MustangDeng <670124965@qq.com> Date: Mon, 18 Apr 2022 09:19:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E5=8F=91=E6=94=BE-?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salaryBill/dto/SalarySendListDTO.java | 2 +- .../salarybill/SalarySendInfoMapper.xml | 10 ++--- .../salary/wrapper/SalarySendWrapper.java | 40 +++++++++++++++---- 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalarySendListDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalarySendListDTO.java index a65b86f96..c3d525076 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalarySendListDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalarySendListDTO.java @@ -41,7 +41,7 @@ public class SalarySendListDTO { // 薪资所属月 @SalaryTableColumn(text = "薪资所属月", width = "10%", column = "salaryYearMonth") - private LocalDate salaryYearMonth; + private Date salaryYearMonth; /** * 薪资账套id diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml index b35371ca9..6a840850d 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml @@ -132,7 +132,7 @@ t1.id, - e.lastname, + e.lastname as username, t2.name AS tax_agent, d.departmentname AS department, e.mobile, @@ -325,7 +325,7 @@ SELECT t1.id, - e.lastname, + e.lastname as username, t2.name AS tax_agent, d.departmentname AS department, e.mobile, @@ -405,7 +405,7 @@ SELECT t1.id, - e.lastname, + e.lastname as username, t2.name AS tax_agent, d.departmentname AS department, e.mobile, @@ -502,7 +502,7 @@ SELECT t1.id, - e.lastname, + e.lastname as username, t2.name AS tax_agent, d.departmentname AS department, e.mobile, @@ -583,7 +583,7 @@ SELECT t1.id, - e.lastname, + e.lastname as username, t2.name AS tax_agent, d.departmentname AS department, e.mobile, diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java index eb7e6061d..46fb7679d 100644 --- a/src/com/engine/salary/wrapper/SalarySendWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java @@ -192,6 +192,7 @@ public class SalarySendWrapper extends Service { username.setLabelcol(8); username.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 username.setLabel("姓名"); //设置文本值 这个将覆盖多语言标签的值 + username.setInputType(""); conditionItems.add(username); // 个税扣缴义务人 @@ -203,6 +204,7 @@ public class SalarySendWrapper extends Service { Collection taxAgentLists = getTaxAgentService(user).findAll(); taxAgentLists.forEach(e -> searchConditionOptions.add(new SearchConditionOption(e.getId().toString(), e.getName()))); taxAgent.setOptions(searchConditionOptions); + taxAgent.setInputType(""); taxAgent.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 taxAgent.setLabel("个税扣缴义务人"); //设置文本值 这个将覆盖多语言标签的值 conditionItems.add(taxAgent); @@ -215,6 +217,7 @@ public class SalarySendWrapper extends Service { departmentName.setViewAttr(2); departmentName.setIsQuickSearch(false); departmentName.setLabel("部门"); + departmentName.setInputType(""); conditionItems.add(departmentName); // 岗位 @@ -225,6 +228,7 @@ public class SalarySendWrapper extends Service { position.setViewAttr(2); position.setIsQuickSearch(false); position.setLabel("岗位"); + position.setInputType(""); conditionItems.add(position); //状态 @@ -235,16 +239,22 @@ public class SalarySendWrapper extends Service { List userStatusOptions = new ArrayList<>(); UserStatusEnum.getList().forEach(e -> userStatusOptions.add(new SearchConditionOption(e.get("id"), e.get("content")))); status.setOptions(userStatusOptions); + status.setInputType(""); status.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 status.setLabel("状态"); //设置文本值 这个将覆盖多语言标签的值 conditionItems.add(status); //入职日期 - SearchConditionItem hiredate = conditionFactory.createCondition(ConditionType.DATEPICKER, 25034, "hiredate"); + SearchConditionItem hiredate = conditionFactory.createCondition(ConditionType.RANGEPICKER, 25034, "hiredate"); hiredate.setColSpan(2);//定义一行显示条件数，默认值为2,当值为1时标识该条件单独占一行 hiredate.setFieldcol(16); //条件输入框所占宽度，默认值18 hiredate.setLabelcol(8); hiredate.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 + Map otherParams1 = new HashMap(); + otherParams1.put("format","yyyy-MM-dd"); + hiredate.setOtherParams(otherParams1); + hiredate.setInputType("day"); + hiredate.setMode("day"); hiredate.setLabel("入职日期"); //设置文本值 这个将覆盖多语言标签的值 conditionItems.add(hiredate); @@ -256,6 +266,7 @@ public class SalarySendWrapper extends Service { List sendStatusOptions = new ArrayList<>(); UserStatusEnum.getList().forEach(e -> sendStatusOptions.add(new SearchConditionOption(e.get("id"), e.get("content")))); status.setOptions(sendStatusOptions); + status.setInputType(""); sendStatus.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 sendStatus.setLabel("发送状态"); //设置文本值 这个将覆盖多语言标签的值 conditionItems.add(sendStatus); @@ -383,6 +394,7 @@ public class SalarySendWrapper extends Service { username.setLabelcol(8); username.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 username.setLabel("姓名"); //设置文本值 这个将覆盖多语言标签的值 + username.setInputType(""); conditionItems.add(username); // 个税扣缴义务人 @@ -394,6 +406,7 @@ public class SalarySendWrapper extends Service { Collection taxAgentLists = getTaxAgentService(user).findAll(); taxAgentLists.forEach(e -> searchConditionOptions.add(new SearchConditionOption(e.getId().toString(), e.getName()))); taxAgent.setOptions(searchConditionOptions); + taxAgent.setInputType(""); taxAgent.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 taxAgent.setLabel("个税扣缴义务人"); //设置文本值 这个将覆盖多语言标签的值 conditionItems.add(taxAgent); @@ -404,6 +417,7 @@ public class SalarySendWrapper extends Service { departmentName.setFieldcol(12); departmentName.setLabelcol(8); departmentName.setViewAttr(2); + departmentName.setInputType(""); departmentName.setIsQuickSearch(false); departmentName.setLabel("部门"); conditionItems.add(departmentName); @@ -412,6 +426,7 @@ public class SalarySendWrapper extends Service { SearchConditionItem position = conditionFactory.createCondition(ConditionType.BROWSER,502227,"position","24"); position.setColSpan(2); position.setFieldcol(12); + position.setInputType(""); position.setLabelcol(8); position.setViewAttr(2); position.setIsQuickSearch(false); @@ -426,16 +441,22 @@ public class SalarySendWrapper extends Service { List userStatusOptions = new ArrayList<>(); UserStatusEnum.getList().forEach(e -> userStatusOptions.add(new SearchConditionOption(e.get("id"), e.get("content")))); status.setOptions(userStatusOptions); + status.setInputType(""); status.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 status.setLabel("状态"); //设置文本值 这个将覆盖多语言标签的值 conditionItems.add(status); //入职日期 - SearchConditionItem hiredate = conditionFactory.createCondition(ConditionType.DATEPICKER, 25034, "hiredate"); + SearchConditionItem hiredate = conditionFactory.createCondition(ConditionType.RANGEPICKER, 25034, "hiredate"); hiredate.setColSpan(2);//定义一行显示条件数，默认值为2,当值为1时标识该条件单独占一行 hiredate.setFieldcol(16); //条件输入框所占宽度，默认值18 hiredate.setLabelcol(8); hiredate.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 + Map otherParams1 = new HashMap(); + otherParams1.put("format","yyyy-MM-dd"); + hiredate.setOtherParams(otherParams1); + hiredate.setInputType("day"); + hiredate.setMode("day"); hiredate.setLabel("入职日期"); //设置文本值 这个将覆盖多语言标签的值 conditionItems.add(hiredate); @@ -444,6 +465,7 @@ public class SalarySendWrapper extends Service { mergeCountTax.setColSpan(2);//定义一行显示条件数，默认值为2,当值为1时标识该条件单独占一行 mergeCountTax.setFieldcol(16); //条件输入框所占宽度，默认值18 mergeCountTax.setLabelcol(8); + mergeCountTax.setInputType("switch"); mergeCountTax.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 mergeCountTax.setLabel("合并计税"); //设置文本值 这个将覆盖多语言标签的值 conditionItems.add(mergeCountTax); @@ -491,6 +513,10 @@ public class SalarySendWrapper extends Service { List columns = buildDetailListWeaTableColumns(); + for (SalaryTemplateSalaryItemListDTO salaryItem : salaryItems) { + columns.add(new WeaTableColumn("100px", salaryItem.getId() + SalaryItemConstant.DYNAMIC_SUFFIX, salaryItem.getName())); + } + WeaTable table = new WeaTable(); table.setColumns(columns); @@ -519,11 +545,11 @@ public class SalarySendWrapper extends Service { List list = new ArrayList<>(); WeaTableColumn idColumn = new WeaTableColumn("0px", "id", "id"); idColumn.setDisplay(WeaBoolAttr.TRUE); - list.add(new WeaTableColumn("20%","姓名", "username")); - list.add(new WeaTableColumn("20%","个税扣缴义务人", "taxAgent")); - list.add(new WeaTableColumn("20%","部门", "department")); - list.add(new WeaTableColumn("20%","手机号", "mobile")); - list.add(new WeaTableColumn("20%","工号", "jobNum")); + list.add(new WeaTableColumn("100px","姓名", "username")); + list.add(new WeaTableColumn("100px","个税扣缴义务人", "taxAgent")); + list.add(new WeaTableColumn("100px","部门", "department")); + list.add(new WeaTableColumn("100px","手机号", "mobile")); + list.add(new WeaTableColumn("100px","工号", "jobNum")); return list; }