e, SalaryBillSendDTO salaryBillSendParam) {
+ // 薪资项是否显示
+ boolean isHideNull = salaryBillSendParam.getSalaryTemplate().getSalaryItemNullStatus().equals(SalaryTemplateWhetherEnum.TRUE.getValue());
+ boolean isHideZero = salaryBillSendParam.getSalaryTemplate().getSalaryItemZeroStatus().equals(SalaryTemplateWhetherEnum.TRUE.getValue());
+ // 3.文本内容-如果在薪资项目前
+ emailContent.append("");
+ emailContent.append(salaryBillSendParam.getSalaryTemplate().getTextContent());
+ emailContent.append("
");
+ // 4.薪资项目内容
+ emailContent.append("");
+ for (SalaryTemplateSalaryItemSetListDTO salaryItemSet : salaryBillSendParam.getSalaryItemSetList()) {
+ if (CollectionUtils.isEmpty(salaryItemSet.getItems())) {
+ continue;
+ }
+ emailContent.append("
");
+ if (!salaryItemSet.getGroupId().equals(SalaryTemplateSalaryItemSetGroupConstant.NO_TYPE_GROUP_ID)) {
+ emailContent.append("
");
+ // 4.1.薪资项目组名
+ emailContent.append(salaryItemSet.getGroupName());
+ emailContent.append("
");
+ }
+ emailContent.append("
");
+ for (int i = 0; i < salaryItemSet.getItems().size(); i++) {
+ SalaryTemplateSalaryItemListDTO salaryItem = salaryItemSet.getItems().get(i);
+ // 员工基本信息
+ if (salaryItemSet.getGroupId().equals(SalaryTemplateSalaryItemSetGroupConstant.EMPLOYEE_INFO_GROUP_ID) && salaryBillSendParam.getEmployeeInformation() != null) {
+ Optional
optionalEmpItem = salaryBillSendParam.getEmployeeInformation().getItems().stream().filter(f -> f.getId().equals(salaryItem.getId())).findFirst();
+ // 4.2.员工信息
+ emailContent.append("");
+ emailContent.append("
");
+ emailContent.append("");
+ emailContent.append((optionalEmpItem.isPresent() ? optionalEmpItem.get().getName() : ""));
+ emailContent.append("");
+ emailContent.append("
");
+ emailContent.append("
");
+ emailContent.append((optionalEmpItem.isPresent() ? optionalEmpItem.get().getSalaryItemValue() : ""));
+ emailContent.append("
");
+ emailContent.append("
");
+ emailContent.append("
");
+ emailContent.append("");
+ emailContent.append(salaryItem.getName());
+ emailContent.append("");
+ emailContent.append("
");
+ emailContent.append("
");
+ emailContent.append(e.get(keyName.toString()));
+ emailContent.append("
");
+ emailContent.append("
");
+ emailContent.append("
");
+ }
+ emailContent.append("
");
+ emailContent.append(salaryBillSendParam.getSalaryTemplate().getTextContent());
+ emailContent.append("
");
+ }
+
+ /**
+ * 构建邮件内容主体
+ *
+ * 只有无分类，则将文本内容放进薪资项目表格前后
+ *
+ * @param emailContent
+ * @param e
+ * @param salaryBillSendParam
+ */
+ private static void buildOnlyOneGroupMailMain(StringBuilder emailContent, Map e, SalaryBillSendDTO salaryBillSendParam) {
+ // 薪资项是否显示
+ boolean isHideNull = salaryBillSendParam.getSalaryTemplate().getSalaryItemNullStatus().equals(SalaryTemplateWhetherEnum.TRUE.getValue());
+ boolean isHideZero = salaryBillSendParam.getSalaryTemplate().getSalaryItemZeroStatus().equals(SalaryTemplateWhetherEnum.TRUE.getValue());
+ // 4.薪资项目内容
+ emailContent.append("");
+ for (SalaryTemplateSalaryItemSetListDTO salaryItemSet : salaryBillSendParam.getSalaryItemSetList()) {
+ if (CollectionUtils.isEmpty(salaryItemSet.getItems())) {
+ continue;
+ }
+ emailContent.append("
");
+ emailContent.append("
");
+
+ // 3.文本内容-如果在薪资项目前
+ emailContent.append("
");
+ emailContent.append("
");
+ emailContent.append("");
+ emailContent.append(salaryBillSendParam.getRemarkI18n());
+ emailContent.append("");
+ emailContent.append("
");
+ emailContent.append("
");
+ emailContent.append(salaryBillSendParam.getSalaryTemplate().getTextContent());
+ emailContent.append("
");
+ emailContent.append("
");
+
+ for (int i = 0; i < salaryItemSet.getItems().size(); i++) {
+ SalaryTemplateSalaryItemListDTO salaryItem = salaryItemSet.getItems().get(i);
+ for (Object keyName : e.keySet()) {
+ if ((salaryItem.getId() + SalaryArchiveConstant.DYNAMIC_SUFFIX).equals(keyName.toString())) {
+ boolean isHide = (isHideNull && e.get(keyName.toString()) != null) || (isHideZero && "0.00".equals(e.get(keyName.toString())));
+ // 4.2.薪资项目
+ emailContent.append("
");
+ emailContent.append("
");
+ emailContent.append("");
+ emailContent.append(salaryItem.getName());
+ emailContent.append("");
+ emailContent.append("
");
+ emailContent.append("
");
+ emailContent.append(e.get(keyName.toString()));
+ emailContent.append("
");
+ emailContent.append("
");
+ break;
+ }
+ }
+ }
+ // 5.文本内容-如果在薪资项目后
+ emailContent.append("
");
+ emailContent.append("
");
+ emailContent.append("");
+ emailContent.append(salaryBillSendParam.getRemarkI18n());
+ emailContent.append("");
+ emailContent.append("
");
+
+ emailContent.append("
");
+ emailContent.append(salaryBillSendParam.getSalaryTemplate().getTextContent());
+ emailContent.append("
");
+ emailContent.append("
");
+
+ emailContent.append("
");
+ emailContent.append("
");
+ }
+ emailContent.append("
Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+//工资单发放信息
+public class SalaryBillSendDTO {
+
+ /**
+ * 薪资所属月
+ */
+ private Date salaryDate;
+
+ //消息标题
+ private String title;
+
+ //消息内容
+ private String text;
+
+ //工资单预览实体名
+ private String entityName;
+
+ //发送通道
+ private Set sendChannels;
+
+ //发送者
+ private User sendUser;
+
+ //工资单模板
+ private SalaryTemplatePO salaryTemplate;
+
+ //工资单背景图base64编码
+ private String backgroundBase64;
+
+ //云桥工资单消息图
+ private String picUrl;
+
+ //扣缴义务人名称
+ private String taxAgentName;
+
+ //工资单模板-薪资项目设置
+ private List salaryItemSetList;
+
+ //工资单模板-员工基本信息
+ private SalaryTemplateSalaryItemSetListDTO employeeInformation;
+
+ //工资单模板-对应人员字段
+ private Map employeeField;
+
+ //工资单模板-发放说明标签国际化
+ private String remarkI18n;
+
+ //邮件是否可以发送邮件
+ private boolean isEnableEmail;
+
+ //工资单发放
+ private SalarySendPO salarySend;
+
+ //收入所得项目类型
+ private List incomeCategorys;
+
+ //薪资项目收入所得类型
+ private Map salaryItemIncomeCategoryMap;
+}
diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalarySendInfoListDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalarySendInfoListDTO.java
index eb82e629f..6f976855a 100644
--- a/src/com/engine/salary/entity/salaryBill/dto/SalarySendInfoListDTO.java
+++ b/src/com/engine/salary/entity/salaryBill/dto/SalarySendInfoListDTO.java
@@ -30,6 +30,7 @@ public class SalarySendInfoListDTO {
@TableTitle(title = "个税扣缴义务人", dataIndex = "taxAgent", key = "taxAgent")
private String taxAgent;
+ private Long taxAgentId;
@TableTitle(title = "部门", dataIndex = "department", key = "department")
@@ -47,5 +48,12 @@ public class SalarySendInfoListDTO {
@TableTitle(title = "发送状态", dataIndex = "sendStatus", key = "sendStatus")
private String sendStatus;
+ private String email;
+ private Long salaryAcctRecordId;
+ /**
+ * 核算类型。0：正常，1：补发
+ */
+ private Integer salaryAcctType;
+
}
diff --git a/src/com/engine/salary/entity/salaryBill/param/SalarySendGrantParam.java b/src/com/engine/salary/entity/salaryBill/param/SalarySendGrantParam.java
index 3e6b4c7dd..dfabe74d5 100644
--- a/src/com/engine/salary/entity/salaryBill/param/SalarySendGrantParam.java
+++ b/src/com/engine/salary/entity/salaryBill/param/SalarySendGrantParam.java
@@ -7,7 +7,6 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import java.util.Collection;
import java.util.List;
/**
@@ -23,7 +22,7 @@ import java.util.List;
public class SalarySendGrantParam {
// 主键id
- private Collection ids;
+ private List ids;
// 工资单发放Id
private Long salarySendId;
diff --git a/src/com/engine/salary/entity/salaryBill/param/SalarySendWithdrawParam.java b/src/com/engine/salary/entity/salaryBill/param/SalarySendWithdrawParam.java
index af1fcedd9..e9b4caabd 100644
--- a/src/com/engine/salary/entity/salaryBill/param/SalarySendWithdrawParam.java
+++ b/src/com/engine/salary/entity/salaryBill/param/SalarySendWithdrawParam.java
@@ -1,39 +1,33 @@
package com.engine.salary.entity.salaryBill.param;
-import com.engine.salary.exception.SalaryRunTimeException;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import java.util.Collection;
import java.util.List;
/**
- * @Description: 工资单撤回参数
- * @Author: wangxiangzhong
- * @Date: 2021/12/13 16:18
- */
+ * 工资单发送参数
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
-////"工资单撤回参数")
public class SalarySendWithdrawParam {
-// 主键id")
- private Collection ids;
+ // 主键id")
+ private List ids;
-// 工资单发放Id")
+ // 工资单发放Id")
private Long salarySendId;
+ //发送范围
private List salarySendRangeIds;
- public static String checkParam(SalarySendWithdrawParam param, Long employeeId, String tenantKey) {
- if (param.getSalarySendId() == null) {
- throw new SalaryRunTimeException("工资单发放Id必传");
- }
-
- return "";
- }
}
diff --git a/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java b/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java
index 2295dfefc..66d55f5b1 100644
--- a/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java
+++ b/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java
@@ -20,101 +20,101 @@ import java.util.List;
@Builder
@NoArgsConstructor
@AllArgsConstructor
-////"工资单模板保存参数")
+//"工资单模板保存参数
public class SalaryTemplateSaveParam {
-// 主键")
+ // 主键
private Long id;
-// 模板名称")
+ // 模板名称
private String name;
-// 薪资账套表的主键id")
+ // 薪资账套表的主键id
private Long salarySobId;
-// 备注")
+ // 备注
private String description;
-// 邮箱开启状态。false：关、true：开")
+ // 邮箱开启状态。false：关、true：开
private Boolean emailStatus;
-// 发送地址")
+ // 发送地址
private Long sendEmail;
-// 消息中心开启状态。false：关、true：开")
+ // 消息中心开启状态。false：关、true：开
private Boolean msgStatus;
-// 主题")
+ // 主题
private String theme;
-// 背景图")
+ // 背景图
private String background;
-// 文本内容")
+ // 文本内容
private String textContent;
-// 文本内容位置。1：薪资项目前、2：薪资项目后")
+ // 文本内容位置。1：薪资项目前、2：薪资项目后
private Integer textContentPosition;
-// 薪资项为空时不显示开启状态。false：关、true：开")
+ // 薪资项为空时不显示开启状态。false：关、true：开
private Boolean salaryItemNullStatus;
-// 薪资项为0时不显示开启状态。false：关、true：开")
+ // 薪资项为0时不显示开启状态。false：关、true：开
private Boolean salaryItemZeroStatus;
-// 薪资项目设置")
+ // 薪资项目设置
private List salaryItemSetting;
-// 补发工资单模板名称")
+ // 补发工资单模板名称
private String replenishName;
-// 补发工资单名单生成规则")
+ // 补发工资单名单生成规则
private String replenishRule;
-// 补发薪资项目设置")
+ // 补发薪资项目设置
private List replenishSalaryItemSetting;
public static void checkParam(SalaryTemplateSaveParam saveParam) {
if (saveParam.getSalarySobId() == null) {
- throw new SalaryRunTimeException("薪资账套表的主键id必传");
+ throw new SalaryRunTimeException("薪资账套表的主键id必传;");
}
if (StringUtils.isEmpty(saveParam.getName())) {
- throw new SalaryRunTimeException("工资单模板名称必填");
+ throw new SalaryRunTimeException("工资单模板名称必填;");
}
if (StringUtils.isEmpty(saveParam.getTheme())) {
- throw new SalaryRunTimeException("工资单主题必填");
+ throw new SalaryRunTimeException("工资单主题必填;");
}
if (StringUtils.isEmpty(saveParam.getReplenishName())) {
- throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel( 139737, "补发工资单模板名称必填"));
+ throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(139737, "补发工资单模板名称必填"));
}
if (saveParam.getName().equals(saveParam.getReplenishName())) {
- throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel( 140557, "工资单模板名称和补发工资单模板名称不可相同"));
+ throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(140557, "工资单模板名称和补发工资单模板名称不可相同"));
}
if (StringUtils.isEmpty(saveParam.getReplenishRule())) {
- throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel( 139738, "补发工资单名单生成规则必填"));
+ throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(139738, "补发工资单名单生成规则必填"));
}
-
+
if (saveParam.getEmailStatus() && saveParam.getSendEmail() == null) {
- throw new SalaryRunTimeException("开启邮箱后，发送地址必选");
+ throw new SalaryRunTimeException("开启邮箱后，发送地址必选;");
}
if (StringUtils.isNotEmpty(saveParam.getTextContent()) && saveParam.getTextContentPosition() == null) {
- throw new SalaryRunTimeException("文本内容不为空时，文本内容位置必选");
+ throw new SalaryRunTimeException("文本内容不为空时，文本内容位置必选;");
}
- if (saveParam.getTextContentPosition() !=null && saveParam.getTextContentPosition().equals(SalaryTemplateTextContentPositionEnum.BEFORE.getValue()) && saveParam.getTextContentPosition().equals(SalaryTemplateTextContentPositionEnum.AFTER.getValue())) {
- throw new SalaryRunTimeException("文本内容位置参数不对");
+ if (saveParam.getTextContentPosition() != null && saveParam.getTextContentPosition().equals(SalaryTemplateTextContentPositionEnum.BEFORE.getValue()) && saveParam.getTextContentPosition().equals(SalaryTemplateTextContentPositionEnum.AFTER.getValue())) {
+ throw new SalaryRunTimeException("文本内容位置参数不对;");
}
if (CollectionUtils.isEmpty(saveParam.getReplenishSalaryItemSetting())) {
- throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel( 140509, "补发工资单模板的薪资项目设置不能为空"));
+ throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(140509, "补发工资单模板的薪资项目设置不能为空"));
}
}
}
diff --git a/src/com/engine/salary/entity/salaryBill/po/SalarySendInfoPO.java b/src/com/engine/salary/entity/salaryBill/po/SalarySendInfoPO.java
index 6dd5241b1..5efa58c05 100644
--- a/src/com/engine/salary/entity/salaryBill/po/SalarySendInfoPO.java
+++ b/src/com/engine/salary/entity/salaryBill/po/SalarySendInfoPO.java
@@ -8,25 +8,23 @@ import lombok.NoArgsConstructor;
import java.util.Date;
/**
- * @Description: 工资单发放信息
- * @Author: wangxiangzhong
- * @Date: 2021-12-11 11:29
+ * 工资单发放信息
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
-////hrsa_salary_send_info")
-//工资单发放信息表")
+//hrsa_salary_send_info
public class SalarySendInfoPO {
- public Object get;
/**
* 主键id
*/
private Long id;
-// 工资单发放id
+ /**
+ * 工资单发放id
+ */
private Long salarySendId;
/**
diff --git a/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java b/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java
index de19e6af6..2cfa80624 100644
--- a/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java
+++ b/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java
@@ -47,19 +47,26 @@ public class SalaryTemplatePO {
private String description;
/**
- * 邮箱开启状态。0：关、1：开
+ * 消息中心开启状态。0：关、1：开 ,默认开启
+ */
+ private Integer msgStatus;
+
+ /**
+ * 邮箱开启状态。0：关、1：开，默认关闭
*/
private Integer emailStatus;
+
/**
* 发送地址:公共邮箱账号id
*/
private Long sendEmailId;
+
/**
- * 消息中心开启状态。0：关、1：开
+ * 短信开启状态。0：关、1：开，默认关闭
*/
- private Integer msgStatus;
+ private Integer smsStatus;
/**
* 主题
diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryAccResultListDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryAccResultListDTO.java
deleted file mode 100644
index f294ed26c..000000000
--- a/src/com/engine/salary/entity/salaryacct/dto/SalaryAccResultListDTO.java
+++ /dev/null
@@ -1,39 +0,0 @@
-//package com.engine.salary.entity.salaryacct.dto;
-//
-//import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-//import com.weaver.hrm.salary.common.WeaTableColumnWapper;
-//import io.swagger.annotations.ApiModel;
-//import io.swagger.annotations.ApiModelProperty;
-//import lombok.AllArgsConstructor;
-//import lombok.Builder;
-//import lombok.Data;
-//import lombok.NoArgsConstructor;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * @description: 核算结果列表
-// * @author: xiajun
-// * @modified By: xiajun
-// * @date: Created in 12/6/21 6:53 PM
-// * @version:v1.0
-// */
-//@Data
-//@Builder
-//@NoArgsConstructor
-//@AllArgsConstructor
-////"核算结果列表")
-//public class SalaryAccResultListDTO {
-//
-// //动态表头")
-// private List columns;
-//
-// //列表数据")
-// private List> data;
-//
-// @JsonSerialize(using = ToStringSerializer.class)
-// //列表总数")
-// private Long total;
-//}
diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctDTO.java
deleted file mode 100644
index 03db18e83..000000000
--- a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctDTO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-//package com.engine.salary.entity.salaryacct.dto;
-//
-//import io.swagger.annotations.ApiModelProperty;
-//import lombok.AllArgsConstructor;
-//import lombok.Builder;
-//import lombok.Data;
-//import lombok.NoArgsConstructor;
-//
-///**
-// * @description: 薪资核算
-// * @author: xiajun
-// * @modified By: xiajun
-// * @date: Created in 12/16/21 8:40 PM
-// * @version:v1.0
-// */
-//@Data
-//@Builder
-//@NoArgsConstructor
-//@AllArgsConstructor
-//public class SalaryAcctDTO {
-//
-// //是否正在核算")
-// private boolean acctInProgress;
-//}
diff --git a/src/com/engine/salary/enums/salarybill/MessageChannelEnum.java b/src/com/engine/salary/enums/salarybill/MessageChannelEnum.java
new file mode 100644
index 000000000..164d0e168
--- /dev/null
+++ b/src/com/engine/salary/enums/salarybill/MessageChannelEnum.java
@@ -0,0 +1,73 @@
+package com.engine.salary.enums.salarybill;
+
+import com.engine.salary.enums.BaseEnum;
+
+import java.util.Arrays;
+
+/**
+ * 消息通道
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+public enum MessageChannelEnum implements BaseEnum {
+
+ MSG(0, "系统消息", 93212),
+ EMAIL(1, "邮件", 93286),
+ SMS(2, "短信", 93287);
+
+ private int value;
+
+ private String defaultLabel;
+
+ private int labelId;
+
+ MessageChannelEnum(int value, String defaultLabel, int labelId) {
+ this.value = value;
+ this.defaultLabel = defaultLabel;
+ this.labelId = labelId;
+ }
+
+ @Override
+ public Integer getValue() {
+ return value;
+ }
+
+ @Override
+ public String getDefaultLabel() {
+ return defaultLabel;
+ }
+
+ @Override
+ public Integer getLabelId() {
+ return labelId;
+ }
+
+ public static String getDefaultLabelByValue(Integer value) {
+ if (value == null) {
+ return "";
+ }
+ MessageChannelEnum[] enumAry = MessageChannelEnum.values();
+ for(int i = 0; i < Arrays.asList(enumAry).size(); i++){
+ if (Integer.valueOf(enumAry[i].getValue()).equals(value)) {
+ return enumAry[i].getDefaultLabel();
+ }
+ }
+ return "";
+ }
+
+ public static String getNameByValue(Integer value) {
+ if (value == null) {
+ return "";
+ }
+ MessageChannelEnum[] enumAry = MessageChannelEnum.values();
+ for(int i = 0; i < Arrays.asList(enumAry).size(); i++){
+ if (Integer.valueOf(enumAry[i].getValue()).equals(value)) {
+ return enumAry[i].name();
+ }
+ }
+ return "";
+ }
+}
diff --git a/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java b/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java
index 1c786c73d..200da6442 100644
--- a/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java
+++ b/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java
@@ -6,7 +6,7 @@ import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.datacollection.dto.AttendQuoteFieldListDTO;
import com.engine.salary.entity.salaryacct.bo.SalaryAcctCalculateBO;
import com.engine.salary.entity.salaryacct.bo.SalaryAcctCalculatePriorityBO;
-import com.engine.salary.entity.salaryacct.dto.SalaryAcctProgressDTO;
+import com.engine.salary.entity.progress.ProgressDTO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
@@ -109,8 +109,8 @@ public class SalaryAcctManager extends Service {
return ServiceUtil.getService(SalaryAcctCalculateServiceImpl.class, user);
}
- private SalaryAcctProgressService getSalaryAcctProgressService(User user) {
- return ServiceUtil.getService(SalaryAcctProgressServiceImpl.class, user);
+ private ProgressService getSalaryAcctProgressService(User user) {
+ return ServiceUtil.getService(ProgressServiceImpl.class, user);
}
private DataSourceTransactionManager dataSourceTransactionManager;
@@ -202,12 +202,12 @@ public class SalaryAcctManager extends Service {
simpleEmployee.setEmployeeId((long) user.getUID());
// 检查是否正在核算中
- SalaryAcctProgressDTO salaryAcctProgressDTO = getSalaryAcctProgressService(user).getProgress("SUPPLEMENT_ACCT_PROGRESS_" + salaryAcctRecordId);
+ ProgressDTO salaryAcctProgressDTO = getSalaryAcctProgressService(user).getProgress("SUPPLEMENT_ACCT_PROGRESS_" + salaryAcctRecordId);
if (Objects.nonNull(salaryAcctProgressDTO) && salaryAcctProgressDTO.isStatus() && Optional.ofNullable(salaryAcctProgressDTO.getProgress()).orElse(BigDecimal.ZERO).compareTo(BigDecimal.ONE) < 0) {
return;
}
// 初始化进度
- SalaryAcctProgressDTO initProgress = new SalaryAcctProgressDTO()
+ ProgressDTO initProgress = new ProgressDTO()
.setTitle(SalaryI18nUtil.getI18nLabel(97515, "核算中"))
.setTitleLabelId(97515L)
.setTotalQuantity(NumberUtils.INTEGER_ONE)
@@ -297,7 +297,7 @@ public class SalaryAcctManager extends Service {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(103378, "薪资核算人员不能为空"));
}
// 11.1、初始化进度
- SalaryAcctProgressDTO initProgress = new SalaryAcctProgressDTO().setTitle(SalaryI18nUtil.getI18nLabel(97515, "核算中")).setTitleLabelId(97515L).setTotalQuantity(salaryAcctEmployeePOS.size() * 2 + 1).setCalculatedQuantity(0).setProgress(BigDecimal.ZERO).setStatus(true).setMessage(StringUtils.EMPTY);
+ ProgressDTO initProgress = new ProgressDTO().setTitle(SalaryI18nUtil.getI18nLabel(97515, "核算中")).setTitleLabelId(97515L).setTotalQuantity(salaryAcctEmployeePOS.size() * 2 + 1).setCalculatedQuantity(0).setProgress(BigDecimal.ZERO).setStatus(true).setMessage(StringUtils.EMPTY);
getSalaryAcctProgressService(user).initProgress("SUPPLEMENT_ACCT_PROGRESS_" + salaryAcctRecordId, initProgress);
// 12、对薪资核算人员进行拆分
List> partition = Lists.partition(salaryAcctEmployeePOS, 5000);
diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml
index 404920353..4266b9277 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml
@@ -14,6 +14,7 @@
+
diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
index 9150f856f..d609b4e03 100644
--- a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
+++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
@@ -157,6 +157,9 @@
t1.id,
+ t1.salary_acct_record_id as salaryAcctRecordId,
+ t1.salary_acct_type as salaryAcctType,
+ t1.tax_agent_id as taxAgentId,
e.lastname as username,
t2.name AS tax_agent,
d.departmentname AS department,
diff --git a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml
index 0c103ca79..580cdc5b8 100644
--- a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml
+++ b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml
@@ -9,6 +9,7 @@
+
@@ -37,6 +38,7 @@
, t.use_type
, t.description
, t.email_status
+ , t.sms_status
, t.send_email_id
, t.msg_status
, t.theme
@@ -61,6 +63,7 @@
use_type,
description,
email_status,
+ sms_status,
send_email_id,
msg_status,
theme,
@@ -352,6 +355,9 @@
email_status=#{emailStatus},
+
+ sms_status=#{smsStatus},
+
send_email_id=#{sendEmailId},
@@ -433,6 +439,9 @@
msg_status,
+
+ sms_status,
+
theme,
@@ -504,6 +513,9 @@
#{msgStatus},
+
+ #{smsStatus},
+
#{theme},
@@ -585,6 +597,9 @@
msg_status,
+
+ sms_status,
+
theme,
@@ -656,6 +671,9 @@
#{msgStatus},
+
+ #{smsStatus},
+
#{theme},
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
index b01c8d79c..9734ebf70 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
@@ -93,13 +93,13 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
}
// private ExtEmployeeService extEmployeeService;
-// @Autowired
+//
// private HrmCommonEmployeeService hrmCommonEmployeeService;
-// @RpcReference
+//
// private HrmJobCallRemoteService hrmJobCallRemoteService;
-// @RpcReference
+//
// private RemoteUserInfoService remoteUserInfoService;
-// @Autowired
+//
// private HrmCommonHrmStatusService hrmCommonHrmStatusService;
// (name = "salaryStatReportLoggerTemplate")
// private LoggerTemplate salaryStatReportLoggerTemplate;
diff --git a/src/com/engine/salary/report/service/impl/SubTableExportServiceImpl.java b/src/com/engine/salary/report/service/impl/SubTableExportServiceImpl.java
index d3505a5ba..18d601975 100644
--- a/src/com/engine/salary/report/service/impl/SubTableExportServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SubTableExportServiceImpl.java
@@ -8,7 +8,7 @@ public class SubTableExportServiceImpl extends Service implements SubTableExport
// private Logger logger = LoggerFactory.getLogger(this.getClass());
//
-// @Autowired
+//
// private SalaryBatchService salaryBatchService;
//
// @Override
diff --git a/src/com/engine/salary/service/SalaryAcctProgressService.java b/src/com/engine/salary/service/ProgressService.java
similarity index 67%
rename from src/com/engine/salary/service/SalaryAcctProgressService.java
rename to src/com/engine/salary/service/ProgressService.java
index 1dab7e710..210ec62dd 100644
--- a/src/com/engine/salary/service/SalaryAcctProgressService.java
+++ b/src/com/engine/salary/service/ProgressService.java
@@ -1,18 +1,18 @@
package com.engine.salary.service;
-import com.engine.salary.entity.salaryacct.dto.SalaryAcctProgressDTO;
+import com.engine.salary.entity.progress.ProgressDTO;
import java.math.BigDecimal;
/**
- * 核算进度
+ * 进度条
* Copyright: Copyright (c) 2022
* Company: 泛微软件
*
* @author qiantao
* @version 1.0
**/
-public interface SalaryAcctProgressService {
+public interface ProgressService {
/**
* 初始化核算进度条
@@ -20,7 +20,7 @@ public interface SalaryAcctProgressService {
* @param salaryAcctProgress
* @return
*/
- void initProgress(String cacheKey, SalaryAcctProgressDTO salaryAcctProgress);
+ void initProgress(String cacheKey, ProgressDTO salaryAcctProgress);
/**
* 更新进度条
@@ -31,7 +31,12 @@ public interface SalaryAcctProgressService {
void getAndAddCalculatedQty(String cacheKey, Integer calculatedQuantity);
- //
+ /**
+ * 更新进度条
+ * @param cacheKey
+ * @param calculatedQuantity
+ * @param message
+ */
void getAndAddCalculatedQty(String cacheKey, Integer calculatedQuantity, String message);
/**
@@ -50,6 +55,14 @@ public interface SalaryAcctProgressService {
*/
void finish(String cacheKey, boolean checkStatus);
+ /**
+ * 完成
+ * @param cacheKey
+ * @param checkStatus
+ * @param message
+ */
+ void finish(String cacheKey, boolean checkStatus,String message);
+
/**
* 更新进度条
*
@@ -61,7 +74,7 @@ public interface SalaryAcctProgressService {
* 获取进度条
* @return
*/
- SalaryAcctProgressDTO getProgress(String cacheKey);
+ ProgressDTO getProgress(String cacheKey);
/**
* 删除redis中的缓存
@@ -69,5 +82,5 @@ public interface SalaryAcctProgressService {
* @param cacheKey
* @return
*/
- SalaryAcctProgressDTO del(String cacheKey);
+ ProgressDTO del(String cacheKey);
}
diff --git a/src/com/engine/salary/service/SalaryBillService.java b/src/com/engine/salary/service/SalaryBillService.java
new file mode 100644
index 000000000..9a37671a0
--- /dev/null
+++ b/src/com/engine/salary/service/SalaryBillService.java
@@ -0,0 +1,63 @@
+package com.engine.salary.service;
+
+import com.engine.salary.entity.salaryBill.param.SalarySendGrantParam;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 工资单
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+public interface SalaryBillService {
+
+ /**
+ * 工资单发放
+ *
+ * @param queryParam
+ */
+ Map grant(SalarySendGrantParam queryParam);
+
+ /**
+ * 获取内容
+ * @param sendId
+ * @param ids
+ * @return
+ */
+ List> getSendInfoList(Long sendId, List ids);
+
+ /**
+ * 工资单撤回
+ *
+ * @param queryParam
+ * @param isRange
+ * @param rangeIds
+ * @param currentEmployeeId
+ * @param currentTenantKey
+ */
+// void withdraw(SalarySendWithdrawParam queryParam, boolean isRange, List rangeIds);
+
+ /**
+ * 我的工资单
+ *
+ * @param salaryInfoId
+ * @param currentEmployeeId
+ * @param currentTenantKey
+ * @return
+ */
+// Map mySalaryBill(Long salaryInfoId);
+
+ /**
+ * 我的工资单列表详情
+ *
+ * @param page
+ * @param queryParam
+ * @param tenantKey
+ * @return
+ */
+// Page mySalaryBillListPage(Page page, SalaryBillQueryParam queryParam, String tenantKey);
+}
diff --git a/src/com/engine/salary/service/SalarySendService.java b/src/com/engine/salary/service/SalarySendService.java
index b55c5a560..d85b9cd5d 100644
--- a/src/com/engine/salary/service/SalarySendService.java
+++ b/src/com/engine/salary/service/SalarySendService.java
@@ -4,7 +4,9 @@ import com.engine.salary.entity.salaryBill.dto.*;
import com.engine.salary.entity.salaryBill.param.*;
import com.engine.salary.entity.salaryBill.po.SalarySendPO;
import com.engine.salary.entity.salaryBill.po.SalaryTemplatePO;
+import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
+import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
import com.engine.salary.util.page.PageInfo;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -121,6 +123,15 @@ public interface SalarySendService {
*/
List> buildDetailList(List salaryItems, List records, Long salaryAccountingId);
+ /**
+ * 构建详情列表
+ *
+ * @param records
+ * @param salaryAcctResultValues
+ * @return
+ */
+ List> buildDetailList(List records,List salaryAcctEmployees, List salaryAcctResultValues);
+
/**
* 导出-工资单发放详情列表
*
diff --git a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
index b576564ca..c48b1c7e5 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
@@ -52,9 +52,9 @@ public class AttendQuoteFieldServiceImpl extends Service implements AttendQuoteF
}
-// @RpcReference
+//
// private RemoteAttendInitVacationService remoteAttendInitVacationService;
-// @Autowired
+//
// private LoggerTemplate attendQuoteFieldLoggerTemplate;
diff --git a/src/com/engine/salary/service/impl/AttendQuoteFieldSettingServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteFieldSettingServiceImpl.java
index 7ed945ff0..dd8eef639 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteFieldSettingServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteFieldSettingServiceImpl.java
@@ -49,7 +49,7 @@ public class AttendQuoteFieldSettingServiceImpl extends Service implements Atten
// private AttendQuoteFieldSettingMapper mapper;
//
// private AttendQuoteFieldMapper attendQuoteFieldMapper;
-// @Autowired
+//
// private LoggerTemplate attendQuoteFieldSettingLoggerTemplate;
private AttendQuoteFieldService getAttendQuoteFieldService(User user) {
return (AttendQuoteFieldService) ServiceUtil.getService(AttendQuoteFieldServiceImpl.class, user);
diff --git a/src/com/engine/salary/service/impl/ProgressServiceImpl.java b/src/com/engine/salary/service/impl/ProgressServiceImpl.java
new file mode 100644
index 000000000..6935d5883
--- /dev/null
+++ b/src/com/engine/salary/service/impl/ProgressServiceImpl.java
@@ -0,0 +1,145 @@
+package com.engine.salary.service.impl;
+
+import com.cloudstore.dev.api.util.Util_DataCache;
+import com.engine.core.impl.Service;
+import com.engine.salary.entity.progress.ProgressDTO;
+import com.engine.salary.service.ProgressService;
+import com.engine.salary.util.JsonUtil;
+import org.apache.commons.lang3.StringUtils;
+import weaver.wechat.util.Utils;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+/**
+ * 进度条
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+public class ProgressServiceImpl extends Service implements ProgressService {
+
+
+ @Override
+ public void initProgress(String cacheKey, ProgressDTO progressDTO) {
+ Util_DataCache.setObjVal(cacheKey, JsonUtil.toJsonString(progressDTO));
+ }
+
+ @Override
+ public synchronized void getAndAddCalculatedQty(String cacheKey, Integer calculatedQuantity) {
+ String resultStr = (String) Util_DataCache.getObjVal(cacheKey);
+ if (StringUtils.isNotEmpty(resultStr)) {
+ ProgressDTO progressDTO = JsonUtil.parseObject(resultStr, ProgressDTO.class);
+ if (progressDTO == null || !progressDTO.isStatus()) {
+ return;
+ }
+ Integer currentCalculatedQuantity = progressDTO.getCalculatedQuantity() + calculatedQuantity;
+ progressDTO.setCalculatedQuantity(
+ currentCalculatedQuantity > progressDTO.getTotalQuantity() ? progressDTO.getTotalQuantity() : currentCalculatedQuantity);
+ BigDecimal progress = BigDecimal.valueOf(progressDTO.getCalculatedQuantity())
+ .divide(BigDecimal.valueOf(progressDTO.getTotalQuantity()), 4, RoundingMode.HALF_DOWN);
+ progressDTO.setProgress(progress.compareTo(BigDecimal.ONE) > 0 ? BigDecimal.ONE : progress);
+ Util_DataCache.setObjVal(cacheKey, JsonUtil.toJsonString(progressDTO));
+ }
+ }
+
+ @Override
+ public synchronized void getAndAddCalculatedQty(String cacheKey, Integer calculatedQuantity, String message) {
+ String resultStr = (String) Util_DataCache.getObjVal(cacheKey);
+ if (StringUtils.isNotEmpty(resultStr)) {
+ ProgressDTO progressDTO = JsonUtil.parseObject(resultStr, ProgressDTO.class);
+ if (progressDTO == null || (progressDTO.isStatus())) {
+ return;
+ }
+ Integer currentCalculatedQuantity = progressDTO.getCalculatedQuantity() + calculatedQuantity;
+ progressDTO.setCalculatedQuantity(
+ currentCalculatedQuantity > progressDTO.getTotalQuantity() ? progressDTO.getTotalQuantity() : currentCalculatedQuantity);
+ BigDecimal progress = BigDecimal.valueOf(progressDTO.getCalculatedQuantity())
+ .divide(BigDecimal.valueOf(progressDTO.getTotalQuantity()), 4, RoundingMode.HALF_DOWN);
+ progressDTO.setProgress(progress.compareTo(BigDecimal.ONE) > 0 ? BigDecimal.ONE : progress);
+
+ if (StringUtils.isNotBlank(message)) {
+ progressDTO.setMessage(Utils.null2String(progressDTO.getMessage()) + message);
+ }
+ Util_DataCache.setObjVal(cacheKey, JsonUtil.toJsonString(progressDTO));
+ }
+ }
+
+ @Override
+ public void fail(String cacheKey, String message) {
+ ProgressDTO progressDTO = new ProgressDTO();
+ progressDTO.setStatus(false);
+ progressDTO.setMessage(message);
+ progressDTO.setCheckStatus(true);
+ Util_DataCache.setObjVal(cacheKey, JsonUtil.toJsonString(progressDTO));
+ }
+
+ @Override
+ public void finish(String cacheKey, boolean checkStatus) {
+ String resultStr = (String) Util_DataCache.getObjVal(cacheKey);
+ if (StringUtils.isNotEmpty(resultStr)) {
+ ProgressDTO progressDTO = JsonUtil.parseObject(resultStr, ProgressDTO.class);
+ if (progressDTO == null || !progressDTO.isStatus()) {
+ return;
+ }
+ progressDTO.setTitle("操作完成");
+ progressDTO.setCalculatedQuantity(progressDTO.getTotalQuantity());
+ progressDTO.setProgress(BigDecimal.ONE);
+ progressDTO.setCheckStatus(checkStatus);
+ Util_DataCache.setObjVal(cacheKey, JsonUtil.toJsonString(progressDTO));
+ }
+ }
+
+ @Override
+ public void finish(String cacheKey, boolean checkStatus, String message) {
+ String resultStr = (String) Util_DataCache.getObjVal(cacheKey);
+ if (StringUtils.isNotEmpty(resultStr)) {
+ ProgressDTO progressDTO = JsonUtil.parseObject(resultStr, ProgressDTO.class);
+ if (progressDTO == null || !progressDTO.isStatus()) {
+ return;
+ }
+ progressDTO.setTitle("操作完成");
+ progressDTO.setCalculatedQuantity(progressDTO.getTotalQuantity());
+ progressDTO.setProgress(BigDecimal.ONE);
+ progressDTO.setCheckStatus(checkStatus);
+ progressDTO.setMessage(message);
+ Util_DataCache.setObjVal(cacheKey, JsonUtil.toJsonString(progressDTO));
+ }
+ }
+
+ @Override
+ public void updateProgress(String cacheKey, BigDecimal progress, boolean checkStatus) {
+ String resultStr = (String) Util_DataCache.getObjVal(cacheKey);
+ if (StringUtils.isNotEmpty(resultStr)) {
+ ProgressDTO progressDTO = JsonUtil.parseObject(resultStr, ProgressDTO.class);
+ if (progressDTO == null || !progressDTO.isStatus()) {
+ return;
+ }
+ progressDTO.setTitle("处理中");
+ progressDTO.setCalculatedQuantity(progressDTO.getTotalQuantity());
+ progressDTO.setProgress(progress);
+ progressDTO.setCheckStatus(checkStatus);
+ Util_DataCache.setObjVal(cacheKey, JsonUtil.toJsonString(progressDTO));
+ }
+ }
+
+ @Override
+ public ProgressDTO getProgress(String cacheKey) {
+ String resultStr = (String) Util_DataCache.getObjVal(cacheKey);
+ if (StringUtils.isEmpty(resultStr)) {
+ return null;
+ }
+ return JsonUtil.parseObject(resultStr, ProgressDTO.class);
+ }
+
+ @Override
+ public ProgressDTO del(String cacheKey) {
+ Util_DataCache.clearVal(cacheKey);
+ ProgressDTO salaryAcctProgressDTO = new ProgressDTO();
+ salaryAcctProgressDTO.setMessage("操作失败");
+ salaryAcctProgressDTO.setStatus(false);
+ return salaryAcctProgressDTO;
+ }
+}
diff --git a/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
index 768975e43..69eb5b02e 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
@@ -97,8 +97,8 @@ public class SalaryAcctCalculateServiceImpl extends Service implements SalaryAcc
return (SalaryAcctResultTempService) ServiceUtil.getService(SalaryAcctResultTempServiceImpl.class, user);
}
- private SalaryAcctProgressService getSalaryAcctProgressService(User user) {
- return (SalaryAcctProgressService) ServiceUtil.getService(SalaryAcctProgressServiceImpl.class, user);
+ private ProgressService getSalaryAcctProgressService(User user) {
+ return (ProgressService) ServiceUtil.getService(ProgressServiceImpl.class, user);
}
private SalaryAcctEmployeeService getSalaryAcctEmployeeService(User user) {
diff --git a/src/com/engine/salary/service/impl/SalaryAcctProgressServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctProgressServiceImpl.java
deleted file mode 100644
index 0cb90e377..000000000
--- a/src/com/engine/salary/service/impl/SalaryAcctProgressServiceImpl.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.engine.salary.service.impl;
-
-import com.cloudstore.dev.api.util.Util_DataCache;
-import com.engine.core.impl.Service;
-import com.engine.salary.entity.salaryacct.dto.SalaryAcctProgressDTO;
-import com.engine.salary.service.SalaryAcctProgressService;
-import com.engine.salary.util.JsonUtil;
-import org.apache.commons.lang3.StringUtils;
-import weaver.wechat.util.Utils;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-
-/**
- * 核算进度条
- * Copyright: Copyright (c) 2022
- * Company: 泛微软件
- *
- * @author qiantao
- * @version 1.0
- **/
-public class SalaryAcctProgressServiceImpl extends Service implements SalaryAcctProgressService {
-
-
- @Override
- public void initProgress(String cacheKey, SalaryAcctProgressDTO salaryAcctProgress) {
- Util_DataCache.setObjVal(cacheKey, JsonUtil.toJsonString(salaryAcctProgress));
- }
-
- @Override
- public synchronized void getAndAddCalculatedQty(String cacheKey, Integer calculatedQuantity) {
- String resultStr = (String) Util_DataCache.getObjVal(cacheKey);
- if (StringUtils.isNotEmpty(resultStr)) {
- SalaryAcctProgressDTO salaryAcctProgress = JsonUtil.parseObject(resultStr, SalaryAcctProgressDTO.class);
- if (salaryAcctProgress == null || !salaryAcctProgress.isStatus()) {
- return;
- }
- Integer currentCalculatedQuantity = salaryAcctProgress.getCalculatedQuantity() + calculatedQuantity;
- salaryAcctProgress.setCalculatedQuantity(
- currentCalculatedQuantity > salaryAcctProgress.getTotalQuantity() ? salaryAcctProgress.getTotalQuantity() : currentCalculatedQuantity);
- BigDecimal progress = BigDecimal.valueOf(salaryAcctProgress.getCalculatedQuantity())
- .divide(BigDecimal.valueOf(salaryAcctProgress.getTotalQuantity()), 4, RoundingMode.HALF_DOWN);
- salaryAcctProgress.setProgress(progress.compareTo(BigDecimal.ONE) > 0 ? BigDecimal.ONE : progress);
- Util_DataCache.setObjVal(cacheKey, JsonUtil.toJsonString(salaryAcctProgress));
- }
- }
-
- @Override
- public synchronized void getAndAddCalculatedQty(String cacheKey, Integer calculatedQuantity, String message) {
- String resultStr = (String) Util_DataCache.getObjVal(cacheKey);
- if (StringUtils.isNotEmpty(resultStr)) {
- SalaryAcctProgressDTO salaryAcctProgress = JsonUtil.parseObject(resultStr, SalaryAcctProgressDTO.class);
- if (salaryAcctProgress == null || !salaryAcctProgress.isStatus()) {
- return;
- }
- Integer currentCalculatedQuantity = salaryAcctProgress.getCalculatedQuantity() + calculatedQuantity;
- salaryAcctProgress.setCalculatedQuantity(
- currentCalculatedQuantity > salaryAcctProgress.getTotalQuantity() ? salaryAcctProgress.getTotalQuantity() : currentCalculatedQuantity);
- BigDecimal progress = BigDecimal.valueOf(salaryAcctProgress.getCalculatedQuantity())
- .divide(BigDecimal.valueOf(salaryAcctProgress.getTotalQuantity()), 4, RoundingMode.HALF_DOWN);
- salaryAcctProgress.setProgress(progress.compareTo(BigDecimal.ONE) > 0 ? BigDecimal.ONE : progress);
-
- if (StringUtils.isNotBlank(message)) {
- salaryAcctProgress.setMessage(Utils.null2String(salaryAcctProgress.getMessage()) + message);
- }
- Util_DataCache.setObjVal(cacheKey, JsonUtil.toJsonString(salaryAcctProgress));
- }
- }
-
- @Override
- public void fail(String cacheKey, String message) {
- SalaryAcctProgressDTO salaryAcctProgress = new SalaryAcctProgressDTO();
- salaryAcctProgress.setStatus(false);
- salaryAcctProgress.setMessage(message);
- salaryAcctProgress.setCheckStatus(true);
- Util_DataCache.setObjVal(cacheKey, JsonUtil.toJsonString(salaryAcctProgress));
- }
-
- @Override
- public void finish(String cacheKey, boolean checkStatus) {
- String resultStr = (String) Util_DataCache.getObjVal(cacheKey);
- if (StringUtils.isNotEmpty(resultStr)) {
- SalaryAcctProgressDTO salaryAcctProgress = JsonUtil.parseObject(resultStr, SalaryAcctProgressDTO.class);
- if (salaryAcctProgress == null || !salaryAcctProgress.isStatus()) {
- return;
- }
- salaryAcctProgress.setTitle("核算完成");
- salaryAcctProgress.setCalculatedQuantity(salaryAcctProgress.getTotalQuantity());
- salaryAcctProgress.setProgress(BigDecimal.ONE);
- salaryAcctProgress.setCheckStatus(checkStatus);
- Util_DataCache.setObjVal(cacheKey, JsonUtil.toJsonString(salaryAcctProgress));
- }
- }
-
- @Override
- public void updateProgress(String cacheKey, BigDecimal progress, boolean checkStatus) {
- String resultStr = (String) Util_DataCache.getObjVal(cacheKey);
- if (StringUtils.isNotEmpty(resultStr)) {
- SalaryAcctProgressDTO salaryAcctProgress = JsonUtil.parseObject(resultStr, SalaryAcctProgressDTO.class);
- if (salaryAcctProgress == null || !salaryAcctProgress.isStatus()) {
- return;
- }
- salaryAcctProgress.setTitle("核算中");
- salaryAcctProgress.setCalculatedQuantity(salaryAcctProgress.getTotalQuantity());
- salaryAcctProgress.setProgress(progress);
- salaryAcctProgress.setCheckStatus(checkStatus);
- Util_DataCache.setObjVal(cacheKey, JsonUtil.toJsonString(salaryAcctProgress));
- }
- }
-
- @Override
- public SalaryAcctProgressDTO getProgress(String cacheKey) {
- String resultStr = (String) Util_DataCache.getObjVal(cacheKey);
- if (StringUtils.isEmpty(resultStr)) {
- return null;
- }
- return JsonUtil.parseObject(resultStr, SalaryAcctProgressDTO.class);
- }
-
- @Override
- public SalaryAcctProgressDTO del(String cacheKey) {
- Util_DataCache.clearVal(cacheKey);
- SalaryAcctProgressDTO salaryAcctProgressDTO = new SalaryAcctProgressDTO();
- salaryAcctProgressDTO.setMessage("核算失败");
- salaryAcctProgressDTO.setStatus(false);
- return salaryAcctProgressDTO;
- }
-}
diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index c6b0979df..b5c1febc4 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -11,7 +11,7 @@ import com.engine.salary.entity.report.bo.SalaryAcctResultReportBO;
import com.engine.salary.entity.report.po.SalaryAcctResultReportPO;
import com.engine.salary.entity.salaryacct.bo.*;
import com.engine.salary.entity.salaryacct.dto.ConsolidatedTaxDetailDTO;
-import com.engine.salary.entity.salaryacct.dto.SalaryAcctProgressDTO;
+import com.engine.salary.entity.progress.ProgressDTO;
import com.engine.salary.entity.salaryacct.dto.SalaryAcctResultDetailDTO;
import com.engine.salary.entity.salaryacct.dto.SalaryAcctResultListColumnDTO;
import com.engine.salary.entity.salaryacct.param.*;
@@ -124,8 +124,8 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
return ServiceUtil.getService(SalaryAcctCalculateServiceImpl.class, user);
}
- private SalaryAcctProgressService getSalaryAcctProgressService(User user) {
- return ServiceUtil.getService(SalaryAcctProgressServiceImpl.class, user);
+ private ProgressService getSalaryAcctProgressService(User user) {
+ return ServiceUtil.getService(ProgressServiceImpl.class, user);
}
private DataSourceTransactionManager dataSourceTransactionManager;
@@ -731,7 +731,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(103378, "薪资核算人员不能为空"));
}
// 11.1、初始化进度
- SalaryAcctProgressDTO initProgress = new SalaryAcctProgressDTO().setTitle(SalaryI18nUtil.getI18nLabel(97515, "核算中")).setTitleLabelId(97515L).setTotalQuantity(salaryAcctEmployeePOS.size() * 2 + 1).setCalculatedQuantity(0).setProgress(BigDecimal.ZERO).setStatus(true).setMessage(StringUtils.EMPTY);
+ ProgressDTO initProgress = new ProgressDTO().setTitle(SalaryI18nUtil.getI18nLabel(97515, "核算中")).setTitleLabelId(97515L).setTotalQuantity(salaryAcctEmployeePOS.size() * 2 + 1).setCalculatedQuantity(0).setProgress(BigDecimal.ZERO).setStatus(true).setMessage(StringUtils.EMPTY);
getSalaryAcctProgressService(user).initProgress(SalaryCacheKey.ACCT_PROGRESS + calculateParam.getSalaryAcctRecordId(), initProgress);
// 12、对薪资核算人员进行拆分
List> partition = Lists.partition(salaryAcctEmployeePOS, 5000);
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
index e9bd1e77c..9e95a4c43 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
@@ -98,9 +98,9 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch
// private SalaryArchiveSobService salaryArchiveSobService;
//
// private SalaryEmployeeService salaryEmployeeService;
-// @Autowired
+//
// private HrmCommonHrmStatusService hrmCommonHrmStatusService;
-// @Autowired
+//
// private BaseEnvInfoService baseEnvInfoService;
// @Override
diff --git a/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java b/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
new file mode 100644
index 000000000..b3b0b26fe
--- /dev/null
+++ b/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
@@ -0,0 +1,990 @@
+package com.engine.salary.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.api.formmode.mybatis.util.SqlProxyHandle;
+import com.engine.common.util.ServiceUtil;
+import com.engine.core.impl.Service;
+import com.engine.salary.biz.SalarySendBiz;
+import com.engine.salary.biz.SalarySendInfoBiz;
+import com.engine.salary.cache.SalaryCacheKey;
+import com.engine.salary.entity.datacollection.DataCollectionEmployee;
+import com.engine.salary.entity.progress.ProgressDTO;
+import com.engine.salary.entity.salaryBill.bo.SalaryBillBO;
+import com.engine.salary.entity.salaryBill.bo.SalaryTemplateBO;
+import com.engine.salary.entity.salaryBill.dto.SalaryBillSendDTO;
+import com.engine.salary.entity.salaryBill.dto.SalarySendInfoListDTO;
+import com.engine.salary.entity.salaryBill.dto.SalaryTemplateSalaryItemSetListDTO;
+import com.engine.salary.entity.salaryBill.param.SalarySendGrantParam;
+import com.engine.salary.entity.salaryBill.param.SalarySendInfoQueryParam;
+import com.engine.salary.entity.salaryBill.po.SalarySendInfoPO;
+import com.engine.salary.entity.salaryBill.po.SalarySendPO;
+import com.engine.salary.entity.salaryBill.po.SalaryTemplatePO;
+import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO;
+import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
+import com.engine.salary.entity.salarysob.po.SalarySobPO;
+import com.engine.salary.entity.taxagent.po.TaxAgentPO;
+import com.engine.salary.enums.salarybill.MessageChannelEnum;
+import com.engine.salary.enums.salarybill.SalarySendStatusEnum;
+import com.engine.salary.enums.salarysend.SalarySendGrantTypeEnum;
+import com.engine.salary.exception.SalaryRunTimeException;
+import com.engine.salary.mapper.salarybill.SalarySendInfoMapper;
+import com.engine.salary.mapper.salarybill.SalarySendMapper;
+import com.engine.salary.service.*;
+import com.engine.salary.util.JsonUtil;
+import com.engine.salary.util.SalaryEntityUtil;
+import com.engine.salary.util.SalaryI18nUtil;
+import com.google.common.collect.Lists;
+import com.weaver.util.threadPool.ThreadPoolUtil;
+import com.weaver.util.threadPool.constant.ModulePoolEnum;
+import com.weaver.util.threadPool.entity.LocalRunnable;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+import weaver.hrm.User;
+
+import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+/**
+ * 工资单发放
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Slf4j
+public class SalaryBillServiceImpl extends Service implements SalaryBillService {
+
+
+ private SalarySendMapper getSalarySendMapper() {
+ return SqlProxyHandle.getProxy(SalarySendMapper.class);
+ }
+
+ private SalarySendInfoMapper getSalarySendInfoMapper() {
+ return SqlProxyHandle.getProxy(SalarySendInfoMapper.class);
+ }
+
+
+ private SalaryTemplateService getSalaryTemplateService(User user) {
+ return ServiceUtil.getService(SalaryTemplateServiceImpl.class, user);
+ }
+
+ private SalarySendService getSalarySendService(User user) {
+ return ServiceUtil.getService(SalarySendServiceImpl.class, user);
+ }
+
+ private SalarySobService getSalarySobService(User user) {
+ return ServiceUtil.getService(SalarySobServiceImpl.class, user);
+ }
+
+ private SalaryAcctResultService getSalaryAcctResultService(User user) {
+ return ServiceUtil.getService(SalaryAcctResultServiceImpl.class, user);
+ }
+
+ private SalaryAcctEmployeeService getSalaryAcctEmployeeService(User user) {
+ return ServiceUtil.getService(SalaryAcctEmployeeServiceImpl.class, user);
+ }
+
+ private TaxAgentService getTaxAgentService(User user) {
+ return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
+ }
+
+ private SalarySendRangeService getSalarySendRangeService(User user) {
+ return ServiceUtil.getService(SalarySendRangeServiceImpl.class, user);
+ }
+
+ private SalaryAcctRecordService getSalaryAcctRecordService(User user) {
+ return ServiceUtil.getService(SalaryAcctRecordServiceImpl.class, user);
+ }
+
+ private SalaryEmployeeService getSalaryEmployeeService(User user) {
+ return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user);
+ }
+
+ private SalarySendInfoBiz salarySendInfoMapper = new SalarySendInfoBiz();
+ private SalarySendBiz mapper = new SalarySendBiz();
+
+ private SalaryEmployeeService salaryEmployeeService;
+
+ private SalarySobItemService salarySobItemService;
+
+
+ private ProgressService getProgressService(User user) {
+ return ServiceUtil.getService(ProgressServiceImpl.class, user);
+ }
+
+ /**
+ * 工资单发放 start
+ **********************************************************************/
+ @Override
+ public Map grant(SalarySendGrantParam param) {
+ // 1.检查和获取工资单发放
+ SalarySendPO salarySend = checkAndGetSalarySend(param.getSalarySendId());
+// // 已经冻结不能操作
+// if (salarySend.getSendStatus().equals(NumberUtils.INTEGER_ONE)) {
+// return;
+// }
+ // 获取默认模板
+ SalarySobPO salarySob = getSalarySobService(user).getById(salarySend.getSalarySobId());
+ List salaryTemplates = salarySob == null ? Lists.newArrayList() : getSalaryTemplateService(user).getDefaultTemplates(Arrays.asList(salarySend.getSalarySobId(), salarySob.getId()));
+ if (CollectionUtils.isEmpty(salaryTemplates)) {
+ throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100518, "没有默认模板，无法发送"));
+ }
+ SalaryTemplatePO salaryTemplate = salaryTemplates.get(0);
+
+ // 发送通道
+ Set sendChannels = SalaryBillBO.buildSendChannels(salaryTemplate);
+ if (CollectionUtils.isEmpty(sendChannels)) {
+ throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(149767, "工资单模板至少开启一个发送通道"));
+ }
+ boolean isReplenish = NumberUtils.INTEGER_ONE.equals(salarySend.getSalaryAcctType());
+ if (isReplenish && StringUtils.isEmpty(salaryTemplate.getReplenishName())) {
+ throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(204428, "请完善补发工资单模板设置"));
+ }
+ // 2.检查是否正在发送中
+ ProgressDTO salaryBillProgress = getProgressService(user).getProgress(SalaryCacheKey.SALARY_GRANT_PROGRESS + "_" + param.getSalarySendId());
+ if (Objects.nonNull(salaryBillProgress) && salaryBillProgress.isStatus()
+ && Optional.ofNullable(salaryBillProgress.getProgress()).orElse(BigDecimal.ZERO).compareTo(BigDecimal.ONE) < 0) {
+ throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(136104, "有其他人员正在发送中，请等待其他人员发送结束后再操作"));
+ }
+ // 初始化进度
+ ProgressDTO initProgress = ProgressDTO.builder()
+ .title(SalaryI18nUtil.getI18nLabel(136097, "发送中"))
+ .totalQuantity(NumberUtils.INTEGER_ZERO)
+ .calculatedQuantity(NumberUtils.INTEGER_ZERO)
+ .progress(BigDecimal.ZERO)
+ .status(true)
+ .message("")
+ .build();
+ getProgressService(user).initProgress(SalaryCacheKey.SALARY_GRANT_PROGRESS + "_" + salarySend.getId(), initProgress);
+
+ List ids = param.getIds();
+
+ if (param.getSalarySendRangeIds() != null) {
+ //如果传了范围id，则使用范围id发放
+ ids = getSalarySendRangeService(user)
+ .getSendInfoIdsBySendId(salarySend.getId(), param.getSalarySendRangeIds(), SalarySendGrantTypeEnum.GRANT);
+ if (ids.isEmpty()) {// 由于查出来是空的，会导致全部发放，在此进行拦截
+ throw new SalaryRunTimeException("工资发放范围内没有匹配员工");
+ }
+ }
+ // 异步执行
+ List finalIds = ids;
+ LocalRunnable localRunnable = new LocalRunnable() {
+ @Override
+ public void execute() {
+ handleGrant(salarySend, finalIds, salarySob, salaryTemplate);
+ }
+ };
+ ThreadPoolUtil.fixedPoolExecute(ModulePoolEnum.OTHER, "salaryBillGrant", localRunnable);
+
+ return new HashMap<>();
+ }
+
+
+ /**
+ * 处理发送
+ * 注意：
+ * 1.IM和云桥通道是发送完成后，只需要在预览时获取核算数据，所以发送时可以忽略获取核算数据；
+ * 2.邮件通道需要在发送时获取，拼凑成html代码，有图片会转化为base64编码变慢，且图片越大越慢
+ *
+ * @param salarySend
+ * @param ids
+ * @param salarySob
+ * @param salaryTemplate
+ */
+ private void handleGrant(SalarySendPO salarySend, List ids, SalarySobPO salarySob, SalaryTemplatePO salaryTemplate) {
+ try {
+
+ TaxAgentPO taxAgentPO = getTaxAgentService(user).getById(salarySob.getTaxAgentId());
+
+ // 1.构建发送参数
+ SalaryBillSendDTO salaryBillSendParam = buildSendParams(salarySend, taxAgentPO.getName(), salaryTemplate);
+
+ // 2.获取可发送的列表，此步最耗时，需要解密核算数据
+ List> enableSendList = getEnableSendList(salarySend, ids, salaryBillSendParam);
+
+ // 3.发送消息：先修改数据再发消息，避免出错后无法撤回
+ List successIds = sendMessage(enableSendList, salaryBillSendParam);
+
+ // 4.发放
+ grantSendInfo(successIds, salarySend, salaryTemplate);
+
+ // 5.更新数量
+ updateSendNum(salarySend, salarySob);
+
+ int total = enableSendList.size();
+ int successCount = successIds.size();
+ String messsage = SalaryI18nUtil.getI18nLabel(139208, "发送完成") + ": "
+ + SalaryI18nUtil.getI18nLabel(134807, "成功条数") + "[" + (successCount) + "], "
+ + SalaryI18nUtil.getI18nLabel(134808, "失败条数") + "[" + (total - successCount) + "]";
+ // 发送进度完成
+ getProgressService(user).finish(SalaryCacheKey.SALARY_GRANT_PROGRESS + "_" + salarySend.getId(), true, messsage);
+// log.info("工资单发送组装耗时：{}毫秒；工资单发送消息中心耗时：{}毫秒；工资单数据更改总耗时：{}毫秒；工资单发送总耗时：{}毫秒；工资单云桥图片地址：{}", l3 - l2, l4 - l3, l5 - l4, System.currentTimeMillis() - l,
+// salaryBillSendParam == null ? "" : salaryBillSendParam.getPicUrl());
+ } catch (Exception e) {
+ log.info("发送出错：{}", e.getMessage(), e);
+ // 发送进度失败
+ getProgressService(user).fail(SalaryCacheKey.SALARY_GRANT_PROGRESS + "_" + salarySend.getId(), SalaryI18nUtil.getI18nLabel(136118, "工资单发送出错") + ": " + e.getMessage());
+ } finally {
+ }
+ }
+
+ /**
+ * 构建发送参数
+ *
+ * @param salarySend
+ * @param taxAgentName
+ * @param salaryTemplate
+ * @return
+ */
+ private SalaryBillSendDTO buildSendParams(SalarySendPO salarySend, String taxAgentName, SalaryTemplatePO salaryTemplate) {
+ // 发送通道
+ Set sendChannels = SalaryBillBO.buildSendChannels(salaryTemplate);
+ if (CollectionUtils.isEmpty(sendChannels)) {
+ return null;
+ }
+ Date salaryMonth = salarySend.getSalaryMonth();
+
+ boolean isReplenish = NumberUtils.INTEGER_ONE.equals(salarySend.getSalaryAcctType());
+// SalaryTemplateBO.copyShowSet(isReplenish, salaryTemplate);
+
+ // 消息标题
+// String title = SalaryBillBO.getBillTitle(salaryTemplate.getTheme(), salaryMonth, 0L);
+
+ // 云桥企业微信消息图
+ String domain = "";
+ // todo 访问本项目中的图片需要登陆才能访问，且变成空白，所以还是得改成公网，或者后续鉴权忽略
+ // StringUtils.isEmpty(server) || StringUtils.isEmpty(staticPathPattern) ? "https://wx.weaver.com.cn/main/salary/cover.png" : (server+staticPathPattern).replace("**", "salary_bill.png");
+ String picUrl = domain + String.format("/papi/file/preview?type=imgs&fileId=%s&random=123456", salaryTemplate.getBackground()); // "https://wx.weaver.com.cn/main/salary/cover.png";
+ String backgroundBase64 = "";
+// if (StringUtils.isNotBlank(salaryTemplate.getBackground()) && isEnableEmail) {
+ // 2.base64码的方式，这种方式可以不管图片地址是否是内外网，缺点是内容太长
+// FileData fileByte = fileDownloadClient.getFileByte(Long.valueOf(salaryTemplate.getBackground()));
+// backgroundBase64 = Base64Encoder.encode(fileByte.getData());
+ // 千万不要这样做，否则存入salaryTemplate字段会变的很大： salaryTemplate.setBackground(backgroundBase64);
+// }
+
+ // 工资单预览实体名
+ String entityName = SalaryI18nUtil.getI18nLabel(94626, "工资单");
+
+ // 获取人员信息项目分类
+ List salaryItemSetList = JSONArray.parseArray(isReplenish ? salaryTemplate.getReplenishSalaryItemSetting() : salaryTemplate.getSalaryItemSetting(), SalaryTemplateSalaryItemSetListDTO.class);
+ // 国际化处理
+// salaryItemSetList = SalaryTemplateBO.handleI18n(salaryItemSetList);
+ SalaryTemplateSalaryItemSetListDTO employeeInformation = SalaryTemplateBO.getEmployeeInformation(salaryItemSetList);
+
+ Map employeeField = SalaryBillBO.buildEmployeeFieldName();
+
+ String remarkI18n = SalaryI18nUtil.getI18nLabel(140036, "发放说明");
+ if (StringUtils.isNotEmpty(salaryTemplate.getTextContent())) {
+ String yearI18n = SalaryI18nUtil.getI18nLabel(100325, "年");
+ String monthI18n = SalaryI18nUtil.getI18nLabel(100326, "月");
+ salaryTemplate
+ .setTextContent(salaryTemplate.getTextContent().replace("${salaryMonth}", salaryMonth.getYear() + yearI18n + salaryMonth.getMonth() + monthI18n));
+ }
+
+ return SalaryBillSendDTO.builder()
+ .salaryDate(salaryMonth)
+ // 消息标题
+// .title(title)
+ // 消息内容：目前跟title一样
+// .text(title)
+ // 工资单预览实体名
+ .entityName(entityName)
+ // 发送通道
+ .sendChannels(sendChannels)
+ // 发送者
+ .sendUser(user)
+ // 工资单模板
+ .salaryTemplate(salaryTemplate)
+ // 工资单背景图base64编码
+ .backgroundBase64(backgroundBase64)
+ // 云桥工资单消息图
+ .picUrl(picUrl)
+ // 扣缴义务人名称
+ .taxAgentName(taxAgentName)
+ // 工资单模板-薪资项目设置
+ .salaryItemSetList(salaryItemSetList)
+ // 工资单模板-员工基本信息
+ .employeeInformation(employeeInformation)
+ // 工资单模板-对应人员字段
+ .employeeField(employeeField)
+ // 工资单模板-发放说明标签国际化
+ .remarkI18n(remarkI18n)
+ // 邮件是否可以发送邮件
+// .isEnableEmail(isEnableEmail)
+ // 工资单发放
+ .salarySend(salarySend)
+ // 收入所得项目类型
+// .incomeCategorys(incomeCategorys)
+ //薪资项目收入所得类型
+// .salaryItemIncomeCategoryMap(salaryItemIncomeCategoryMap)
+ .build();
+ }
+
+ /**
+ * 获取可发送数据
+ *
+ * @param salarySend
+ * @param ids
+ * @return
+ */
+ private List> getEnableSendList(SalarySendPO salarySend, List ids, SalaryBillSendDTO salaryBillSendParam) {
+ SalarySendInfoQueryParam queryParam = new SalarySendInfoQueryParam();
+ queryParam.setSalarySendId(salarySend.getId());
+ // 空就是所有
+ queryParam.setIds(ids);
+ queryParam.setSendStatuss(Arrays.asList(SalarySendStatusEnum.UNSEND.getValue(), SalarySendStatusEnum.WITHDRAW.getValue()));
+ // 2.获取基本数据
+ List list = Lists.newArrayList();
+ if (CollectionUtils.isEmpty(ids)) {
+ list = getSalarySendInfoMapper().list(queryParam);
+ } else {
+ List> partition = Lists.partition(ids, 500);
+ for (List idsPart : partition) {
+ queryParam.setIds(idsPart);
+ list.addAll(getSalarySendInfoMapper().list(queryParam));
+ }
+ }
+
+// // 是否是合并计税
+// boolean isMerge = this.getSalarySendService(user).isMergeBySalarySend(salarySend);
+ List salaryAcctEmployeeList = this.getSalaryAcctEmployeeService(user).listBySalaryAcctRecordId(salarySend.getSalaryAccountingId());
+ List acctEmployeeIds = salaryAcctEmployeeList.stream().map(SalaryAcctEmployeePO::getEmployeeId).distinct().collect(Collectors.toList());
+ list = list.stream().filter(f -> acctEmployeeIds.contains(f.getEmployeeId())).collect(Collectors.toList());
+
+ List employeeIds = list.stream().map(SalarySendInfoListDTO::getEmployeeId).collect(Collectors.toList());
+
+ // 初始化进度
+ ProgressDTO initProgress = ProgressDTO.builder()
+ .title("发送中")
+ .totalQuantity(employeeIds.size() * 2 + 1)
+ .status(true)
+ .calculatedQuantity(NumberUtils.INTEGER_ZERO)
+ .progress(BigDecimal.ZERO)
+ .message("")
+ .build();
+ getProgressService(user).initProgress(SalaryCacheKey.SALARY_GRANT_PROGRESS + "_" + salarySend.getId(), initProgress);
+ // 3.组装详情数据
+ // 获取薪资项目数据
+ List salaryAcctEmployees = Lists.newArrayList();
+ List salaryAcctResultValues = Lists.newArrayList();
+
+ //是否需要发送邮件
+ Boolean isEnableEmail = salaryBillSendParam.getSendChannels().contains(MessageChannelEnum.EMAIL);
+ if (CollectionUtils.isNotEmpty(ids)) {
+ int partSize = 100;// 分片大小,越小进度条跑得越短平快，但是总体速度更慢
+ List> partition = Lists.partition(employeeIds, partSize);
+ for (List part : partition) {
+ // 更新进度
+ getProgressService(user).getAndAddCalculatedQty(SalaryCacheKey.SALARY_GRANT_PROGRESS + "_" + salarySend.getId(), part.size());
+ /** 注意只有邮件才需要加密的核算数据 */
+ if (isEnableEmail) {
+ List acctEmployees = getSalaryAcctEmployeeService(user).listBySalaryAcctRecordIdsAndEmployeeIds(Collections.singletonList(salarySend.getSalaryAccountingId()), part);
+ salaryAcctEmployees.addAll(acctEmployees);
+ salaryAcctResultValues.addAll(getSalaryAcctResultService(user).listBySalaryAcctEmployeeIds(SalaryEntityUtil.properties(acctEmployees, SalaryAcctEmployeePO::getId, Collectors.toList())));
+ }
+ }
+ } else {
+ /** 注意只有邮件才需要加密的核算数据 */
+ if (isEnableEmail) {
+ salaryAcctEmployees = getSalaryAcctEmployeeService(user).listBySalaryAcctRecordId(salarySend.getSalaryAccountingId());
+ salaryAcctResultValues = getSalaryAcctResultService(user).listBySalaryAcctRecordIds(Collections.singletonList(salarySend.getSalaryAccountingId()));
+ }
+ }
+ // 外部人员
+// List extEmployeeList = extEmployeeService.listAllWithDeleted(currentTenantKey);
+ return getSalarySendService(user)
+ .buildDetailList(list, salaryAcctEmployees, salaryAcctResultValues);
+ }
+
+ public List> getSendInfoList(Long sendId, List ids) {
+
+ SalarySendPO salarySend = getSalarySendMapper().getById(sendId);
+ SalarySendInfoQueryParam queryParam = new SalarySendInfoQueryParam();
+ queryParam.setSalarySendId(salarySend.getId());
+// // 空就是所有
+// queryParam.setIds(ids);
+ queryParam.setSendStatuss(Arrays.asList(SalarySendStatusEnum.UNSEND.getValue(), SalarySendStatusEnum.WITHDRAW.getValue()));
+ // 2.获取基本数据
+ List list = Lists.newArrayList();
+ if (CollectionUtils.isEmpty(ids)) {
+ list = getSalarySendInfoMapper().list(queryParam);
+ } else {
+ List> partition = Lists.partition(ids, 500);
+ for (List idsPart : partition) {
+ queryParam.setIds(idsPart);
+ list.addAll(getSalarySendInfoMapper().list(queryParam));
+ }
+ }
+ List salaryAcctEmployeeList = this.getSalaryAcctEmployeeService(user).listBySalaryAcctRecordId(salarySend.getSalaryAccountingId());
+ List acctEmployeeIds = salaryAcctEmployeeList.stream().map(SalaryAcctEmployeePO::getEmployeeId).distinct().collect(Collectors.toList());
+ list = list.stream().filter(f -> acctEmployeeIds.contains(f.getEmployeeId())).collect(Collectors.toList());
+
+ List employeeIds = list.stream().map(SalarySendInfoListDTO::getEmployeeId).collect(Collectors.toList());
+
+ // 3.组装详情数据
+ // 获取薪资项目数据
+ List salaryAcctEmployees = Lists.newArrayList();
+ List salaryAcctResultValues = Lists.newArrayList();
+
+ //是否需要发送邮件
+ if (CollectionUtils.isNotEmpty(ids)) {
+ int partSize = 100;// 分片大小,越小进度条跑得越短平快，但是总体速度更慢
+ List> partition = Lists.partition(employeeIds, partSize);
+ for (List part : partition) {
+ // 更新进度
+ List acctEmployees = getSalaryAcctEmployeeService(user).listBySalaryAcctRecordIdsAndEmployeeIds(Collections.singletonList(salarySend.getSalaryAccountingId()), part);
+ salaryAcctEmployees.addAll(acctEmployees);
+ salaryAcctResultValues.addAll(getSalaryAcctResultService(user).listBySalaryAcctEmployeeIds(SalaryEntityUtil.properties(acctEmployees, SalaryAcctEmployeePO::getId, Collectors.toList())));
+ }
+ } else {
+ salaryAcctEmployees = getSalaryAcctEmployeeService(user).listBySalaryAcctRecordId(salarySend.getSalaryAccountingId());
+ salaryAcctResultValues = getSalaryAcctResultService(user).listBySalaryAcctRecordIds(Collections.singletonList(salarySend.getSalaryAccountingId()));
+ }
+ return getSalarySendService(user)
+ .buildDetailList(list, salaryAcctEmployees, salaryAcctResultValues);
+ }
+
+ /**
+ * 发送消息
+ *
+ * @param enableSendList
+ * @param salaryBillSendParam
+ */
+ private List sendMessage(List> enableSendList, SalaryBillSendDTO salaryBillSendParam) {
+
+ if (CollectionUtils.isEmpty(enableSendList)) {
+ return Collections.emptyList();
+ }
+ if (salaryBillSendParam == null) {
+ return enableSendList.stream().map(e -> Long.valueOf(e.get("id").toString())).collect(Collectors.toList());
+ }
+
+ Set sendChannels = salaryBillSendParam.getSendChannels();
+
+ // 获取人员完整信息
+ Map allEmployeeMap = this.getEmployeeWholeInfo(enableSendList);
+
+ List sendInfoUpdateList = Lists.newArrayList();
+ AtomicInteger index = new AtomicInteger(0);
+ AtomicInteger part = new AtomicInteger(0);
+ int total = enableSendList.size();
+ enableSendList.forEach(e -> {
+
+ if (sendChannels.contains(MessageChannelEnum.MSG)) {
+ SalaryBillBO.sendMsg(salaryBillSendParam, Long.valueOf(e.get("id").toString()), Long.valueOf(e.get("employeeId").toString()));
+ }
+
+ if (sendChannels.contains(MessageChannelEnum.EMAIL)) {
+ // 构建发送消息
+ SalaryBillBO.buildEmployeeInfo(salaryBillSendParam, allEmployeeMap.get(e.get("employeeId").toString()));
+ SalaryBillBO.sendEmail(e, allEmployeeMap, salaryBillSendParam);
+ }
+
+
+ /** 发送工资单 **********************************************************/
+ sendInfoUpdateList.add(SalarySendInfoPO.builder()
+ .id(Long.valueOf(e.get("id").toString()))
+ .build());
+ // 更新发送进度
+ index.addAndGet(1);
+ part.addAndGet(1);
+ if (index.get() % 100 == 0 || index.get() >= total) {
+ getProgressService(user).getAndAddCalculatedQty(SalaryCacheKey.SALARY_GRANT_PROGRESS + "_" + salaryBillSendParam.getSalarySend().getId(), part.get());
+ part.set(0);
+ }
+ });
+ // 批量修改发送消息id
+ if (CollectionUtils.isNotEmpty(sendInfoUpdateList)) {
+ // sqlserver数据库处理，每个分片数量约=2100/插入字段数
+ List> partition = Lists.partition(sendInfoUpdateList, 500);
+// partition.forEach(updatePart -> getSalarySendInfoMapper().batchUpdateMsgId(updatePart));
+ }
+ return sendInfoUpdateList.stream().map(SalarySendInfoPO::getId).collect(Collectors.toList());
+ }
+
+ /**
+ * 获取人员完整信息
+ *
+ * @param enableSendList
+ * @return
+ */
+ private Map getEmployeeWholeInfo(List> enableSendList) {
+
+ List ids = enableSendList.stream().map(e -> Long.valueOf(e.get("employeeId").toString())).collect(Collectors.toList());
+
+ // 获取所有人员信息
+ List simpleEmployees = getSalaryEmployeeService(user).getEmployeeByIdsAll(ids);
+ return SalaryEntityUtil.convert2Map(simpleEmployees, e -> e.getEmployeeId() + "");
+ }
+// /** 工资单发放 end **********************************************************************/
+
+ /**
+ * 检查和获取工资单发放信息
+ *
+ * @param salarySendId
+ * @return
+ */
+ private SalarySendPO checkAndGetSalarySend(Long salarySendId) {
+ if (salarySendId == null) {
+ throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100327, "工资单发放Id必传"));
+ }
+
+ SalarySendPO salarySend = this.getSalarySendService(user).getById(salarySendId);
+ if (salarySend == null) {
+ throw new SalaryRunTimeException(String.format(SalaryI18nUtil.getI18nLabel(100512, "工资单发放不存在") + "[id:%s]", salarySendId));
+ }
+ return salarySend;
+ }
+
+// /**
+// * 分权处理
+// *
+// * @param salarySend
+// * @param ids
+// * @param currentEmployeeId
+// * @param currentTenantKey
+// * @return
+// */
+// private List getIdsForDevolution(SalarySendPO salarySend, List ids) {
+// // 开启分权或且是非薪酬模块总管理员且发送全部
+// if (getTaxAgentService(user).isOpenDevolution(currentTenantKey) && !getTaxAgentService(user).isChief(currentEmployeeId) && CollectionUtils.isEmpty(ids)) {
+// List salaryAcctEmployees = getSalaryAcctEmployeeService(user)
+// .listByRecordIds(Collections.singletonList(salarySend.getSalaryAccountingId()));
+//
+// List taxAgentIdsAsAdmin = getTaxAgentService(user).listAllTaxAgentsAsAdmin(currentEmployeeId).stream().map(TaxAgentPO::getId)
+// .collect(Collectors.toList());
+// List taxAgentEmployees = getTaxAgentService(user).listTaxAgentAndEmployeeTree(currentEmployeeId).stream()
+// .filter(t -> !taxAgentIdsAsAdmin.contains(t.getTaxAgentId())).collect(Collectors.toList());
+// Map> taxAgentEmployeesMap = SalaryEntityUtil.convert2Map(taxAgentEmployees, TaxAgentManageRangeEmployeeDTO::getTaxAgentId,
+// v -> v.getEmployeeList().stream().map(TaxAgentManageRangeEmployeeDTO.TaxAgentEmployee::getEmployeeId).collect(Collectors.toList()));
+//
+// List extEmployeeList = extEmployeeService.listCanUse(currentEmployeeId);
+// // 工资单发放信息过滤
+// List salarySendInfos = new LambdaQueryChainWrapper<>(getSalarySendInfoMapper())
+// /** 注意：需要啥就加载啥，避免加载大字段salaryTemplate */
+// .select(SalarySendInfoPO::getId, SalarySendInfoPO::getEmployeeId, SalarySendInfoPO::getCreator)
+// .eq(SalarySendInfoPO::getDeleteType, 0)
+// .eq(SalarySendInfoPO::getTenantKey)
+// .eq(SalarySendInfoPO::getSalarySendId, salarySend.getId())
+// .list();
+//
+// List acctEmployeeIds = salaryAcctEmployees.stream().filter(f ->
+// // 作为管理员
+// taxAgentIdsAsAdmin.contains(f.getTaxAgentId())
+// // 作为分管理员
+// || TaxAgentBO.checkTaxAgentAndEmployee(taxAgentEmployeesMap, f.getTaxAgentId(), f.getEmployeeId())
+// // 外部人员
+// || extEmployeeList.stream().anyMatch(t -> t.getTaxAgentId().equals(f.getTaxAgentId()) && t.getId().equals(f.getEmployeeId()))
+// ).map(SalaryAcctEmployeePO::getEmployeeId).collect(Collectors.toList());
+//
+// ids = salarySendInfos.stream().filter(f -> acctEmployeeIds.contains(f.getEmployeeId()) || currentEmployeeId.equals(f.getCreator())).map(SalarySendInfoPO::getId)
+// .distinct().collect(Collectors.toList());
+// }
+// return ids;
+// }
+
+ /**
+ * 发放工资单更新信息
+ *
+ * @param ids
+ * @param salarySend
+ * @param salaryTemplate
+ */
+ private void grantSendInfo(List ids, SalarySendPO salarySend, SalaryTemplatePO salaryTemplate) {
+ List> partition = Lists.partition(ids, 500);
+ Date sendTime = new Date();
+ SalarySendInfoPO po = new SalarySendInfoPO();
+ po.setSendStatus(SalarySendStatusEnum.ALREADYSEND.getValue());
+ po.setSendTime(sendTime);
+ po.setSalaryTemplate(JsonUtil.toJsonString(salaryTemplate));
+ partition.forEach(idsp -> {
+ salarySendInfoMapper.updateGrantWithdraw(po, salarySend.getId(), Arrays.asList(SalarySendStatusEnum.UNSEND.getValue(), SalarySendStatusEnum.WITHDRAW.getValue()), idsp);
+ });
+ }
+
+// /**
+// * 撤回工资单更新信息
+// *
+// * @param ids
+// * @param salarySend
+// * @param currentTenantKey
+// */
+// private void withdrawSendInfo(List ids, SalarySendPO salarySend) {
+// List> partition = Lists.partition(ids, DbCrudConstant.DEF_PART_SIZE);
+// partition.forEach(part -> new LambdaUpdateChainWrapper<>(getSalarySendInfoMapper())
+// .eq(SalarySendInfoPO::getDeleteType, 0)
+// .eq(SalarySendInfoPO::getTenantKey)
+// .eq(SalarySendInfoPO::getSalarySendId, salarySend.getId())
+// .eq(SalarySendInfoPO::getSendStatus, SalarySendStatusEnum.ALREADYSEND.getValue())
+// .in(SalarySendInfoPO::getId, part)
+// .set(SalarySendInfoPO::getSendStatus, SalarySendStatusEnum.WITHDRAW.getValue())
+// .update());
+// }
+//
+
+ /**
+ * 更新发送数量
+ *
+ * @param salarySend
+ * @param salarySob
+ */
+ private void updateSendNum(SalarySendPO salarySend, SalarySobPO salarySob) {
+ List list = salarySendInfoMapper.listSome(SalarySendInfoPO.builder().salarySendId(salarySend.getId()).build());
+ List sendList = list.stream().filter(e -> e.getSendStatus().equals(SalarySendStatusEnum.ALREADYSEND.getValue())).collect(Collectors.toList());
+ int sendNum = sendList.size();
+ int sendTotal = list.size();
+ SalarySendPO salarySendNew = new SalarySendPO();
+ try {
+ BeanUtils.copyProperties(salarySendNew, salarySend);
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ }
+ salarySendNew.setSendNum(sendNum);
+ salarySendNew.setSendTotal(sendTotal);
+ salarySendNew.setLastSendTime(new Date());
+
+ mapper.updateById(salarySendNew);
+ }
+
+// /**
+// * 工资单撤回 start
+// **********************************************************************/
+// @Override
+// @Transactional(rollbackFor = Exception.class)
+// public void withdraw(SalarySendWithdrawParam param, boolean isRange, List rangeIds) {
+// // 1.检查和获取工资单发放
+// SalarySendPO salarySend = checkAngGetSalarySend(param.getSalarySendId());
+//// // 已经冻结不能操作
+//// if (salarySend.getSendStatus().equals(NumberUtils.INTEGER_ONE)) {
+//// return;
+//// }
+//
+// // 检查是否正在撤回中
+// SalaryBillProgressDTO salaryBillProgress = getProgressService(user)
+// .getProgress(SalaryCacheKey.SALARY_WITHDRAW_PROGRESS, "" + salarySend.getId());
+// if (Objects.nonNull(salaryBillProgress) && salaryBillProgress.isStatus()
+// && Optional.ofNullable(salaryBillProgress.getProgress()).orElse(BigDecimal.ZERO).compareTo(BigDecimal.ONE) < 0) {
+// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(136105, "有其他人员正在撤回中，请等待其他人员撤回结束后再操作"));
+// }
+//
+// // 初始化进度
+// SalaryBillProgressDTO initProgress = getProgressService(user)
+// .buildInitProgress("撤回中", 136106, NumberUtils.INTEGER_ONE, NumberUtils.INTEGER_ZERO, BigDecimal.ZERO);
+// getProgressService(user).initProgress(SalaryCacheKey.SALARY_WITHDRAW_PROGRESS, "" + salarySend.getId(), initProgress);
+//
+// List ids = isRange ? getSalarySendRangeService(user).getSendInfoIdsBySalarySendIdAndOperateType(salarySend.getId(), rangeIds, SalarySendOperateTypeEnum.WITHDRAW) : param.getIds();
+// // 异步执行撤回
+// LocalRunnable localRunnable = new LocalRunnable() {
+// @Override
+// public void execute() {
+// handleWithdraw(salarySend, ids);
+// }
+// };
+// ThreadPoolUtil.fixedPoolExecute(ModulePoolEnum.OTHER, "salaryBillWithdraw", localRunnable);
+// }
+//
+// /**
+// * 处理撤回
+// *
+// * @param salarySend
+// * @param ids
+// * @param currentEmployeeId
+// * @param currentTenantKey
+// */
+// private void handleWithdraw(SalarySendPO salarySend, List ids) {
+// try {
+// DSTenantKeyThreadVar.tenantKey.set(currentTenantKey);
+//
+// // 开启分权或且是非薪酬模块总管理员且发送全部,谁能进来就是能看全部
+// // ids = getIdsForDevolution(salarySend, ids);
+//
+// // 获取可撤回的工资单
+// List enableWithdrawList = Lists.newArrayList();
+// if (CollectionUtils.isEmpty(ids)) {
+// List salaryAcctEmployees = this.getSalarySendService(user).getSalaryAcctEmployees(salarySend.getSalaryAccountingId(), null);
+// List acctEmployeeIds = salaryAcctEmployees.stream().map(SalaryAcctEmployeePO::getEmployeeId).distinct().collect(Collectors.toList());
+// List> partition = Lists.partition(acctEmployeeIds, DbCrudConstant.DEF_PART_SIZE);
+// for (List part : partition) {
+// enableWithdrawList.addAll(new LambdaQueryChainWrapper<>(getSalarySendInfoMapper())
+// /** 注意：需要啥就加载啥，避免加载大字段salaryTemplate */
+// .select(SalarySendInfoPO::getId, SalarySendInfoPO::getSendMsgId)
+// .eq(SalarySendInfoPO::getDeleteType, 0)
+// .eq(SalarySendInfoPO::getTenantKey)
+// .eq(SalarySendInfoPO::getSalarySendId, salarySend.getId())
+// .eq(SalarySendInfoPO::getSendStatus, SalarySendStatusEnum.ALREADYSEND.getValue())
+// .in(SalarySendInfoPO::getEmployeeId, part)
+// .list());
+// }
+// } else {
+// List> partition = Lists.partition(ids, DbCrudConstant.DEF_PART_SIZE);
+// for (List part : partition) {
+// enableWithdrawList.addAll(new LambdaQueryChainWrapper<>(getSalarySendInfoMapper())
+// /** 注意：需要啥就加载啥，避免加载大字段salaryTemplate */
+// .select(SalarySendInfoPO::getId, SalarySendInfoPO::getSendMsgId)
+// .eq(SalarySendInfoPO::getDeleteType, 0)
+// .eq(SalarySendInfoPO::getTenantKey)
+// .eq(SalarySendInfoPO::getSalarySendId, salarySend.getId())
+// .eq(SalarySendInfoPO::getSendStatus, SalarySendStatusEnum.ALREADYSEND.getValue())
+// .in(SalarySendInfoPO::getId, part)
+// .list());
+// }
+// }
+//
+// // 初始化进度
+// SalaryBillProgressDTO initProgress = getProgressService(user)
+// .buildInitProgress("撤回中", 136106, enableWithdrawList.size() * 2 + 1, enableWithdrawList.size(), new BigDecimal("0.5"));
+// getProgressService(user).initProgress(SalaryCacheKey.SALARY_WITHDRAW_PROGRESS, "" + salarySend.getId(), initProgress);
+//
+// // 1.撤回消息：先修改数据再发消息，避免出错后无法撤回
+// String text = SalaryI18nUtil.getI18nLabel(184533, "此工资单已被撤回，如有问题，请联系管理员");
+// String title = SalaryI18nUtil.getI18nLabel(94626, "工资单");
+// List sendInfoUpdateIds = Lists.newArrayList();
+//
+// AtomicInteger index = new AtomicInteger(0);
+// AtomicInteger part = new AtomicInteger(0);
+// int total = enableWithdrawList.size();
+// enableWithdrawList.forEach(e -> {
+// if (!e.getSendMsgId().equals(0L)) {
+// CancleMessageEntity cme = SalaryBillBO.buildCancleMessageEntity(e.getSendMsgId(), text, title);
+// /** 撤回工资单 **********************************************************/
+// WeaResult
![](data:image/jpg;base64,");
+// emailContent.append(salaryBillSendParam.getBackgroundBase64());
+// emailContent.append(")