Commit dc6e5dfe authored by fangxinjiang's avatar fangxinjiang

Merge branch 'develop'

# Conflicts:
#	k8s-bash/yifu-auth-deployment.yaml
#	k8s-bash/yifu-job-deployment.yaml
#	k8s-bash/yifu-order-deployment.yaml
#	k8s-bash/yifu-upms-deployment.yaml
#	yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
parents dac1f6be c6bc6479
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
*/ */
package com.yifu.cloud.plus.v1.yifu.archives.entity; package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
...@@ -480,4 +481,11 @@ public class TSettleDomain extends BaseEntity { ...@@ -480,4 +481,11 @@ public class TSettleDomain extends BaseEntity {
@Schema(description = "单位大病比例", name = "unitSeriousIllnessProp") @Schema(description = "单位大病比例", name = "unitSeriousIllnessProp")
private BigDecimal unitSeriousIllnessProp; private BigDecimal unitSeriousIllnessProp;
/**
* EKP的 是否BPO: 是 否
*/
@Schema(description = "是否BPO", name = "bpoFlag")
@ExcelIgnore
private String bpoFlag;
} }
package com.yifu.cloud.plus.v1.yifu.archives.vo; package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
...@@ -99,4 +100,11 @@ public class ProjectSetInfoVo implements Serializable { ...@@ -99,4 +100,11 @@ public class ProjectSetInfoVo implements Serializable {
*/ */
@Schema(description="封面抬头-商险") @Schema(description="封面抬头-商险")
private String invoiceTitleInsurance; private String invoiceTitleInsurance;
/**
* EKP的 是否BPO: 是 否
*/
@Schema(description = "是否BPO", name = "bpoFlag")
@ExcelIgnore
private String bpoFlag;
} }
...@@ -108,7 +108,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -108,7 +108,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
//身份证系统中是否已有 //身份证系统中是否已有
TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectOne(Wrappers.<TEmployeeInfo>query().lambda() TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectOne(Wrappers.<TEmployeeInfo>query().lambda()
.eq(TEmployeeInfo::getEmpIdcard, tEmployeeProject.getEmpIdcard()) .eq(TEmployeeInfo::getEmpIdcard, tEmployeeProject.getEmpIdcard())
...@@ -157,12 +156,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -157,12 +156,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
} else { } else {
if (Common.isEmpty(tEmployeeInfo)) { if (Common.isEmpty(tEmployeeInfo)) {
return R.failed("该人员暂无档案信息,禁止关联项目,如要添加,请先至“在档人员”处建档"); return R.failed("该人员暂无档案信息,禁止关联项目,如要添加,请先至“在档人员”处建档");
} //身份证实名认证
//身份证实名认证 } else if (!tEmployeeProject.getEmpName().equals(tEmployeeInfo.getEmpName())) {
if (!Common.isEmpty(tEmployeeInfo)) { return R.failed("姓名和身份证不一致,请确认后再次新增");
if (!tEmployeeProject.getEmpName().equals(tEmployeeInfo.getEmpName())) {
return R.failed("姓名和身份证不一致,请确认后再次新增");
}
} }
//判断是否已经减档 //判断是否已经减档
if (tEmployeeInfo.getFileStatus() == CommonConstants.dingleDigitIntArray[1]) { if (tEmployeeInfo.getFileStatus() == CommonConstants.dingleDigitIntArray[1]) {
...@@ -234,7 +230,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -234,7 +230,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
!CommonConstants.ZERO_STRING.equals(tEmployeeInfo.getEmpNatrue())) { !CommonConstants.ZERO_STRING.equals(tEmployeeInfo.getEmpNatrue())) {
tEmployeeInfo.setEmpNatrue(CommonConstants.ONE_STRING); tEmployeeInfo.setEmpNatrue(CommonConstants.ONE_STRING);
} }
tEmployeeInfo.setProjectNum(tEmployeeInfo.getProjectNum().intValue() + CommonConstants.ONE_INT); tEmployeeInfo.setProjectNum(tEmployeeInfo.getProjectNum() + CommonConstants.ONE_INT);
tEmployeeInfoMapper.updateById(tEmployeeInfo); tEmployeeInfoMapper.updateById(tEmployeeInfo);
tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0], tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0],
tEmployeeInfoCompare.getId(), "", tEmployeeInfoCompare, tEmployeeInfo); tEmployeeInfoCompare.getId(), "", tEmployeeInfoCompare, tEmployeeInfo);
...@@ -574,9 +570,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -574,9 +570,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
List<EmployeeProjectNewOldVO> updateProjectList = new ArrayList<>(); List<EmployeeProjectNewOldVO> updateProjectList = new ArrayList<>();
// 执行数据插入操作 组装 PostDto // 执行数据插入操作 组装 PostDto
for (int i = 0; i < excelVOList.size(); i++) { for (EmployeeXProjectVO excel : excelVOList) {
EmployeeXProjectVO excel = excelVOList.get(i);
//根据身份证和项目编码获取项目档案 //根据身份证和项目编码获取项目档案
TEmployeeProject tEmployeeProject = this.getOne(Wrappers.<TEmployeeProject>query().lambda() TEmployeeProject tEmployeeProject = this.getOne(Wrappers.<TEmployeeProject>query().lambda()
.eq(TEmployeeProject::getEmpIdcard, excel.getEmpIdcard()) .eq(TEmployeeProject::getEmpIdcard, excel.getEmpIdcard())
...@@ -916,7 +910,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -916,7 +910,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
public R<List<ErrorMessage>> importEmpProjectUpdate(InputStream inputStream) { public R<List<ErrorMessage>> importEmpProjectUpdate(InputStream inputStream) {
List<ErrorMessage> errorMessageList = new ArrayList<>(); List<ErrorMessage> errorMessageList = new ArrayList<>();
ExcelUtil<EmployeeProjectUpdateVO> util1 = new ExcelUtil<>(EmployeeProjectUpdateVO.class); ExcelUtil<EmployeeProjectUpdateVO> util1 = new ExcelUtil<>(EmployeeProjectUpdateVO.class);
;
// 写法2: // 写法2:
// 匿名内部类 不用额外写一个DemoDataListener // 匿名内部类 不用额外写一个DemoDataListener
// 这里 需要指定读用哪个class去读,然后读取第一个sheet 文件流会自动关闭 // 这里 需要指定读用哪个class去读,然后读取第一个sheet 文件流会自动关闭
...@@ -976,8 +969,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -976,8 +969,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
* @Date 19:25 2022/6/21 * @Date 19:25 2022/6/21
**/ **/
public void importEmpProjectUpdate(List<EmployeeProjectUpdateVO> excelVOList, List<ErrorMessage> errorMessageList) { public void importEmpProjectUpdate(List<EmployeeProjectUpdateVO> excelVOList, List<ErrorMessage> errorMessageList) {
// 通用校验获取失败的数据
Map<Long, ErrorMessage> errorMsgMap = new HashMap<>();
// 项目档案更新List // 项目档案更新List
List<TEmployeeProject> updateList = new ArrayList<>(); List<TEmployeeProject> updateList = new ArrayList<>();
...@@ -988,8 +979,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -988,8 +979,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
// 新老档案List // 新老档案List
List<EmployeeNewOldVO> updateInfoList = new ArrayList<>(); List<EmployeeNewOldVO> updateInfoList = new ArrayList<>();
// 新老档案vo
EmployeeNewOldVO newOld;
// 新老项目档案vo // 新老项目档案vo
EmployeeProjectNewOldVO newOldProject; EmployeeProjectNewOldVO newOldProject;
// 新老项目档案List // 新老项目档案List
...@@ -997,10 +986,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -997,10 +986,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
// 执行数据插入操作 组装 // 执行数据插入操作 组装
for (int i = 0; i < excelVOList.size(); i++) { for (int i = 0; i < excelVOList.size(); i++) {
// 已有验证报错直接下一个
if (Common.isNotNull(errorMsgMap.get(i + 2))) {
continue;
}
EmployeeProjectUpdateVO excel = excelVOList.get(i); EmployeeProjectUpdateVO excel = excelVOList.get(i);
String checkCount = excel.getEmpIdcard().concat(excel.getDeptNo()); String checkCount = excel.getEmpIdcard().concat(excel.getDeptNo());
...@@ -1069,14 +1054,13 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1069,14 +1054,13 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
doJointTask.doUpdateEmployeeInfo(updEmpInfoList, user); doJointTask.doUpdateEmployeeInfo(updEmpInfoList, user);
} }
// 记录变更日志 // 记录变更日志
if (updateInfoList.size() > CommonConstants.dingleDigitIntArray[0]) { if (updateProjectList.size() > CommonConstants.dingleDigitIntArray[0]) {
for (EmployeeNewOldVO newOldInfo : updateInfoList) { for (EmployeeProjectNewOldVO newOldProjectLog : updateProjectList) {
tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0] tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1]
, newOldInfo.getOldEmployee().getId(), "" , newOldProjectLog.getNewProjectEmployee().getId(), ""
, newOldInfo.getOldEmployee(), newOldInfo.getNewEmployee()); , newOldProjectLog.getOldProjectEmployee(), newOldProjectLog.getNewProjectEmployee());
} }
} }
} catch (Exception e) { } catch (Exception e) {
log.error("数据更新异常", e); log.error("数据更新异常", e);
} }
...@@ -1125,13 +1109,13 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1125,13 +1109,13 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
@Override @Override
@Transactional @Transactional
public R<List<ErrorMessage>> batchRemoveByIds(String ids) { public R<List<ErrorMessage>> batchRemoveByIds(String ids) {
List<ErrorMessage> errorList = new ArrayList<ErrorMessage>(); List<ErrorMessage> errorList = new ArrayList<>();
List<TEmployeeProject> updList = new ArrayList<>(); List<TEmployeeProject> updList = new ArrayList<>();
List<TEmployeeInfo> infoUpdList = new ArrayList<>(); List<TEmployeeInfo> infoUpdList = new ArrayList<>();
List<String> idsList = null; List<String> idsList;
if (!Common.isEmpty(ids)) { if (!Common.isEmpty(ids)) {
idsList = Common.initStrToList(ids, CommonConstants.COMMA_STRING); idsList = Common.initStrToList(ids, CommonConstants.COMMA_STRING);
} else { } else {
...@@ -1197,13 +1181,13 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1197,13 +1181,13 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
String fileName = "项目档案批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX; String fileName = "项目档案批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
// 根据用户传入确定要导出的字段 // 根据用户传入确定要导出的字段
Set<String> includeColumnFiledNames = new HashSet<String>(); Set<String> includeColumnFiledNames = new HashSet<>();
for (String exportField : exportFields) { for (String exportField : exportFields) {
includeColumnFiledNames.add(exportField); includeColumnFiledNames.add(exportField);
} }
//获取要导出的列表 //获取要导出的列表
List<EmployeeProjectExportVO> list = new ArrayList<>(); List<EmployeeProjectExportVO> list;
//获取记录 //获取记录
list = gettEmpProInfoExportVos(idstr, projectDTO); list = gettEmpProInfoExportVos(idstr, projectDTO);
...@@ -1268,7 +1252,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1268,7 +1252,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
tEmployeeProject.setBusinessPrimaryType(tSettleDomain.getBusinessPrimaryType()); tEmployeeProject.setBusinessPrimaryType(tSettleDomain.getBusinessPrimaryType());
tEmployeeProject.setBusinessSecondType(tSettleDomain.getBusinessSecondType()); tEmployeeProject.setBusinessSecondType(tSettleDomain.getBusinessSecondType());
tEmployeeProject.setBusinessThirdType(tSettleDomain.getBusinessThirdType()); tEmployeeProject.setBusinessThirdType(tSettleDomain.getBusinessThirdType());
TCustomerInfo tCustomerInfo = tCustomerInfoMapper.selectById(tSettleDomain.getCustomerId());
tEmployeeProject.setUnitId(tSettleDomain.getCustomerId()); tEmployeeProject.setUnitId(tSettleDomain.getCustomerId());
tEmployeeProject.setUnitNo(tSettleDomain.getCustomerNo()); tEmployeeProject.setUnitNo(tSettleDomain.getCustomerNo());
tEmployeeProject.setUnitName(tSettleDomain.getCustomerName()); tEmployeeProject.setUnitName(tSettleDomain.getCustomerName());
......
...@@ -119,13 +119,15 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T ...@@ -119,13 +119,15 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
@Override @Override
public R updateProjectInfo(List<TSettleDomain> list) { public R updateProjectInfo(List<TSettleDomain> list) {
if (Common.isNotNull(list)) { if (Common.isNotNull(list)) {
R<AreaVo> areaListR;
TSettleDomain tSettleDomainInfo;
AreaVo areaList;
for (TSettleDomain tSettleDomain:list) { for (TSettleDomain tSettleDomain:list) {
areaListR = upmsDaprUtils.getAreaListR();
R<AreaVo> areaListR = upmsDaprUtils.getAreaListR();
if (null == areaListR || areaListR.getCode() != CommonConstants.SUCCESS) { if (null == areaListR || areaListR.getCode() != CommonConstants.SUCCESS) {
return R.failed("获取区域数据失败!"); return R.failed("获取区域数据失败!");
} }
AreaVo areaList = areaListR.getData(); areaList = areaListR.getData();
if (null != areaList && !areaList.getSysAreaList().isEmpty()) { if (null != areaList && !areaList.getSysAreaList().isEmpty()) {
for (SysArea area : areaList.getSysAreaList()) { for (SysArea area : areaList.getSysAreaList()) {
if (Common.isNotNull(tSettleDomain.getEProvince()) && area.getAreaName().equals(tSettleDomain.getEProvince())) { if (Common.isNotNull(tSettleDomain.getEProvince()) && area.getAreaName().equals(tSettleDomain.getEProvince())) {
...@@ -139,7 +141,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T ...@@ -139,7 +141,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
} }
} }
} }
TSettleDomain tSettleDomainInfo = baseMapper.selectById(tSettleDomain.getId()); tSettleDomainInfo = baseMapper.selectById(tSettleDomain.getId());
if (Common.isNotNull(tSettleDomainInfo)) { if (Common.isNotNull(tSettleDomainInfo)) {
baseMapper.updateById(tSettleDomain); baseMapper.updateById(tSettleDomain);
} else { } else {
......
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
<result property="manageServerItem" column="MANAGE_SERVER_ITEM"/> <result property="manageServerItem" column="MANAGE_SERVER_ITEM"/>
<result property="riskServerItem" column="RISK_SERVER_ITEM"/> <result property="riskServerItem" column="RISK_SERVER_ITEM"/>
<result property="unitSeriousIllnessProp" column="UNIT_SERIOUS_ILLNESS_PROP"/> <result property="unitSeriousIllnessProp" column="UNIT_SERIOUS_ILLNESS_PROP"/>
<result property="bpoFlag" column="BPO_FLAG"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
...@@ -161,7 +162,8 @@ ...@@ -161,7 +162,8 @@
a.RISK_FUND_TYPE, a.RISK_FUND_TYPE,
a.MANAGE_SERVER_ITEM, a.MANAGE_SERVER_ITEM,
a.RISK_SERVER_ITEM, a.RISK_SERVER_ITEM,
a.UNIT_SERIOUS_ILLNESS_PROP a.UNIT_SERIOUS_ILLNESS_PROP,
a.BPO_FLAG
</sql> </sql>
<resultMap id="tSettleDomainSelectVoMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo"> <resultMap id="tSettleDomainSelectVoMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo">
...@@ -191,24 +193,19 @@ ...@@ -191,24 +193,19 @@
<result property="commitUser" column="COMMIT_USER"/> <result property="commitUser" column="COMMIT_USER"/>
<result property="commitUserName" column="COMMIT_USER_NAME"/> <result property="commitUserName" column="COMMIT_USER_NAME"/>
<result property="stopFlag" column="STOP_FLAG"/> <result property="stopFlag" column="STOP_FLAG"/>
<result property="bpoFlag" column="BPO_FLAG"/>
</resultMap> </resultMap>
<select id="selectSettleDomainSelectVosById" <select id="selectSettleDomainSelectVosById"
resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo"> resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo">
SELECT SELECT
<include refid="Base_Column_List"/>, <include refid="Base_Column_List"/>,
c.customerId, a.CUSTOMER_ID AS 'customerId',
c.CUSTOMER_NAME as 'customerName', a.CUSTOMER_NAME as 'customerName',
c.CUSTOMER_CODE as 'customerCode', a.CUSTOMER_NO as 'customerCode',
c.INDUSTRY_BELONG as 'industryBelong' a.INVOICE_TITLE_SALARY as 'businessSubjectName'
FROM FROM
t_settle_domain a t_settle_domain a
LEFT JOIN (
select ID AS 'customerId',
CUSTOMER_NAME,
INDUSTRY_BELONG,
CUSTOMER_CODE from t_customer_info
) c ON a.CUSTOMER_ID = c.customerId
WHERE a.DEPART_NO=#{departNo} GROUP BY a.DEPART_NO WHERE a.DEPART_NO=#{departNo} GROUP BY a.DEPART_NO
</select> </select>
...@@ -216,32 +213,23 @@ ...@@ -216,32 +213,23 @@
resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo"> resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo">
SELECT SELECT
<include refid="Base_Column_List"/>, <include refid="Base_Column_List"/>,
c.customerId, a.CUSTOMER_ID AS 'customerId',
c.CUSTOMER_NAME as 'customerName', a.CUSTOMER_NAME as 'customerName',
c.CUSTOMER_CODE as 'customerCode', a.CUSTOMER_NO as 'customerCode',
c.INDUSTRY_BELONG as 'industryBelong',
a.INVOICE_TITLE_SALARY as 'businessSubjectName' a.INVOICE_TITLE_SALARY as 'businessSubjectName'
FROM FROM
t_settle_domain a t_settle_domain a
LEFT JOIN (
select ID AS 'customerId',
CUSTOMER_NAME,
INDUSTRY_BELONG,
CUSTOMER_CODE from t_customer_info
) c ON a.CUSTOMER_ID = c.customerId
WHERE a.id=#{id} GROUP BY a.id WHERE a.id=#{id} GROUP BY a.id
</select> </select>
<select id="selectAllSettleDomainSelectVos" resultMap="tSettleDomainSelectVoMap"> <select id="selectAllSettleDomainSelectVos" resultMap="tSettleDomainSelectVoMap">
SELECT SELECT
<include refid="Base_Column_List"/>, <include refid="Base_Column_List"/>,
c.ID AS 'customerId', a.CUSTOMER_ID AS 'customerId',
c.CUSTOMER_NAME as 'customerName', a.CUSTOMER_NAME as 'customerName',
c.CUSTOMER_CODE as 'customerCode', a.CUSTOMER_NO as 'customerCode'
c.customer_type as 'customerTypeName'
FROM FROM
t_settle_domain a t_settle_domain a
LEFT JOIN t_customer_info c ON a.CUSTOMER_ID = c.ID
where a.DELETE_FLAG = '0' where a.DELETE_FLAG = '0'
</select> </select>
<select id="getSetInfoByCodes" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo"> <select id="getSetInfoByCodes" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo">
...@@ -257,7 +245,8 @@ ...@@ -257,7 +245,8 @@
a.BUSINESS_THIRD_TYPE, a.BUSINESS_THIRD_TYPE,
a.STOP_FLAG, a.STOP_FLAG,
a.INVOICE_TITLE_SALARY, a.INVOICE_TITLE_SALARY,
a.INVOICE_TITLE_INSURANCE a.INVOICE_TITLE_INSURANCE,
a.BPO_FLAG
FROM t_settle_domain a FROM t_settle_domain a
where 1=1 where 1=1
<if test="codes != null and codes.size() > 0"> <if test="codes != null and codes.size() > 0">
......
...@@ -140,5 +140,9 @@ public class EkpPushFundParam implements Serializable { ...@@ -140,5 +140,9 @@ public class EkpPushFundParam implements Serializable {
* 公积金id * 公积金id
**/ **/
private String fd_3b0afbaf10df2c; private String fd_3b0afbaf10df2c;
/**
* 是否为BPO业务
**/
private String fd_3b178ea361cabe;
} }
\ No newline at end of file
...@@ -244,5 +244,9 @@ public class EkpPushSocialParam implements Serializable { ...@@ -244,5 +244,9 @@ public class EkpPushSocialParam implements Serializable {
* 社保id * 社保id
**/ **/
private String fd_3b0afbe1f94a08; private String fd_3b0afbe1f94a08;
/**
* 是否为BPO业务
**/
private String fd_3b178dfcf9e3e6;
} }
\ No newline at end of file
...@@ -253,4 +253,17 @@ public class EkpSalaryParam implements Serializable { ...@@ -253,4 +253,17 @@ public class EkpSalaryParam implements Serializable {
* 税务主体 * 税务主体
**/ **/
private String fd_3afab1895feea2; private String fd_3afab1895feea2;
/**
* 代扣个人社保
**/
private String fd_3b16ce48a9735c;
/**
* 代扣个人公积金
**/
private String fd_3b16ce4b7fc42a;
/**
* 是否为BPO业务
**/
private String fd_3b178f0ded2114;
} }
package com.yifu.cloud.plus.v1.yifu.ekp.vo;
import lombok.Data;
/**
* @Author fxj
* @Date 2022/8/22
* @Description 薪资明细对应参数
* @Version 1.0
*/
@Data
public class EkpSalaryParamVo extends EkpSalaryParam {
/**
* 社保扣缴月份
**/
private String deduSocialMonth;
/**
* 公积金扣缴月份
**/
private String deduProvidentMonth;
/**
* 代扣单位社保
**/
private String unitSocial;
/**
* 代扣单位公积金
**/
private String unitFund;
/**
* 代扣社保总额
**/
private String socialSum;
/**
* 代扣公积金总额
**/
private String fundSum;
}
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package com.yifu.cloud.plus.v1.yifu.salary.entity; package com.yifu.cloud.plus.v1.yifu.salary.entity;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
...@@ -343,4 +344,12 @@ public class TSalaryStandard extends BaseEntity { ...@@ -343,4 +344,12 @@ public class TSalaryStandard extends BaseEntity {
@Schema(description = "订单ID" ) @Schema(description = "订单ID" )
@ExcelProperty("订单ID" ) @ExcelProperty("订单ID" )
private String orderId; private String orderId;
/**
* EKP的 是否BPO: 是 否
*/
@Schema(description = "是否BPO")
@ExcelIgnore
private String bpoFlag;
} }
...@@ -103,9 +103,8 @@ public class TStatisticsCurrentReportMarketController { ...@@ -103,9 +103,8 @@ public class TStatisticsCurrentReportMarketController {
if (num == 0) { if (num == 0) {
return R.failed("当前条件查询无数据,未删除"); return R.failed("当前条件查询无数据,未删除");
} else { } else {
return R.ok("已删除" + num + "条数据"); return R.ok(null,"已删除" + num + "条数据");
} }
} }
/** /**
......
...@@ -20,7 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.salary.mapper; ...@@ -20,7 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.salary.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam; import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo;
import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial; import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount; import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
import com.yifu.cloud.plus.v1.yifu.salary.vo.AccountCheckVo; import com.yifu.cloud.plus.v1.yifu.salary.vo.AccountCheckVo;
...@@ -98,7 +98,7 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> { ...@@ -98,7 +98,7 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
* @Date: 2022/8/29 16:52 * @Date: 2022/8/29 16:52
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam> * @return: java.util.List<com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam>
**/ **/
List<EkpSalaryParam> getEkpSalaryParamList(@Param("salaryId") String salaryId); List<EkpSalaryParamVo> getEkpSalaryParamList(@Param("salaryId") String salaryId);
List<TSalaryAccount> noPageDiy(@Param("searchVo") TSalaryAccountSearchVo searchVo, List<TSalaryAccount> noPageDiy(@Param("searchVo") TSalaryAccountSearchVo searchVo,
@Param("idList") List<String> idList); @Param("idList") List<String> idList);
......
...@@ -20,7 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.salary.service; ...@@ -20,7 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.salary.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam; import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo;
import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial; import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount; import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryAccountSearchVo; import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryAccountSearchVo;
...@@ -104,5 +104,5 @@ public interface TSalaryAccountService extends IService<TSalaryAccount> { ...@@ -104,5 +104,5 @@ public interface TSalaryAccountService extends IService<TSalaryAccount> {
* @Date: 2022/8/29 16:54 * @Date: 2022/8/29 16:54
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam> * @return: java.util.List<com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam>
**/ **/
List<EkpSalaryParam> getEkpSalaryParamList(String salaryId); List<EkpSalaryParamVo> getEkpSalaryParamList(String salaryId);
} }
...@@ -272,6 +272,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -272,6 +272,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
s.setSettlementMonth(sav.getSettlementMonth()); s.setSettlementMonth(sav.getSettlementMonth());
//s.setSettlementAmount() //s.setSettlementAmount()
s.setStatus(SalaryConstants.AUDIT_STATUS[0]); s.setStatus(SalaryConstants.AUDIT_STATUS[0]);
s.setBpoFlag(dept.getBpoFlag());
} }
return new R<>(s); return new R<>(s);
} }
......
...@@ -26,7 +26,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; ...@@ -26,7 +26,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil; import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil; import com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam; import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo;
import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial; import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount; import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
import com.yifu.cloud.plus.v1.yifu.salary.mapper.TSalaryAccountMapper; import com.yifu.cloud.plus.v1.yifu.salary.mapper.TSalaryAccountMapper;
...@@ -212,7 +212,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper, ...@@ -212,7 +212,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
} }
@Override @Override
public List<EkpSalaryParam> getEkpSalaryParamList(String salaryId) { public List<EkpSalaryParamVo> getEkpSalaryParamList(String salaryId) {
return baseMapper.getEkpSalaryParamList(salaryId); return baseMapper.getEkpSalaryParamList(salaryId);
} }
......
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
</resultMap> </resultMap>
<!-- 对接EKP的参数 --> <!-- 对接EKP的参数 -->
<resultMap id="ekpSalaryParamVoMap" type="com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam"> <resultMap id="ekpSalaryParamVoMap" type="com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo">
<result property="fd_3b10af838eab5c" column="fd_3b10af838eab5c"/> <result property="fd_3b10af838eab5c" column="fd_3b10af838eab5c"/>
<result property="fd_3adfedf98ccba2" column="fd_3adfedf98ccba2"/> <result property="fd_3adfedf98ccba2" column="fd_3adfedf98ccba2"/>
<result property="fd_3adfedf9d2bf1c" column="fd_3adfedf9d2bf1c"/> <result property="fd_3adfedf9d2bf1c" column="fd_3adfedf9d2bf1c"/>
...@@ -144,6 +144,15 @@ ...@@ -144,6 +144,15 @@
<result property="fd_3aeadf1992544c" column="fd_3aeadf1992544c"/> <result property="fd_3aeadf1992544c" column="fd_3aeadf1992544c"/>
<result property="fd_3af9d49d165e90" column="fd_3af9d49d165e90"/> <result property="fd_3af9d49d165e90" column="fd_3af9d49d165e90"/>
<result property="fd_3afab1895feea2" column="fd_3afab1895feea2"/> <result property="fd_3afab1895feea2" column="fd_3afab1895feea2"/>
<result property="fd_3b16ce48a9735c" column="fd_3b16ce48a9735c"/>
<result property="fd_3b16ce4b7fc42a" column="fd_3b16ce4b7fc42a"/>
<result property="deduSocialMonth" column="DEDU_SOCIAL_MONTH"/>
<result property="deduProvidentMonth" column="DEDU_PROVIDENT_MONTH"/>
<result property="unitSocial" column="unit_social"/>
<result property="unitFund" column="unit_fund"/>
<result property="socialSum" column="social_sum"/>
<result property="fundSum" column="fund_sum"/>
<result property="fd_3b178f0ded2114" column="fd_3b178f0ded2114"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -504,6 +513,15 @@ ...@@ -504,6 +513,15 @@
,'' fd_3aeadf1992544c ,'' fd_3aeadf1992544c
,if(a.SALARY_GIVE_TIME='1','是','否') fd_3af9d49d165e90 ,if(a.SALARY_GIVE_TIME='1','是','否') fd_3af9d49d165e90
,ifnull(a.INVOICE_TITLE,'') fd_3afab1895feea2 ,ifnull(a.INVOICE_TITLE,'') fd_3afab1895feea2
,ifnull(withholidingPersonSocial.SALARY_MONEY,'') fd_3b16ce48a9735c
,ifnull(withholidingPersonFund.SALARY_MONEY,'') fd_3b16ce4b7fc42a
,ifnull(withholidingUnitSocial.SALARY_MONEY,'') unit_social
,ifnull(withholidingUnitFund.SALARY_MONEY,'') unit_fund
,ifnull(withholidingUnitSocial.SALARY_MONEY,'0')+ifnull(withholidingPersonSocial.SALARY_MONEY,'0') social_sum
,ifnull(withholidingUnitFund.SALARY_MONEY,'0')+ifnull(withholidingPersonFund.SALARY_MONEY,'0') fund_sum
,concat(left(ifnull(a.DEDU_SOCIAL_MONTH,'1970'),4),'-',right(ifnull(a.DEDU_SOCIAL_MONTH,'02'),2)) DEDU_SOCIAL_MONTH
,concat(left(ifnull(a.DEDU_PROVIDENT_MONTH,'1970'),4),'-',right(ifnull(a.DEDU_PROVIDENT_MONTH,'02'),2)) DEDU_PROVIDENT_MONTH
,ifnull(s.BPO_FLAG,'') fd_3b178f0ded2114
from t_salary_account a from t_salary_account a
LEFT JOIN t_salary_standard s on a.SALARY_FORM_ID=s.ID LEFT JOIN t_salary_standard s on a.SALARY_FORM_ID=s.ID
left join t_salary_account_item withholidingPersonSocial on withholidingPersonSocial.SALARY_ACCOUNT_ID = a.id and withholidingPersonSocial.JAVA_FIED_NAME='withholidingPersonSocial' left join t_salary_account_item withholidingPersonSocial on withholidingPersonSocial.SALARY_ACCOUNT_ID = a.id and withholidingPersonSocial.JAVA_FIED_NAME='withholidingPersonSocial'
......
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
<result property="isRepeat" column="IS_REPEAT"/> <result property="isRepeat" column="IS_REPEAT"/>
<result property="repeatRemark" column="REPEAT_REMARK"/> <result property="repeatRemark" column="REPEAT_REMARK"/>
<result property="orderId" column="ORDER_ID"/> <result property="orderId" column="ORDER_ID"/>
<result property="bpoFlag" column="BPO_FLAG"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -124,7 +125,8 @@ ...@@ -124,7 +125,8 @@
a.IS_REPEAT, a.IS_REPEAT,
a.REPEAT_REMARK, a.REPEAT_REMARK,
a.INVOICE_TITLE, a.INVOICE_TITLE,
a.ORDER_ID a.ORDER_ID,
a.BPO_FLAG
</sql> </sql>
<sql id="tSalaryStandard_where"> <sql id="tSalaryStandard_where">
<if test="tSalaryStandard != null"> <if test="tSalaryStandard != null">
......
...@@ -48,7 +48,7 @@ public class TSendEkpError { ...@@ -48,7 +48,7 @@ public class TSendEkpError {
private String title; private String title;
@ExcelAttribute(name = "类型") @ExcelAttribute(name = "类型")
@ExcelProperty("类型(1薪资明细2预估明细3缴费明细4实时收入5定时收入)") @ExcelProperty("类型(0:薪资代扣推送的社保公积金1薪资明细2预估明细3缴费明细4实时收入5定时收入)")
private String type; private String type;
@ExcelAttribute(name = "创建日") @ExcelAttribute(name = "创建日")
......
...@@ -2328,11 +2328,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2328,11 +2328,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
List<String> pushList = new ArrayList<>(); List<String> pushList = new ArrayList<>();
Map<String,Integer> map = new HashMap<>(); Map<String,Integer> map = new HashMap<>();
Map<String,String> idMap = new HashMap<>(); Map<String,String> idMap = new HashMap<>();
R<TSettleDomainListVo> listVo;
List<TSettleDomainSelectVo> settleDomainR;
for (TForecastLibrary library : unPushInfo) { for (TForecastLibrary library : unPushInfo) {
//获取项目信息 //获取项目信息
TSettleDomain settleDomain = new TSettleDomain(); TSettleDomain settleDomain = new TSettleDomain();
List<TSettleDomainSelectVo> settleDomainR = null;
R<TSettleDomainListVo> listVo = null;
listVo = archivesDaprUtil.selectSettleDomainSelectVoById(library.getSettleDomainId()); listVo = archivesDaprUtil.selectSettleDomainSelectVoById(library.getSettleDomainId());
if (Common.isNotNull(listVo)) { if (Common.isNotNull(listVo)) {
TSettleDomainListVo tSettleDomainListVo = listVo.getData(); TSettleDomainListVo tSettleDomainListVo = listVo.getData();
...@@ -2469,6 +2469,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2469,6 +2469,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
} else { } else {
socialParam.setFd_3adfe8c81a0e42(CommonConstants.EMPTY_STRING); socialParam.setFd_3adfe8c81a0e42(CommonConstants.EMPTY_STRING);
} }
//是否为BPO业务
if (Common.isNotNull(settleDomain.getBpoFlag())) {
socialParam.setFd_3b178dfcf9e3e6(settleDomain.getBpoFlag());
} else {
socialParam.setFd_3b178dfcf9e3e6(CommonConstants.EMPTY_STRING);
}
//社保户 //社保户
if (Common.isNotNull(library.getSocialHouseholdName())) { if (Common.isNotNull(library.getSocialHouseholdName())) {
socialParam.setFd_3aeafa25916e82(library.getSocialHouseholdName()); socialParam.setFd_3aeafa25916e82(library.getSocialHouseholdName());
...@@ -2606,11 +2612,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2606,11 +2612,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
List<String> pushList = new ArrayList<>(); List<String> pushList = new ArrayList<>();
Map<String,Integer> map = new HashMap<>(); Map<String,Integer> map = new HashMap<>();
Map<String,String> idMap = new HashMap<>(); Map<String,String> idMap = new HashMap<>();
R<TSettleDomainListVo> listVo;
List<TSettleDomainSelectVo> settleDomainR;
for (TForecastLibrary library : unPushInfo) { for (TForecastLibrary library : unPushInfo) {
//获取项目信息 //获取项目信息
TSettleDomain settleDomain = new TSettleDomain(); TSettleDomain settleDomain = new TSettleDomain();
List<TSettleDomainSelectVo> settleDomainR = null;
R<TSettleDomainListVo> listVo = null;
listVo = archivesDaprUtil.selectSettleDomainSelectVoById(library.getSettleDomainId()); listVo = archivesDaprUtil.selectSettleDomainSelectVoById(library.getSettleDomainId());
if (Common.isNotNull(listVo)) { if (Common.isNotNull(listVo)) {
TSettleDomainListVo tSettleDomainListVo = listVo.getData(); TSettleDomainListVo tSettleDomainListVo = listVo.getData();
...@@ -2691,6 +2697,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2691,6 +2697,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
} else { } else {
fundParam.setFd_3adfe8c81a0e42(CommonConstants.EMPTY_STRING); fundParam.setFd_3adfe8c81a0e42(CommonConstants.EMPTY_STRING);
} }
//是否为BPO业务
if (Common.isNotNull(settleDomain.getBpoFlag())) {
fundParam.setFd_3b178ea361cabe(settleDomain.getBpoFlag());
} else {
fundParam.setFd_3b178ea361cabe(CommonConstants.EMPTY_STRING);
}
//公积金账户 //公积金账户
if (Common.isNotNull(library.getProvidentHouseholdName())) { if (Common.isNotNull(library.getProvidentHouseholdName())) {
fundParam.setFd_3aeafa8cc144bc(library.getProvidentHouseholdName()); fundParam.setFd_3aeafa8cc144bc(library.getProvidentHouseholdName());
...@@ -2781,8 +2793,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2781,8 +2793,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
public void createIncomeInfo(TForecastLibrary library) { public void createIncomeInfo(TForecastLibrary library) {
//获取项目信息 //获取项目信息
TSettleDomain settleDomain = new TSettleDomain(); TSettleDomain settleDomain = new TSettleDomain();
List<TSettleDomainSelectVo> settleDomainR = null; List<TSettleDomainSelectVo> settleDomainR;
R<TSettleDomainListVo> listVo = null; R<TSettleDomainListVo> listVo;
listVo = archivesDaprUtil.selectSettleDomainSelectVoById(library.getSettleDomainId()); listVo = archivesDaprUtil.selectSettleDomainSelectVoById(library.getSettleDomainId());
if (Common.isNotNull(listVo)) { if (Common.isNotNull(listVo)) {
TSettleDomainListVo tSettleDomainListVo = listVo.getData(); TSettleDomainListVo tSettleDomainListVo = listVo.getData();
......
...@@ -2324,12 +2324,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2324,12 +2324,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
List<String> pushList = new ArrayList<>(); List<String> pushList = new ArrayList<>();
Map<String,Integer> map = new HashMap<>(); Map<String,Integer> map = new HashMap<>();
Map<String,String> idMap = new HashMap<>(); Map<String,String> idMap = new HashMap<>();
List<TSettleDomainSelectVo> settleDomainR;
R<TSettleDomainListVo> listVo;
for (TPaymentInfo library:unPushInfo) { for (TPaymentInfo library:unPushInfo) {
//获取项目信息 //获取项目信息
TSettleDomain settleDomain = new TSettleDomain(); TSettleDomain settleDomain = new TSettleDomain();
List<TSettleDomainSelectVo> settleDomainR;
R<TSettleDomainListVo> listVo;
listVo = archivesDaprUtil.selectSettleDomainSelectVoById(library.getSettleDomainId()); listVo = archivesDaprUtil.selectSettleDomainSelectVoById(library.getSettleDomainId());
if (Common.isNotNull(listVo)) { if (Common.isNotNull(listVo)) {
TSettleDomainListVo tSettleDomainListVo = listVo.getData(); TSettleDomainListVo tSettleDomainListVo = listVo.getData();
...@@ -2414,6 +2414,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2414,6 +2414,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
} else { } else {
socialParam.setFd_3adfe8c73cb5a4(CommonConstants.EMPTY_STRING); socialParam.setFd_3adfe8c73cb5a4(CommonConstants.EMPTY_STRING);
} }
//是否为BPO业务
if (Common.isNotNull(settleDomain.getBpoFlag())) {
socialParam.setFd_3b178dfcf9e3e6(settleDomain.getBpoFlag());
} else {
socialParam.setFd_3b178dfcf9e3e6(CommonConstants.EMPTY_STRING);
}
//客户名称 //客户名称
if (Common.isNotNull(library.getUnitName())) { if (Common.isNotNull(library.getUnitName())) {
socialParam.setFd_3adfe8c81a0e42(library.getUnitName()); socialParam.setFd_3adfe8c81a0e42(library.getUnitName());
...@@ -2605,11 +2611,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2605,11 +2611,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
List<String> pushList = new ArrayList<>(); List<String> pushList = new ArrayList<>();
Map<String,Integer> map = new HashMap<>(); Map<String,Integer> map = new HashMap<>();
Map<String,String> idMap = new HashMap<>(); Map<String,String> idMap = new HashMap<>();
List<TSettleDomainSelectVo> settleDomainR;
R<TSettleDomainListVo> listVo;
for (TPaymentInfo library:unPushInfo) { for (TPaymentInfo library:unPushInfo) {
//获取项目信息 //获取项目信息
TSettleDomain settleDomain = new TSettleDomain(); TSettleDomain settleDomain = new TSettleDomain();
List<TSettleDomainSelectVo> settleDomainR;
R<TSettleDomainListVo> listVo;
listVo = archivesDaprUtil.selectSettleDomainSelectVoById(library.getSettleDomainId()); listVo = archivesDaprUtil.selectSettleDomainSelectVoById(library.getSettleDomainId());
if (Common.isNotNull(listVo)) { if (Common.isNotNull(listVo)) {
TSettleDomainListVo tSettleDomainListVo = listVo.getData(); TSettleDomainListVo tSettleDomainListVo = listVo.getData();
...@@ -2674,6 +2680,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2674,6 +2680,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
} else { } else {
fundParam.setFd_3adfe8c73cb5a4(CommonConstants.EMPTY_STRING); fundParam.setFd_3adfe8c73cb5a4(CommonConstants.EMPTY_STRING);
} }
//是否为BPO业务
if (Common.isNotNull(settleDomain.getBpoFlag())) {
fundParam.setFd_3b178ea361cabe(settleDomain.getBpoFlag());
} else {
fundParam.setFd_3b178ea361cabe(CommonConstants.EMPTY_STRING);
}
//单位代缴 //单位代缴
if (Common.isNotNull(library.getUnitProvidentSum())) { if (Common.isNotNull(library.getUnitProvidentSum())) {
fundParam.setFd_3adfeb52fbe966(library.getUnitProvidentSum().toString()); fundParam.setFd_3adfeb52fbe966(library.getUnitProvidentSum().toString());
......
...@@ -692,7 +692,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -692,7 +692,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
// 5.封装地市派单限制日 // 5.封装地市派单限制日
initDayLimit(dayConfMap, info); initDayLimit(dayConfMap, info);
// 6.保存 有异常也保存 要标识 // 6.保存 有异常也保存 要标识
info.setUserDeptName(selectVo.getDepartName()); info.setUserDeptName(user.getDeptName());
info.setPreStatus(CommonConstants.ZERO_STRING); info.setPreStatus(CommonConstants.ZERO_STRING);
// 为验重添加到MAP // 为验重添加到MAP
existsMap.put(info.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + info.getPayAddress(), info); existsMap.put(info.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + info.getPayAddress(), info);
...@@ -763,11 +763,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -763,11 +763,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
// 4.封装地市派单限制日 // 4.封装地市派单限制日
initDayLimit(dayConfMap, info); initDayLimit(dayConfMap, info);
// 5.保存 有异常也保存 要做标识 // 5.保存 有异常也保存 要做标识
R<TSettleDomainSelectVo> domainR = archivesDaprUtil.getSettleDomainSelectVoById(user.getDeptId().toString()); info.setUserDeptName(user.getDeptName());
if (Common.isNotNull(domainR) && Common.isNotNull(domainR.getData())) {
TSettleDomainSelectVo selectVo = domainR.getData();
info.setUserDeptName(selectVo.getDepartName());
}
info.setPreStatus(CommonConstants.ZERO_STRING); info.setPreStatus(CommonConstants.ZERO_STRING);
// 如果已经存在未派单的派增 这个时候派减 直接标记异常 客服自行判断是否派单 // 如果已经存在未派单的派增 这个时候派减 直接标记异常 客服自行判断是否派单
if (null != preAddMap.get(info.getEmpIdcard())) { if (null != preAddMap.get(info.getEmpIdcard())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment