工资单发放-问题处理
This commit is contained in:
MustangDeng
parent
a739d746f7
commit
86d3604c7e
|
|
@ -41,7 +41,7 @@ public class SalarySendListDTO {
|
|||
|
||||
// 薪资所属月
|
||||
@SalaryTableColumn(text = "薪资所属月", width = "10%", column = "salaryYearMonth")
|
||||
private LocalDate salaryYearMonth;
|
||||
private Date salaryYearMonth;
|
||||
|
||||
/**
|
||||
* 薪资账套id
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@
|
|||
|
||||
<sql id="salarySendInfoColumn">
|
||||
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,
|
||||
|
|
|
|||
|
|
@ -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<TaxAgent> 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<SearchConditionOption> 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<String, Object> otherParams1 = new HashMap<String, Object>();
|
||||
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<SearchConditionOption> 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<TaxAgent> 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<SearchConditionOption> 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<String, Object> otherParams1 = new HashMap<String, Object>();
|
||||
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<WeaTableColumn> 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<WeaTableColumn> 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;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue