Skip to content

Y
yifu-mvp
Commit 30ddabd6 authored by hongguangwu's avatar hongguangwu
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents b420e7e3 f55cfbe9
Hide whitespace changes
Inline Side-by-side
Showing with 221 additions and 41 deletions
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/UpdateEmpVo.java
View file @ 30ddabd6
...@@ -18,6 +18,8 @@ public class UpdateEmpVo implements Serializable { ...@@ -18,6 +18,8 @@ public class UpdateEmpVo implements Serializable {
String projectNo; String projectNo;
// 合同ID // 合同ID
String contractId; String contractId;
// 备注
String remarkTemp;
// type 0 审核通过 2.审核不通过 // type 0 审核通过 2.审核不通过
String type; String type;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @ 30ddabd6
...@@ -1846,7 +1846,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -1846,7 +1846,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} }
} }
// 判断空值 // 判断空值
this.judgeNull(errorMsg, saveEmp); //this.judgeNull(errorMsg, saveEmp);
// 更新时，不需要更新其余信息 // 更新时，不需要更新其余信息
newOld = new EmployeeNewOldVO(); newOld = new EmployeeNewOldVO();
...@@ -2206,7 +2206,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2206,7 +2206,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
c.setInUse(CommonConstants.ZERO_STRING); c.setInUse(CommonConstants.ZERO_STRING);
c.setAuditTimeLast(LocalDateTime.now()); c.setAuditTimeLast(LocalDateTime.now());
contractAudit.setAuditStatus("审核通过"); contractAudit.setAuditStatus("审核通过");
contractAudit.setRemark("派单审核通过,同步审核通过合同"); contractAudit.setRemark(vo.getRemarkTemp());
contractAudit.setRootName("合同审核"); contractAudit.setRootName("合同审核");
contractServicer.updateInUseStatusById(c.getEmpId(),c.getDeptNo(),c.getId()); contractServicer.updateInUseStatusById(c.getEmpId(),c.getDeptNo(),c.getId());
//审核不同 //审核不同
...@@ -2214,7 +2214,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2214,7 +2214,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
c.setAuditStatus(CommonConstants.THREE_INT); c.setAuditStatus(CommonConstants.THREE_INT);
c.setInUse(CommonConstants.ONE_STRING); c.setInUse(CommonConstants.ONE_STRING);
contractAudit.setAuditStatus("审核不通过"); contractAudit.setAuditStatus("审核不通过");
contractAudit.setRemark("派单审核不通过,同步审核不通过合同"); contractAudit.setRemark(vo.getRemarkTemp());
contractAudit.setRootName("合同审核"); contractAudit.setRootName("合同审核");
} }
contractAuditMapper.insert(contractAudit); contractAuditMapper.insert(contractAudit);
...@@ -2246,6 +2246,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2246,6 +2246,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
TEmployeeContractInfo contract; TEmployeeContractInfo contract;
EmpAddDispatchVo emp; EmpAddDispatchVo emp;
EmpProjectDispatchVo project; EmpProjectDispatchVo project;
TEmployeeContractAudit audit;
for (Map.Entry<String, EmpContractDispatchVo> entry : contractsMap.entrySet()) { for (Map.Entry<String, EmpContractDispatchVo> entry : contractsMap.entrySet()) {
contractAdd = entry.getValue(); contractAdd = entry.getValue();
try { try {
...@@ -2274,6 +2275,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2274,6 +2275,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
contract.setDispatchFlag(CommonConstants.ONE_STRING); contract.setDispatchFlag(CommonConstants.ONE_STRING);
contract.setType(CommonConstants.ZERO_STRING); contract.setType(CommonConstants.ZERO_STRING);
contractServicer.save(contract); contractServicer.save(contract);
audit = new TEmployeeContractAudit();
addContractAudit(contract, audit);
contractAdd.setId(contract.getId()); contractAdd.setId(contract.getId());
contractAdd.setEmpNo(contract.getEmpNo()); contractAdd.setEmpNo(contract.getEmpNo());
contractsMap.put(contractAdd.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + contractAdd.getDeptNo(), contractAdd); contractsMap.put(contractAdd.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + contractAdd.getDeptNo(), contractAdd);
...@@ -2286,6 +2289,17 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2286,6 +2289,17 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} }
private void addContractAudit(TEmployeeContractInfo contract, TEmployeeContractAudit audit) {
audit.setCreateBy(contract.getCreateBy());
audit.setCreateName(contract.getCreateName());
audit.setCreateTime(LocalDateTime.now());
audit.setUpdateBy(contract.getUpdateBy());
audit.setUpdateTime(LocalDateTime.now());
audit.setLinkId(contract.getId());
audit.setLinkType(CommonConstants.ONE_INT);
audit.setRootName("提交申请");
}
private void saveEmp(Map<String, EmpAddDispatchVo> empAddsMap) { private void saveEmp(Map<String, EmpAddDispatchVo> empAddsMap) {
if (Common.isNotNull(empAddsMap)) { if (Common.isNotNull(empAddsMap)) {
EmpAddDispatchVo empAdd; EmpAddDispatchVo empAdd;
......
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @ 30ddabd6
...@@ -205,7 +205,7 @@ public class ArchivesDaprUtil { ...@@ -205,7 +205,7 @@ public class ArchivesDaprUtil {
* @Param type 0 审核通过 1 审核不通过 * @Param type 0 审核通过 1 审核不通过
* @return * @return
**/ **/
public R<Boolean> updateEmpInfo(String empIdCard, String projectNo, String contractId,String type){ public R<Boolean> updateEmpInfo(String empIdCard, String projectNo, String contractId,String type,String remarkTemp){
if (Common.isEmpty(empIdCard) if (Common.isEmpty(empIdCard)
|| Common.isEmpty(projectNo) || Common.isEmpty(projectNo)
|| Common.isEmpty(type)){ || Common.isEmpty(type)){
...@@ -215,6 +215,7 @@ public class ArchivesDaprUtil { ...@@ -215,6 +215,7 @@ public class ArchivesDaprUtil {
vo.setEmpIdCard(empIdCard); vo.setEmpIdCard(empIdCard);
vo.setProjectNo(projectNo); vo.setProjectNo(projectNo);
vo.setContractId(contractId); vo.setContractId(contractId);
vo.setRemarkTemp(remarkTemp);
vo.setType(type); vo.setType(type);
R<Boolean> res = HttpDaprUtil.invokeMethodPost( R<Boolean> res = HttpDaprUtil.invokeMethodPost(
daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId() daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId()
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @ 30ddabd6
...@@ -920,6 +920,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -920,6 +920,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
param.setMId(mId); param.setMId(mId);
} }
param.setCreateBy(user.getId()); param.setCreateBy(user.getId());
//设置updateBy字段是给导出使用的
param.setUpdateBy(user.getId());
menuUtil.setAuthSql(user, param); menuUtil.setAuthSql(user, param);
if (Common.isNotNull(param.getAuthSql()) && param.getAuthSql().contains("1=2 CONCAT")) { if (Common.isNotNull(param.getAuthSql()) && param.getAuthSql().contains("1=2 CONCAT")) {
param.setAuthSql(param.getAuthSql().replace("1=2 CONCAT", "CONCAT")); param.setAuthSql(param.getAuthSql().replace("1=2 CONCAT", "CONCAT"));
...@@ -927,7 +929,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -927,7 +929,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List<InsuranceExportListVO> insuranceExportList; List<InsuranceExportListVO> insuranceExportList;
//如果是待投保状态，sql中HANDLED_BY过滤条件不需要，这里强制变为null //如果是待投保状态，sql中HANDLED_BY过滤条件不需要，这里强制变为null
if(param.getBuyHandleStatus() == CommonConstants.ONE_INT){ if(param.getBuyHandleStatus() == CommonConstants.ONE_INT){
param.setCreateBy(null); param.setUpdateBy(null);
} }
//如勾选项不为空，则导出勾选记录；否则导出当前筛选条件下 && 「待投保」的结果集 //如勾选项不为空，则导出勾选记录；否则导出当前筛选条件下 && 「待投保」的结果集
if (CollectionUtils.isNotEmpty(param.getIdList())){ if (CollectionUtils.isNotEmpty(param.getIdList())){
......
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @ 30ddabd6
...@@ -407,8 +407,8 @@ ...@@ -407,8 +407,8 @@
<if test="param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''"> <if test="param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''">
and a.CREATE_TIME <![CDATA[ >= ]]> concat(#{param.startDate}, ' 00:00:00') and a.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59') and a.CREATE_TIME <![CDATA[ >= ]]> concat(#{param.startDate}, ' 00:00:00') and a.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
</if> </if>
<if test="param.createBy != null and param.createBy.trim() != ''"> <if test="param.updateBy != null and param.updateBy.trim() != ''">
and a.HANDLED_BY = #{param.createBy} and a.HANDLED_BY = #{param.updateBy}
</if> </if>
<if test="param.authSql != null and param.authSql.trim() != ''"> <if test="param.authSql != null and param.authSql.trim() != ''">
${param.authSql} ${param.authSql}
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
View file @ 30ddabd6
...@@ -185,12 +185,12 @@ public class TPaymentInfo extends BaseEntity { ...@@ -185,12 +185,12 @@ public class TPaymentInfo extends BaseEntity {
private String socialCreateMonth; private String socialCreateMonth;
/** /**
* 锁定状态 0 未锁定 1 锁定 * 确认无误状态 0 未确认 1 已确认
*/ */
@ExcelAttribute(name = "锁定状态 0 未锁定 1 锁定" ) @ExcelAttribute(name = "确认无误状态 0 未确认 1 已确认" )
@Schema(description ="锁定状态 0 未锁定 1 锁定") @Schema(description ="确认无误状态 0 未确认 1 已确认")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("锁定状态 0 未锁定 1 锁定") @ExcelProperty("确认无误状态 0 未确认 1 已确认")
private String lockStatus; private String lockStatus;
/** /**
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoExportVo.java
View file @ 30ddabd6
...@@ -76,12 +76,6 @@ public class TDispatchInfoExportVo { ...@@ -76,12 +76,6 @@ public class TDispatchInfoExportVo {
@ExcelProperty("项目名称") @ExcelProperty("项目名称")
private String settleDomainName; private String settleDomainName;
@ExcelAttribute(name = "项目编码", maxLength = 50)
@Schema(description = "项目编码")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("项目编码")
private String settleDomainCode;
@ExcelAttribute(name = "员工类型", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE) @ExcelAttribute(name = "员工类型", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE)
@Schema(description = "员工类型") @Schema(description = "员工类型")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
...@@ -102,6 +96,7 @@ public class TDispatchInfoExportVo { ...@@ -102,6 +96,7 @@ public class TDispatchInfoExportVo {
*/ */
@ExcelAttribute(name = "业务细分", dataType = ExcelAttributeConstants.PERSONNEL_TYPE_SUB, needExport = true) @ExcelAttribute(name = "业务细分", dataType = ExcelAttributeConstants.PERSONNEL_TYPE_SUB, needExport = true)
@Schema(description = "业务细分（存lable）", name = "contractName") @Schema(description = "业务细分（存lable）", name = "contractName")
@ExcelProperty(value ="业务细分")
private String contractSubName; private String contractSubName;
/** /**
...@@ -116,6 +111,7 @@ public class TDispatchInfoExportVo { ...@@ -116,6 +111,7 @@ public class TDispatchInfoExportVo {
/** /**
* 合同起始时间 * 合同起始时间
*/ */
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "合同起始时间", isDate = true) @ExcelAttribute(name = "合同起始时间", isDate = true)
@Schema(description = "合同起始时间" ) @Schema(description = "合同起始时间" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
...@@ -124,6 +120,7 @@ public class TDispatchInfoExportVo { ...@@ -124,6 +120,7 @@ public class TDispatchInfoExportVo {
/** /**
* 合同到期时间 * 合同到期时间
*/ */
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "合同到期时间", isDate = true) @ExcelAttribute(name = "合同到期时间", isDate = true)
@Schema(description = "合同到期时间" ) @Schema(description = "合同到期时间" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
...@@ -237,10 +234,10 @@ public class TDispatchInfoExportVo { ...@@ -237,10 +234,10 @@ public class TDispatchInfoExportVo {
/** /**
* 审核状态（0待审核/1已审核） * 审核状态（0待审核/1已审核）
*/ */
@ExcelAttribute(name = "公积金审核状态",readConverterExp = "0=待审核,1=已审核") @ExcelAttribute(name = "公积金审核状态",readConverterExp = "0=未审核,1=审核通过,2=审核不通过")
@Schema(description = "公积金审核状态:（0待审核/1已审核）" ) @Schema(description = "公积金审核状态:（0待审核/1已审核）" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金审核状态（0待审核/1已审核）" ) @ExcelProperty("公积金审核状态" )
private String fundAuditStatus; private String fundAuditStatus;
/** /**
...@@ -266,7 +263,7 @@ public class TDispatchInfoExportVo { ...@@ -266,7 +263,7 @@ public class TDispatchInfoExportVo {
@Schema(description = "公积金办理人" ) @Schema(description = "公积金办理人" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金办理人" ) @ExcelProperty("公积金办理人" )
private String fundhHandleUser; private String fundHandleUser;
/** /**
* 公积金办理时间 * 公积金办理时间
*/ */
...@@ -283,7 +280,7 @@ public class TDispatchInfoExportVo { ...@@ -283,7 +280,7 @@ public class TDispatchInfoExportVo {
@Schema(description = "养老基数" ) @Schema(description = "养老基数" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老基数" ) @ExcelProperty("养老基数" )
private BigDecimal pensionCardinal; private BigDecimal unitPensionCardinal;
/** /**
* 医疗基数 * 医疗基数
*/ */
...@@ -291,7 +288,7 @@ public class TDispatchInfoExportVo { ...@@ -291,7 +288,7 @@ public class TDispatchInfoExportVo {
@Schema(description = "医疗基数" ) @Schema(description = "医疗基数" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗基数" ) @ExcelProperty("医疗基数" )
private BigDecimal medicalCardinal; private BigDecimal unitMedicalCardinal;
/** /**
* 失业基数 * 失业基数
*/ */
...@@ -299,7 +296,7 @@ public class TDispatchInfoExportVo { ...@@ -299,7 +296,7 @@ public class TDispatchInfoExportVo {
@Schema(description = "失业基数" ) @Schema(description = "失业基数" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业基数" ) @ExcelProperty("失业基数" )
private BigDecimal unemploymentCardinal; private BigDecimal unitUnemploymentCardinal;
/** /**
* 工伤基数 * 工伤基数
...@@ -308,7 +305,7 @@ public class TDispatchInfoExportVo { ...@@ -308,7 +305,7 @@ public class TDispatchInfoExportVo {
@Schema(description = "工伤基数" ) @Schema(description = "工伤基数" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤基数" ) @ExcelProperty("工伤基数" )
private BigDecimal workInjuryCardinal; private BigDecimal unitWorkInjuryCardinal;
/** /**
* 生育基数 * 生育基数
*/ */
...@@ -316,7 +313,16 @@ public class TDispatchInfoExportVo { ...@@ -316,7 +313,16 @@ public class TDispatchInfoExportVo {
@Schema(description = "生育基数" ) @Schema(description = "生育基数" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育基数" ) @ExcelProperty("生育基数" )
private BigDecimal birthCardinal; private BigDecimal unitBirthCardinal;
/**
* 大病基数
*/
@ExcelAttribute(name = "大病基数" , isFloat = true,max = "999999999.99" )
@Schema(description = "大病基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病基数" )
private BigDecimal unitBigailmentCardinal;
/** /**
* 委托备注 * 委托备注
...@@ -328,15 +334,6 @@ public class TDispatchInfoExportVo { ...@@ -328,15 +334,6 @@ public class TDispatchInfoExportVo {
@ExcelProperty("委托备注" ) @ExcelProperty("委托备注" )
private String trustRemark; private String trustRemark;
/**
* 大病基数
*/
@ExcelAttribute(name = "大病基数" , isFloat = true,max = "999999999.99" )
@Schema(description = "大病基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病基数" )
private BigDecimal bigailmentCardinal;
/** /**
* 离职日期 * 离职日期
*/ */
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/SysHouseHoldInfoController.java
View file @ 30ddabd6
...@@ -107,7 +107,7 @@ public class SysHouseHoldInfoController { ...@@ -107,7 +107,7 @@ public class SysHouseHoldInfoController {
@PutMapping @PutMapping
@PreAuthorize("@pms.hasPermission('demo_syshouseholdinfo_edit')" ) @PreAuthorize("@pms.hasPermission('demo_syshouseholdinfo_edit')" )
public R<Boolean> updateById(@RequestBody SysHouseHoldInfo sysHouseHoldInfo) { public R<Boolean> updateById(@RequestBody SysHouseHoldInfo sysHouseHoldInfo) {
return R.ok(sysHouseHoldInfoService.updateById(sysHouseHoldInfo)); return sysHouseHoldInfoService.updateByIdAsso(sysHouseHoldInfo);
} }
/** /**
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/SysHouseHoldInfoService.java
View file @ 30ddabd6
...@@ -44,4 +44,6 @@ public interface SysHouseHoldInfoService extends IService<SysHouseHoldInfo> { ...@@ -44,4 +44,6 @@ public interface SysHouseHoldInfoService extends IService<SysHouseHoldInfo> {
* @return R * @return R
*/ */
R<Boolean> saveInfo (SysHouseHoldInfo sysHouseHoldInfo); R<Boolean> saveInfo (SysHouseHoldInfo sysHouseHoldInfo);
R<Boolean> updateByIdAsso(SysHouseHoldInfo sysHouseHoldInfo);
} }
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @ 30ddabd6
...@@ -21,8 +21,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; ...@@ -21,8 +21,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; 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.DateUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo; import com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo;
import com.yifu.cloud.plus.v1.yifu.social.mapper.SysBaseSetInfoMapper;
import com.yifu.cloud.plus.v1.yifu.social.mapper.SysHouseHoldInfoMapper; import com.yifu.cloud.plus.v1.yifu.social.mapper.SysHouseHoldInfoMapper;
import com.yifu.cloud.plus.v1.yifu.social.service.SysHouseHoldInfoService; import com.yifu.cloud.plus.v1.yifu.social.service.SysHouseHoldInfoService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
...@@ -37,6 +41,8 @@ import org.springframework.stereotype.Service; ...@@ -37,6 +41,8 @@ import org.springframework.stereotype.Service;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMapper, SysHouseHoldInfo> implements SysHouseHoldInfoService { public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMapper, SysHouseHoldInfo> implements SysHouseHoldInfoService {
private final SysBaseSetInfoMapper baseSetInfoMapper;
/** /**
* 社保户公积金户数据简单分页查询 * 社保户公积金户数据简单分页查询
* @param sysHouseHoldInfo 社保户公积金户数据 * @param sysHouseHoldInfo 社保户公积金户数据
...@@ -65,5 +71,37 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -65,5 +71,37 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
baseMapper.insert(sysHouseHoldInfo); baseMapper.insert(sysHouseHoldInfo);
return R.ok(); return R.ok();
} }
/**
* @Author fxj
* @Description 修改社保户公积金户数据
* @Date 16:08 2022/11/14
**/
@Override
public R<Boolean> updateByIdAsso(SysHouseHoldInfo hold) {
if (Common.isEmpty(hold.getId())){
return R.failed(CommonConstants.PARAM_INFO_ERROR);
}
SysHouseHoldInfo holdInfo = baseMapper.selectById(hold.getId());
if (Common.isEmpty(holdInfo)){
return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
}
if (CommonConstants.ONE_STRING.equals(hold.getDelFlag())
&& baseSetInfoMapper.selectCount(Wrappers.<SysBaseSetInfo>query().lambda()
.eq(SysBaseSetInfo::getBaseType, hold.getType())
.le(SysBaseSetInfo::getApplyStartDate, DateUtil.getCurrentDateTime())
.in(SysBaseSetInfo::getDepartId,hold.getId())
.eq(SysBaseSetInfo::getStatus,CommonConstants.ZERO_STRING)
.eq(SysBaseSetInfo::getDeleteFlag, CommonConstants.ZERO_STRING)
.and(obj-> obj.isNull(SysBaseSetInfo::getApplyEndDate).or()
.ge(SysBaseSetInfo::getApplyEndDate,DateUtil.getCurrentDateTime()))) > CommonConstants.ZERO_INT){
return R.failed("户下存在可用基数配置，请禁用可用基数配置后禁用户配置！");
}
int res = baseMapper.updateById(hold);
if (res >= 0){
return R.ok();
}else {
return R.failed(CommonConstants.SAVE_FAILED);
}
}
} }
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 30ddabd6
...@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AllUserNaVo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
...@@ -42,6 +43,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.*; ...@@ -42,6 +43,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser; import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil; import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.CheckDaprUtil; import com.yifu.cloud.plus.v1.yifu.common.dapr.util.CheckDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils; import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.social.constants.DispatchConstants; import com.yifu.cloud.plus.v1.yifu.social.constants.DispatchConstants;
...@@ -104,6 +106,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -104,6 +106,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
@Autowired @Autowired
private final CheckDaprUtil checkDaprUtil; private final CheckDaprUtil checkDaprUtil;
@Autowired
private UpmsDaprUtils upmsDaprUtils;
private final TForecastLibraryService forecastLibraryService; private final TForecastLibraryService forecastLibraryService;
private final TIncomeDetailService detailService; private final TIncomeDetailService detailService;
...@@ -143,7 +148,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -143,7 +148,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
List<TDispatchInfoExportVo> list = new ArrayList<>(); List<TDispatchInfoExportVo> list = new ArrayList<>();
long count = noPageCountDiy(searchVo); long count = noPageCountDiy(searchVo);
ServletOutputStream out = null; ServletOutputStream out = null;
HashMap<String,String> userMap = new HashMap<>();
try { try {
R<AllUserNaVo> userListR = upmsDaprUtils.getAllUserName();
if (Common.isNotNull(userListR)) {
AllUserNaVo userList = userListR.getData();
if (null != userList && !userList.getUserNames().isEmpty()) {
userMap = userList.getUserNames();
}
}
out = response.getOutputStream(); out = response.getOutputStream();
response.setContentType(CommonConstants.MULTIPART_FORM_DATA); response.setContentType(CommonConstants.MULTIPART_FORM_DATA);
response.setCharacterEncoding("utf-8"); response.setCharacterEncoding("utf-8");
...@@ -162,6 +175,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -162,6 +175,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(list)) { if (Common.isNotNull(list)) {
util = new ExcelUtil<>(TDispatchInfoExportVo.class); util = new ExcelUtil<>(TDispatchInfoExportVo.class);
for (TDispatchInfoExportVo vo : list) { for (TDispatchInfoExportVo vo : list) {
if (!userMap.isEmpty()) {
vo.setFundHandleUser(null != userMap.get(vo.getFundHandleUser()) ? userMap.get(vo.getFundHandleUser()) : "");
vo.setAuditUserName(null != userMap.get(vo.getAuditUserName()) ? userMap.get(vo.getAuditUserName()) : "");
vo.setFundAuditUser(null != userMap.get(vo.getFundAuditUser()) ? userMap.get(vo.getFundAuditUser()) : "");
vo.setHandleUser(null != userMap.get(vo.getHandleUser()) ? userMap.get(vo.getHandleUser()) : "");
}
util.convertEntity(vo, null, null, null); util.convertEntity(vo, null, null, null);
} }
} }
...@@ -580,6 +599,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -580,6 +599,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
contractsMap = res.getData().getContractsMap(); contractsMap = res.getData().getContractsMap();
projectsMap = res.getData().getProjectsMap(); projectsMap = res.getData().getProjectsMap();
} }
TAuditInfo auditInfo = null;
for (int i = 0; i < excelVOList.size(); i++) { for (int i = 0; i < excelVOList.size(); i++) {
contract = null; contract = null;
social = null; social = null;
...@@ -645,6 +665,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -645,6 +665,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
dispatch.setFirstBuyMonthSocial(getFirstBuyMonthSocial(social)); dispatch.setFirstBuyMonthSocial(getFirstBuyMonthSocial(social));
insertDispatch(emp, dispatch); insertDispatch(emp, dispatch);
// 新增派单申请提交记录
auditInfo = new TAuditInfo();
addAuditInfo(dispatch, auditInfo);
} }
// 插入或更新社保公积金查询信息 大病在封装社保的时候已经算了 大病技术和金额了 // 插入或更新社保公积金查询信息 大病在封装社保的时候已经算了 大病技术和金额了
if (Common.isNotNull(socialFundAddMap)){ if (Common.isNotNull(socialFundAddMap)){
...@@ -671,6 +694,21 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -671,6 +694,21 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
Common.clear(projectsMap); Common.clear(projectsMap);
} }
private void addAuditInfo(TDispatchInfo dispatch, TAuditInfo auditInfo) {
auditInfo.setEmpIdcard(dispatch.getEmpIdcard());
auditInfo.setSocialId(dispatch.getSocialId());
auditInfo.setProvidentId(dispatch.getFundId());
auditInfo.setAuditStatus(CommonConstants.ZERO_STRING);
auditInfo.setDispatchInfoId(dispatch.getId());
auditInfo.setAuditRemark("派单申请提交");
auditInfo.setTitle("派单申请");
auditInfo.setOrganName(dispatch.getOrganName());
auditInfo.setAuditUser(dispatch.getCreateName());
auditInfo.setAuditTime(new Date());
auditInfo.setIsCommision(CommonConstants.ONE_STRING);
auditInfoMapper.insert(auditInfo);
}
private void updateDocSocialFund(TSocialInfo social, TProvidentFund fund, TSocialFundInfo socialFund) { private void updateDocSocialFund(TSocialInfo social, TProvidentFund fund, TSocialFundInfo socialFund) {
UpProjectSocialFundVo vo = new UpProjectSocialFundVo(); UpProjectSocialFundVo vo = new UpProjectSocialFundVo();
if (Common.isNotNull(social)){ if (Common.isNotNull(social)){
...@@ -3007,10 +3045,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3007,10 +3045,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())){ if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())){
R<Boolean> res = null; R<Boolean> res = null;
if (CommonConstants.ZERO_INT == flag){ if (CommonConstants.ZERO_INT == flag){
res = archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractId(),CommonConstants.ZERO_STRING); res = archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractId(),CommonConstants.ZERO_STRING,remarkTemp);
} }
if (CommonConstants.ONE_INT == flag){ if (CommonConstants.ONE_INT == flag){
res = archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractId(),CommonConstants.ONE_STRING); res = archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractId(),CommonConstants.ONE_STRING,remarkTemp);
// 派增审核不通过 失败项重新派单审核不通过 恢复为部分办理失败 // 派增审核不通过 失败项重新派单审核不通过 恢复为部分办理失败
flagTemp = Common.isNotNull(sf) && Common.isNotNull(dis.getSocialId()) flagTemp = Common.isNotNull(sf) && Common.isNotNull(dis.getSocialId())
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @ 30ddabd6
...@@ -110,7 +110,6 @@ ...@@ -110,7 +110,6 @@
<result property="empType" column="EMP_TYPE"/> <result property="empType" column="EMP_TYPE"/>
<result property="belongUnitName" column="BELONG_UNIT_NAME"/> <result property="belongUnitName" column="BELONG_UNIT_NAME"/>
<result property="settleDomainName" column="SETTLE_DOMAIN_NAME"/> <result property="settleDomainName" column="SETTLE_DOMAIN_NAME"/>
<result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/>
<result property="type" column="TYPE"/> <result property="type" column="TYPE"/>
<result property="socialHouseholdName" column="SOCIAL_HOUSEHOLD_NAME"/> <result property="socialHouseholdName" column="SOCIAL_HOUSEHOLD_NAME"/>
<result property="providentHouseholdName" column="PROVIDENT_HOUSEHOLD_NAME"/> <result property="providentHouseholdName" column="PROVIDENT_HOUSEHOLD_NAME"/>
...@@ -125,6 +124,40 @@ ...@@ -125,6 +124,40 @@
<result property="createName" column="CREATE_NAME"/> <result property="createName" column="CREATE_NAME"/>
<result property="organName" column="ORGAN_NAME"/> <result property="organName" column="ORGAN_NAME"/>
<result property="createTime" column="CREATE_TIME"/> <result property="createTime" column="CREATE_TIME"/>
<result property="contractType" column="CONTRACT_TYPE"/>
<result property="contractSubName" column="CONTRACT_SUB_NAME"/>
<result property="contractTerm" column="CONTRACT_TERM"/>
<result property="contractStart" column="CONTRACT_START"/>
<result property="contractEnd" column="CONTRACT_END"/>
<result property="auditUserName" column="AUDIT_USER_NAME"/>
<result property="auditRemark" column="AUDIT_REMARK"/>
<result property="trustRemark" column="TRUST_REMARK"/>
<result property="leaveDate" column="LEAVE_DATE"/>
<result property="reduceReason" column="REDUCE_REASON"/>
<result property="status" column="STATUS"/>
<result property="auditUser" column="AUDIT_USER"/>
<result property="auditTime" column="AUDIT_TIME"/>
<result property="fundHandleRemark" column="FUND_HANDLE_REMARK"/>
<result property="socialHandleRemark" column="SOCIAL_HANDLE_REMARK"/>
<result property="providentStart" column="PROVIDENT_START"/>
<result property="fundAuditStatus" column="FUND_AUDIT_STATUS"/>
<result property="fundAuditUser" column="FUND_AUDIT_USER"/>
<result property="fundHandleUser" column="FUND_HANDLE_USER"/>
<result property="fundHandleTime" column="FUND_HANDLE_TIME"/>
<result property="auditStatus" column="AUDIT_STATUS"/>
<result property="socialStartDate" column="SOCIAL_START_DATE"/>
<result property="socialReduceDate" column="SOCIAL_REDUCE_DATE"/>
<result property="recordBase" column="RECORD_BASE"/>
<result property="handleUser" column="HANDLE_USER"/>
<result property="handleTime" column="HANDLE_TIME"/>
<result property="unitPensionCardinal" column="UNIT_PENSION_CARDINAL"/>
<result property="unitMedicalCardinal" column="UNIT_MEDICAL_CARDINAL"/>
<result property="unitUnemploymentCardinal" column="UNIT_UNEMPLOYMENT_CARDINAL"/>
<result property="unitBigailmentCardinal" column="UNIT_BIGAILMENT_CARDINAL"/>
<result property="unitWorkInjuryCardinal" column="UNIT_WORK_INJURY_CARDINAL"/>
<result property="unitBirthCardinal" column="UNIT_BIRTH_CARDINAL"/>
</resultMap> </resultMap>
<resultMap id="fundSupplementaryMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.FundSupplementaryExportVo"> <resultMap id="fundSupplementaryMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.FundSupplementaryExportVo">
...@@ -570,7 +603,6 @@ ...@@ -570,7 +603,6 @@
a.EMP_TYPE, a.EMP_TYPE,
a.BELONG_UNIT_NAME, a.BELONG_UNIT_NAME,
a.SETTLE_DOMAIN_NAME, a.SETTLE_DOMAIN_NAME,
a.SETTLE_DOMAIN_CODE,
a.TYPE, a.TYPE,
a.SOCIAL_HOUSEHOLD_NAME, a.SOCIAL_HOUSEHOLD_NAME,
a.PROVIDENT_HOUSEHOLD_NAME, a.PROVIDENT_HOUSEHOLD_NAME,
...@@ -584,9 +616,42 @@ ...@@ -584,9 +616,42 @@
a.FUND_HANDLE_STATUS, a.FUND_HANDLE_STATUS,
a.CREATE_NAME, a.CREATE_NAME,
a.ORGAN_NAME, a.ORGAN_NAME,
a.CREATE_TIME a.CREATE_TIME,
a.CONTRACT_TYPE,
a.CONTRACT_SUB_NAME,
a.CONTRACT_TERM,
a.CONTRACT_START,
a.CONTRACT_END,
a.AUDIT_REMARK,
a.TRUST_REMARK,
a.LEAVE_DATE,
a.REDUCE_REASON,
a.STATUS,
a.AUDIT_USER_NAME as AUDIT_USER,
a.AUDIT_TIME,
a.FUND_HANDLE_REMARK,
a.SOCIAL_HANDLE_REMARK,
c.PROVIDENT_START,
c.AUDIT_STATUS as FUND_AUDIT_STATUS,
c.AUDIT_USER as FUND_AUDIT_USER,
c.HANDLE_USER as FUND_HANDLE_USER,
c.HANDLE_TIME as FUND_HANDLE_TIME,
s.AUDIT_USER as AUDIT_USER_NAME,
s.AUDIT_STATUS,
s.SOCIAL_START_DATE,
s.SOCIAL_REDUCE_DATE,
s.RECORD_BASE,
s.HANDLE_USER,
s.HANDLE_TIME,
s.UNIT_PENSION_CARDINAL,
s.UNIT_MEDICAL_CARDINAL,
s.UNIT_UNEMPLOYMENT_CARDINAL,
s.UNIT_BIGAILMENT_CARDINAL,
s.UNIT_WORK_INJURY_CARDINAL,
s.UNIT_BIRTH_CARDINAL
from t_dispatch_info a from t_dispatch_info a
left join t_social_info s on s.id=a.SOCIAL_ID left join t_social_info s on s.id=a.SOCIAL_ID
left join t_provident_fund c on c.id=a.FUND_ID
<where> <where>
a.DELETE_FLAG = '0' a.DELETE_FLAG = '0'
<include refid="tDispatchInfo_where"/> <include refid="tDispatchInfo_where"/>
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @ 30ddabd6
...@@ -631,7 +631,28 @@ ...@@ -631,7 +631,28 @@
<!--tPaymentInfo简单分页查询--> <!--tPaymentInfo简单分页查询-->
<select id="getTPaymentInfoPage" resultMap="tPaymentInfoMap"> <select id="getTPaymentInfoPage" resultMap="tPaymentInfoMap">
SELECT SELECT
<include refid="Base_Column_List"/> a.ID,
a.EMP_NAME,
a.EMP_NO,
a.EMP_IDCARD,
a.UNIT_NAME,
a.SETTLE_DOMAIN_NAME,
a.SOCIAL_HOUSEHOLD,
a.SOCIAL_SECURITY_NO,
a.SOCIAL_PAY_ADDR,
a.SOCIAL_PAY_MONTH,
a.SOCIAL_CREATE_MONTH,
a.LOCK_STATUS,
a.PUSH_STATUS,
a.SUM_ALL,
a.PROVIDENT_PAY_MONTH,
a.PROVIDENT_CREATE_MONTH,
a.PROVIDENT_HOUSEHOLD,
a.PROVIDENT_PAY_ADDR,
a.SOCIAL_SUM,
a.PROVIDENT_SUM,
a.CREATE_NAME,
a.CREATE_TIME
FROM t_payment_info a FROM t_payment_info a
<where> <where>
1=1 1=1
......
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