Skip to content

Y
yifu-mvp
Commit 86ffffec authored by hongguangwu's avatar hongguangwu
Browse files
Options

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

parents 2be14fa2 818677e4
Hide whitespace changes
Inline Side-by-side
Showing with 174 additions and 74 deletions
k8s-bash-test/yifu-archives-deployment.yaml
View file @ 86ffffec
...@@ -44,8 +44,9 @@ spec: # 资源规范字段 ...@@ -44,8 +44,9 @@ spec: # 资源规范字段
kubernetes.io/hostname: yfmaster1 kubernetes.io/hostname: yfmaster1
containers: # 容器 containers: # 容器
- name: yifu-archives # 容器的名字 - name: yifu-archives # 容器的名字
image: 192.168.1.110:5500/qas-mvp/yifu-archives-biz:1.0.0 # 容器镜像地址 #image: 192.168.1.110:5500/qas-mvp/yifu-archives-biz:1.0.0 # 容器镜像地址
imagePullPolicy: Always # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent image: localhost:5000/qas-mvp/yifu-archives-biz:1.0.0 #临时地址
imagePullPolicy: IfNotPresent # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent
# Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时， # Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时，
# 已经打好镜像存在docker容器中时，使用存在不检查级别， # 已经打好镜像存在docker容器中时，使用存在不检查级别，
# 默认为每次都检查，然后会进行拉取新镜像，因镜像仓库不存在，导致部署失败） # 默认为每次都检查，然后会进行拉取新镜像，因镜像仓库不存在，导致部署失败）
......
k8s-bash-test/yifu-auth-deployment.yaml
View file @ 86ffffec
...@@ -43,8 +43,9 @@ spec: # 资源规范字段 ...@@ -43,8 +43,9 @@ spec: # 资源规范字段
kubernetes.io/hostname: yfmaster1 kubernetes.io/hostname: yfmaster1
containers: # 容器 containers: # 容器
- name: yifu-auth # 容器的名字 - name: yifu-auth # 容器的名字
image: 192.168.1.110:5500/qas-mvp/yifu-auth:1.0.0 # 容器镜像地址 #image: 192.168.1.110:5500/qas-mvp/yifu-auth:1.0.0 # 容器镜像地址
imagePullPolicy: Always # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent image: localhost:5000/qas-mvp/yifu-auth-biz:1.0.0 #临时地址
imagePullPolicy: IfNotPresent # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent
# Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时， # Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时，
# 已经打好镜像存在docker容器中时，使用存在不检查级别， # 已经打好镜像存在docker容器中时，使用存在不检查级别，
# 默认为每次都检查，然后会进行拉取新镜像，因镜像仓库不存在，导致部署失败） # 默认为每次都检查，然后会进行拉取新镜像，因镜像仓库不存在，导致部署失败）
......
k8s-bash-test/yifu-check-deployment.yaml
View file @ 86ffffec
...@@ -43,8 +43,9 @@ spec: # 资源规范字段 ...@@ -43,8 +43,9 @@ spec: # 资源规范字段
kubernetes.io/hostname: yfmaster1 kubernetes.io/hostname: yfmaster1
containers: # 容器 containers: # 容器
- name: yifu-check # 容器的名字 - name: yifu-check # 容器的名字
image: 192.168.1.110:5500/qas-mvp/yifu-check-biz:1.0.0 # 容器镜像地址 #image: 192.168.1.110:5500/qas-mvp/yifu-check-biz:1.0.0 # 容器镜像地址
imagePullPolicy: Always # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent image: localhost:5000/qas-mvp/yifu-check-biz:1.0.0 #临时地址
imagePullPolicy: IfNotPresent # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent
# Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时， # Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时，
# 已经打好镜像存在docker容器中时，使用存在不检查级别， # 已经打好镜像存在docker容器中时，使用存在不检查级别，
# 默认为每次都检查，然后会进行拉取新镜像，因镜像仓库不存在，导致部署失败） # 默认为每次都检查，然后会进行拉取新镜像，因镜像仓库不存在，导致部署失败）
......
k8s-bash-test/yifu-job-deployment.yaml
View file @ 86ffffec
...@@ -42,8 +42,9 @@ spec: # 资源规范字段 ...@@ -42,8 +42,9 @@ spec: # 资源规范字段
node-type: worker # node标签 node-type: worker # node标签
containers: # 容器 containers: # 容器
- name: yifu-job # 容器的名字 - name: yifu-job # 容器的名字
image: hub.yifucenter.com:5500/qas-mvp/yifu-job-biz:1.0.0 # 容器镜像地址 #image: hub.yifucenter.com:5500/qas-mvp/yifu-job-biz:1.0.0 # 容器镜像地址
imagePullPolicy: Always # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent image: localhost:5000/qas-mvp/yifu-job-biz:1.0.0 #临时地址
imagePullPolicy: IfNotPresent # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent
# Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时， # Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时，
# 已经打好镜像存在docker容器中时，使用存在不检查级别， # 已经打好镜像存在docker容器中时，使用存在不检查级别，
# 默认为每次都检查，然后会进行拉取新镜像，因镜像仓库不存在，导致部署失败） # 默认为每次都检查，然后会进行拉取新镜像，因镜像仓库不存在，导致部署失败）
......
k8s-bash-test/yifu-salary-deployment.yaml
View file @ 86ffffec
...@@ -44,8 +44,9 @@ spec: # 资源规范字段 ...@@ -44,8 +44,9 @@ spec: # 资源规范字段
kubernetes.io/hostname: yfmaster1 kubernetes.io/hostname: yfmaster1
containers: # 容器 containers: # 容器
- name: yifu-salary # 容器的名字 - name: yifu-salary # 容器的名字
image: 192.168.1.110:5500/qas-mvp/yifu-salary-biz:1.0.0 # 容器镜像地址 #image: 192.168.1.110:5500/qas-mvp/yifu-salary-biz:1.0.0 # 容器镜像地址
imagePullPolicy: Always # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent image: localhost:5000/qas-mvp/yifu-salary-biz:1.0.0 #临时地址
imagePullPolicy: IfNotPresent # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent
# Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时， # Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时，
# 已经打好镜像存在docker容器中时，使用存在不检查级别， # 已经打好镜像存在docker容器中时，使用存在不检查级别，
# 默认为每次都检查，然后会进行拉取新镜像，因镜像仓库不存在，导致部署失败） # 默认为每次都检查，然后会进行拉取新镜像，因镜像仓库不存在，导致部署失败）
......
k8s-bash-test/yifu-social-deployment.yaml
View file @ 86ffffec
...@@ -44,8 +44,9 @@ spec: # 资源规范字段 ...@@ -44,8 +44,9 @@ spec: # 资源规范字段
kubernetes.io/hostname: yfmaster1 kubernetes.io/hostname: yfmaster1
containers: # 容器 containers: # 容器
- name: yifu-social # 容器的名字 - name: yifu-social # 容器的名字
image: 192.168.1.110:5500/qas-mvp/yifu-social-biz:1.0.0 # 容器镜像地址 #image: 192.168.1.110:5500/qas-mvp/yifu-social-biz:1.0.0 # 容器镜像地址
imagePullPolicy: Always # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent image: localhost:5000/qas-mvp/yifu-social-biz:1.0.0 #临时地址
imagePullPolicy: IfNotPresent # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent
# Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时， # Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时，
# 已经打好镜像存在docker容器中时，使用存在不检查级别， # 已经打好镜像存在docker容器中时，使用存在不检查级别，
# 默认为每次都检查，然后会进行拉取新镜像，因镜像仓库不存在，导致部署失败） # 默认为每次都检查，然后会进行拉取新镜像，因镜像仓库不存在，导致部署失败）
......
k8s-bash-test/yifu-upms-deployment.yaml
View file @ 86ffffec
...@@ -43,8 +43,9 @@ spec: # 资源规范字段 ...@@ -43,8 +43,9 @@ spec: # 资源规范字段
kubernetes.io/hostname: yfmaster1 kubernetes.io/hostname: yfmaster1
containers: # 容器 containers: # 容器
- name: yifu-upms # 容器的名字 - name: yifu-upms # 容器的名字
image: 192.168.1.110:5500/qas-mvp/yifu-upms-biz:1.0.0 # 容器镜像地址 #image: 192.168.1.110:5500/qas-mvp/yifu-upms-biz:1.0.0 # 容器镜像地址
imagePullPolicy: Always # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent image: localhost:5000/qas-mvp/yifu-upms-biz:1.0.0 #临时地址
imagePullPolicy: IfNotPresent # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent
# Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时， # Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时，
# 已经打好镜像存在docker容器中时，使用存在不检查级别， # 已经打好镜像存在docker容器中时，使用存在不检查级别，
# 默认为每次都检查，然后会进行拉取新镜像，因镜像仓库不存在，导致部署失败） # 默认为每次都检查，然后会进行拉取新镜像，因镜像仓库不存在，导致部署失败）
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TSettleDomainListVo.java
View file @ 86ffffec
...@@ -14,5 +14,9 @@ public class TSettleDomainListVo { ...@@ -14,5 +14,9 @@ public class TSettleDomainListVo {
private List<TSettleDomainSelectVo> listSelectVO; private List<TSettleDomainSelectVo> listSelectVO;
private Map<String,TSettleDomainSelectVo> mapSlectVo; private Map<String,TSettleDomainSelectVo> mapSlectVo;
/**
* 合同主体IDS
*/
private List<String> deptIds;
} }
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @ 86ffffec
...@@ -137,12 +137,14 @@ public class TSettleDomainController { ...@@ -137,12 +137,14 @@ public class TSettleDomainController {
@Operation(description = "获取登录用户拥有的项目数据）") @Operation(description = "获取登录用户拥有的项目数据）")
@Inner @Inner
@GetMapping("/getSettleDomainIdsByUserId") @GetMapping("/getSettleDomainIdsByUserId")
public List<String> getSettleDomainIdsByUserId() { public TSettleDomainListVo getSettleDomainIdsByUserId() {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (null == user || null == user.getId()) { if (null == user || null == user.getId()) {
return null; return null;
} }
return tSettleDomainService.getSettleDomainIdsByUserId(user.getId()); TSettleDomainListVo vo = new TSettleDomainListVo();
vo.setDeptIds(tSettleDomainService.getSettleDomainIdsByUserId(user.getId()));
return vo;
} }
/** /**
......
yifu-auth/src/main/resources/application.yml
View file @ 86ffffec
...@@ -47,6 +47,8 @@ security: ...@@ -47,6 +47,8 @@ security:
- /v3/api-docs - /v3/api-docs
- /actuator/** - /actuator/**
- /swagger-ui/** - /swagger-ui/**
- /insuranceDetail/updateInsuranceSettle
- /insuranceDetail/urgentUpdateIsUse
# Spring 相关 # Spring 相关
......
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @ 86ffffec
...@@ -107,6 +107,21 @@ public class ArchivesDaprUtil { ...@@ -107,6 +107,21 @@ public class ArchivesDaprUtil {
return res; return res;
} }
/**
* @Author fxj
* @Description 获取所有客户单位的项目信息
* @Date 21:18 2022/7/18
* @Param
* @return
**/
public R<TSettleDomainListVo> getSettleDomainIdsByUserId(String userId){
R<TSettleDomainListVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tsettledomain/getSettleDomainIdsByUserId",userId, TSettleDomainListVo.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){
return R.failed("获取所有客户单位的项目信息失败！");
}
return res;
}
/** /**
* @Author huyc * @Author huyc
* @Description 根据项目id 获取项目编码 * @Description 根据项目id 获取项目编码
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java
View file @ 86ffffec
...@@ -466,7 +466,7 @@ public class TInsuranceDetailController { ...@@ -466,7 +466,7 @@ public class TInsuranceDetailController {
* @return {@link R<List< RefundExportListVo >>} * @return {@link R<List< RefundExportListVo >>}
*/ */
@Operation(summary = "紧急出险", description = "紧急出险") @Operation(summary = "紧急出险", description = "紧急出险")
@GetMapping("/urgentUpdateIsUse") @PostMapping("/urgentUpdateIsUse")
public R urgentUpdateIsUse(String empIdcardNo) { public R urgentUpdateIsUse(String empIdcardNo) {
return tInsuranceDetailService.urgentUpdateIsUse(empIdcardNo); return tInsuranceDetailService.urgentUpdateIsUse(empIdcardNo);
} }
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java
View file @ 86ffffec
...@@ -1001,7 +1001,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1001,7 +1001,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
} }
} }
} }
//更新状态 //更新状态
this.saveOrUpdateBatch(successList); this.saveOrUpdateBatch(successList);
} }
...@@ -1141,8 +1140,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1141,8 +1140,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
} }
} }
} }
updateBatchById(successList);
if (CollectionUtils.isNotEmpty(successList)){ if (CollectionUtils.isNotEmpty(successList)){
threadPool.execute(() -> { threadPool.execute(() -> {
//todo 根据结算类型是合并结算，推送预估保费到ekp(上面已经算好，这里直接判断有预估保费的就推送)
for (TInsuranceDetail tInsuranceDetail : successList) { for (TInsuranceDetail tInsuranceDetail : successList) {
Integer settleType = tInsuranceDetail.getSettleType(); Integer settleType = tInsuranceDetail.getSettleType();
//如果是合并计算则推送至EKP //如果是合并计算则推送至EKP
...@@ -1156,16 +1157,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1156,16 +1157,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.set(TInsuranceSettle :: getEstimatePushTime,LocalDateTime.now()); .set(TInsuranceSettle :: getEstimatePushTime,LocalDateTime.now());
//更新结算信息表 //更新结算信息表
tInsuranceSettleService.update(settleWrapper); tInsuranceSettleService.update(settleWrapper);
//更新保单信息表 }else{
updateById(tInsuranceDetail); //todo 异常处理
} }
}else{
updateById(tInsuranceDetail);
} }
} }
}); });
//todo 根据结算类型是合并结算，推送预估保费到ekp(上面已经算好，这里直接判断有预估保费的就推送)
//结算状态是待结算，结算中、已结算是ekp反馈的，如果结算失败，反馈到我们这边的状态是待结算
} }
//根据项目编码获取项目名称 //根据项目编码获取项目名称
setProjectNameByDeptNo(errorList); setProjectNameByDeptNo(errorList);
...@@ -3065,6 +3062,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3065,6 +3062,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List<SettleMonthChangeCheckParam> successList = map.get("successList"); List<SettleMonthChangeCheckParam> successList = map.get("successList");
List<SettleMonthChangeCheckParam> errorList = map.get("errorList"); List<SettleMonthChangeCheckParam> errorList = map.get("errorList");
if(CollectionUtils.isNotEmpty(successList)){ if(CollectionUtils.isNotEmpty(successList)){
//先更新本地状态再集中推送至EKP
//当前保单结算信息不为空且已推送的情况下，推送EKP进行变更 //当前保单结算信息不为空且已推送的情况下，推送EKP进行变更
List<EKPInteractiveParam> deptDetail = getDeptDetail(successList); List<EKPInteractiveParam> deptDetail = getDeptDetail(successList);
threadPool.execute(() -> { threadPool.execute(() -> {
...@@ -3135,6 +3134,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3135,6 +3134,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
} }
}); });
} }
return R.ok(errorList,"导入成功"); return R.ok(errorList,"导入成功");
} }
......
yifu-insurances/yifu-insurances-biz/src/main/resources/application.yml
View file @ 86ffffec
...@@ -39,6 +39,8 @@ security: ...@@ -39,6 +39,8 @@ security:
- /v3/api-docs - /v3/api-docs
- /actuator/** - /actuator/**
- /swagger-ui/** - /swagger-ui/**
- /insuranceDetail/updateInsuranceSettle
- /insuranceDetail/urgentUpdateIsUse
......
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandardSet.java
View file @ 86ffffec
...@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; ...@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
...@@ -28,7 +29,7 @@ import java.util.List; ...@@ -28,7 +29,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@TableName("t_salary_standard_set") @TableName("t_salary_standard_set")
@Tag(name = "薪资工资条配置主表") @Tag(name = "薪资工资条配置主表")
public class TSalaryStandardSet extends Model<TSalaryStandardSet> { public class TSalaryStandardSet extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* *
...@@ -52,20 +53,7 @@ public class TSalaryStandardSet extends Model<TSalaryStandardSet> { ...@@ -52,20 +53,7 @@ public class TSalaryStandardSet extends Model<TSalaryStandardSet> {
@ExcelAttribute(name = "结算部门id", isNotEmpty = true, errorInfo = "结算部门id不能为空", maxLength = 32) @ExcelAttribute(name = "结算部门id", isNotEmpty = true, errorInfo = "结算部门id不能为空", maxLength = 32)
@ExcelProperty(value = "结算部门id") @ExcelProperty(value = "结算部门id")
private String deptId; private String deptId;
/**
* 创建人
*/
@NotBlank(message = "创建人不能为空")
@Length(max = 32, message = "创建人不能超过32个字符")
@ExcelAttribute(name = "创建人", isNotEmpty = true, errorInfo = "创建人不能为空", maxLength = 32)
@ExcelProperty(value = "创建人")
private String createUser;
/**
* 创建时间
*/
@ExcelAttribute(name = "创建时间")
@ExcelProperty(value = "创建时间")
private LocalDateTime createTime;
/** /**
* 是否为0不显示：0显示；1不显示 * 是否为0不显示：0显示；1不显示
*/ */
......
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandardSetDetail.java
View file @ 86ffffec
...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; ...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
...@@ -25,7 +26,7 @@ import javax.validation.constraints.NotNull; ...@@ -25,7 +26,7 @@ import javax.validation.constraints.NotNull;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@TableName("t_salary_standard_set_detail") @TableName("t_salary_standard_set_detail")
@Tag(name = "薪资工资条配置明细表") @Tag(name = "薪资工资条配置明细表")
public class TSalaryStandardSetDetail extends Model<TSalaryStandardSetDetail> { public class TSalaryStandardSetDetail extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* *
......
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryStandardSearchVo.java
View file @ 86ffffec
...@@ -20,6 +20,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandard; ...@@ -20,6 +20,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandard;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
/** /**
...@@ -29,7 +30,7 @@ import java.time.LocalDateTime; ...@@ -29,7 +30,7 @@ import java.time.LocalDateTime;
* @date 2022-08-05 11:40:14 * @date 2022-08-05 11:40:14
*/ */
@Data @Data
public class TSalaryStandardSearchVo extends TSalaryStandard { public class TSalaryStandardSearchVo extends TSalaryStandard implements Serializable {
/** /**
* 多选导出或删除等操作 * 多选导出或删除等操作
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TConfigSalaryController.java
View file @ 86ffffec
...@@ -19,7 +19,7 @@ import java.util.List; ...@@ -19,7 +19,7 @@ import java.util.List;
/** /**
* @Author fxj * @Author fxj
* @Description 工资报账配置 * @Description 普通工资配置
* @Date 13:32 2022/8/6 * @Date 13:32 2022/8/6
* @Param * @Param
* @return * @return
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java
View file @ 86ffffec
...@@ -109,7 +109,7 @@ public class TSalaryStandardController { ...@@ -109,7 +109,7 @@ public class TSalaryStandardController {
**/ **/
@Operation(description = "导出标准薪酬工资表 hasPermission('salary_tsalarystandard-export')") @Operation(description = "导出标准薪酬工资表 hasPermission('salary_tsalarystandard-export')")
@PostMapping("/export") @PostMapping("/export")
@PreAuthorize("@pms.hasPermission('salary_tsalarystandard-export')") //@PreAuthorize("@pms.hasPermission('salary_tsalarystandard-export')")
public void export(HttpServletResponse response, @RequestBody TSalaryStandardSearchVo searchVo) { public void export(HttpServletResponse response, @RequestBody TSalaryStandardSearchVo searchVo) {
tSalaryStandardService.listExport(response, searchVo); tSalaryStandardService.listExport(response, searchVo);
} }
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TConfigSalaryMapper.java
View file @ 86ffffec
...@@ -24,7 +24,7 @@ public interface TConfigSalaryMapper extends BaseMapper<TConfigSalary> { ...@@ -24,7 +24,7 @@ public interface TConfigSalaryMapper extends BaseMapper<TConfigSalary> {
* @return * @return
*/ */
IPage<TConfigSalary> getTConfigSalaryPage(Page page, @Param("tConfigSalary") TConfigSalary tConfigSalary IPage<TConfigSalary> getTConfigSalaryPage(Page page, @Param("tConfigSalary") TConfigSalary tConfigSalary
, @Param("settleDomainVos") List<TSettleDomainSelectVo> settleDomainVos); , @Param("depatIds") List<String> depatIds);
} }
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryStandardMapper.java
View file @ 86ffffec
...@@ -50,7 +50,7 @@ public interface TSalaryStandardMapper extends BaseMapper<TSalaryStandard> { ...@@ -50,7 +50,7 @@ public interface TSalaryStandardMapper extends BaseMapper<TSalaryStandard> {
*/ */
IPage<TSalaryStandard> getTSalaryStandardAuditPage(Page<TSalaryStandard> page, @Param("tSalaryStandard") TSalaryStandard tSalaryStandard); IPage<TSalaryStandard> getTSalaryStandardAuditPage(Page<TSalaryStandard> page, @Param("tSalaryStandard") TSalaryStandard tSalaryStandard);
List<TSalaryStandardExportVo> getSalaryStandardExport( @Param("tSalaryStandard") TSalaryStandardSearchVo searchVo); List<TSalaryStandardExportVo> getSalaryStandardExport(@Param("searchVo") TSalaryStandardSearchVo searchVo);
int getSalaryStandardExportCount(TSalaryStandardSearchVo searchVo); int getSalaryStandardExportCount(TSalaryStandardSearchVo searchVo);
} }
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TConfigSalaryServiceImpl.java
View file @ 86ffffec
...@@ -3,15 +3,19 @@ package com.yifu.cloud.plus.v1.yifu.salary.service.impl; ...@@ -3,15 +3,19 @@ package com.yifu.cloud.plus.v1.yifu.salary.service.impl;
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.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
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.Common;
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.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.security.util.SecurityUtils; import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TConfigSalary; import com.yifu.cloud.plus.v1.yifu.salary.entity.TConfigSalary;
import com.yifu.cloud.plus.v1.yifu.salary.mapper.TConfigSalaryMapper; import com.yifu.cloud.plus.v1.yifu.salary.mapper.TConfigSalaryMapper;
import com.yifu.cloud.plus.v1.yifu.salary.service.TConfigSalaryService; import com.yifu.cloud.plus.v1.yifu.salary.service.TConfigSalaryService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
...@@ -23,10 +27,11 @@ import java.util.List; ...@@ -23,10 +27,11 @@ import java.util.List;
* @Param * @Param
* @return * @return
**/ **/
@AllArgsConstructor
@Service("tConfigSalaryService") @Service("tConfigSalaryService")
public class TConfigSalaryServiceImpl extends ServiceImpl<TConfigSalaryMapper, TConfigSalary> implements TConfigSalaryService { public class TConfigSalaryServiceImpl extends ServiceImpl<TConfigSalaryMapper, TConfigSalary> implements TConfigSalaryService {
private final ArchivesDaprUtil archivesDaprUtil;
/** /**
* 工资报账配置简单分页查询 * 工资报账配置简单分页查询
* @param tConfigSalary 工资报账配置 * @param tConfigSalary 工资报账配置
...@@ -35,22 +40,24 @@ public class TConfigSalaryServiceImpl extends ServiceImpl<TConfigSalaryMapper, T ...@@ -35,22 +40,24 @@ public class TConfigSalaryServiceImpl extends ServiceImpl<TConfigSalaryMapper, T
@Override @Override
public IPage<TConfigSalary> getTConfigSalaryPage(Page<TConfigSalary> page, TConfigSalary tConfigSalary){ public IPage<TConfigSalary> getTConfigSalaryPage(Page<TConfigSalary> page, TConfigSalary tConfigSalary){
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
List<TSettleDomainSelectVo> remoteSettleDomainVoData = null; TSettleDomainListVo vo = null;
if (Common.isNotNull(user)) { if (Common.isNotNull(user)) {
// TODO R<TSettleDomainListVo> domainListVoR = archivesDaprUtil.getSettleDomainIdsByUserId(user.getId());
R<List<TSettleDomainSelectVo>> remoteGetTSettleDomainVo = null; if (Common.isEmpty(domainListVoR)) {
if (remoteGetTSettleDomainVo == null) {
throw new RuntimeException("调用结算服务失败"); throw new RuntimeException("调用结算服务失败");
} }
if (CommonConstants.SUCCESS != remoteGetTSettleDomainVo.getCode()) { if (CommonConstants.SUCCESS != domainListVoR.getCode()) {
throw new RuntimeException("调用结算服务返回失败"); throw new RuntimeException("调用结算服务返回失败");
} }
remoteSettleDomainVoData = remoteGetTSettleDomainVo.getData(); vo = domainListVoR.getData();
if (remoteSettleDomainVoData == null) { if (Common.isEmpty(vo) || Common.isEmpty(vo.getDeptIds())) {
throw new RuntimeException("未获取到相关结算信息"); throw new RuntimeException("未获取到相关结算信息");
} }
} }
return baseMapper.getTConfigSalaryPage(page, tConfigSalary, remoteSettleDomainVoData); if (Common.isEmpty(vo)){
return baseMapper.getTConfigSalaryPage(page, tConfigSalary, vo.getDeptIds());
}
return baseMapper.getTConfigSalaryPage(page, tConfigSalary, null);
} }
} }
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardSetServiceImpl.java
View file @ 86ffffec
...@@ -66,7 +66,7 @@ public class TSalaryStandardSetServiceImpl extends ServiceImpl<TSalaryStandardSe ...@@ -66,7 +66,7 @@ public class TSalaryStandardSetServiceImpl extends ServiceImpl<TSalaryStandardSe
Wrappers.<TSalaryStandardSetDetail>query().lambda().eq(TSalaryStandardSetDetail::getSetId, ss.getId())); Wrappers.<TSalaryStandardSetDetail>query().lambda().eq(TSalaryStandardSetDetail::getSetId, ss.getId()));
TSalaryStandardSet newSet = new TSalaryStandardSet(); TSalaryStandardSet newSet = new TSalaryStandardSet();
newSet.setCreateTime(LocalDateTime.now()); newSet.setCreateTime(LocalDateTime.now());
newSet.setCreateUser(userId); newSet.setCreateBy(userId);
newSet.setIsZero(ss.getIsZero()); newSet.setIsZero(ss.getIsZero());
newSet.setSalaryId(salaryId); newSet.setSalaryId(salaryId);
newSet.setDeptId(deptId); newSet.setDeptId(deptId);
...@@ -113,7 +113,7 @@ public class TSalaryStandardSetServiceImpl extends ServiceImpl<TSalaryStandardSe ...@@ -113,7 +113,7 @@ public class TSalaryStandardSetServiceImpl extends ServiceImpl<TSalaryStandardSe
} }
if (Common.isEmpty(tSalaryStandardSet.getId())) { if (Common.isEmpty(tSalaryStandardSet.getId())) {
tSalaryStandardSet.setCreateTime(LocalDateTime.now()); tSalaryStandardSet.setCreateTime(LocalDateTime.now());
tSalaryStandardSet.setCreateUser(String.valueOf(user.getId())); tSalaryStandardSet.setCreateBy(String.valueOf(user.getId()));
this.save(tSalaryStandardSet); this.save(tSalaryStandardSet);
} else { } else {
this.updateById(tSalaryStandardSet); this.updateById(tSalaryStandardSet);
......
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TConfigSalaryMapper.xml
View file @ 86ffffec
...@@ -79,10 +79,10 @@ ...@@ -79,10 +79,10 @@
AND ANNUAL_BONUS_TYPE = #{tConfigSalary.annualBonusType} AND ANNUAL_BONUS_TYPE = #{tConfigSalary.annualBonusType}
</if> </if>
<!--数据权限判断--> <!--数据权限判断-->
<if test="settleDomainVos != null and settleDomainVos.size() > 0"> <if test="depatIds != null and depatIds.size() > 0">
and DEPART_ID in and DEPART_ID in
<foreach collection="settleDomainVos" item="param" index="index" open="(" close=")" separator=","> <foreach collection="depatIds" item="param" index="index" open="(" close=")" separator=",">
#{param.id} #{param}
</foreach> </foreach>
</if> </if>
</where> </where>
......
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @ 86ffffec
...@@ -233,8 +233,20 @@ ...@@ -233,8 +233,20 @@
</where> </where>
order by a.CREATE_TIME desc order by a.CREATE_TIME desc
</select> </select>
<resultMap id="salaryStandardExportMap" type="com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardExportVo">
<result property="status" column="STATUS"/>
<result property="sendMonth" column="SEND_MONTH"/>
<result property="deptName" column="DEPT_NAME"/>
<result property="deptNo" column="DEPT_NO"/>
<result property="settlementAmount" column="SETTLEMENT_AMOUNT"/>
<result property="invoiceTitle" column="INVOICE_TITLE"/>
<result property="createName" column="CREATE_NAME"/>
<result property="salaryMonth" column="SALARY_MONTH"/>
<result property="formType" column="FORM_TYPE"/>
<result property="createTime" column="CREATE_TIME"/>
</resultMap>
<!--tSalaryStandard简单分页查询--> <!--tSalaryStandard简单分页查询-->
<select id="getSalaryStandardExport" resultType="com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardExportVo"> <select id="getSalaryStandardExport" resultMap="salaryStandardExportMap" parameterType="com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardSearchVo">
SELECT SELECT
a.STATUS, a.STATUS,
a.SEND_MONTH, a.SEND_MONTH,
...@@ -254,17 +266,17 @@ ...@@ -254,17 +266,17 @@
FROM t_salary_standard a FROM t_salary_standard a
<where> <where>
1=1 1=1
<include refid="where_page"/> <include refid="where_export"/>
</where> </where>
</select> </select>
<!--tSalaryStandard简单分页查询--> <!--tSalaryStandard简单分页查询-->
<select id="getSalaryStandardExportCount" resultType="java.lang.Integer"> <select id="getSalaryStandardExportCount" resultType="java.lang.Integer" parameterType="com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardSearchVo">
SELECT SELECT
count(1) count(1)
FROM t_salary_standard a FROM t_salary_standard a
<where> <where>
1=1 1=1
<include refid="where_page"/> <include refid="where_export"/>
</where> </where>
</select> </select>
<sql id="where_page"> <sql id="where_page">
...@@ -279,11 +291,33 @@ ...@@ -279,11 +291,33 @@
AND a.SALARY_MONTH = #{tSalaryStandard.salaryMonth} AND a.SALARY_MONTH = #{tSalaryStandard.salaryMonth}
</if> </if>
<if test="tSalaryStandard.status == null"> <if test="tSalaryStandard.status == null">
AND a.STATUS = 1 OR a.STATUS = 2 OR a.STATUS = 5 AND (a.STATUS = 1 OR a.STATUS = 2 OR a.STATUS = 5)
</if> </if>
<if test="tSalaryStandard.status != null"> <if test="tSalaryStandard.status != null">
AND a.STATUS = #{tSalaryStandard.status} AND a.STATUS = #{tSalaryStandard.status}
</if> </if>
</if> </if>
</sql> </sql>
<sql id="where_export">
<if test="searchVo != null">
<if test="searchVo.deptName != null and searchVo.deptName.trim() != ''">
AND a.DEPT_NAME like concat(#{'%',#{searchVo.deptName},'%')
</if>
<if test="searchVo.deptNo != null and searchVo.deptNo.trim() != ''">
AND a.DEPT_NO = #{searchVo.deptNo}
</if>
<if test="searchVo.salaryMonth != null and searchVo.salaryMonth.trim() != ''">
AND a.SALARY_MONTH = #{searchVo.salaryMonth}
</if>
<if test="searchVo.status == null">
AND (a.STATUS = 1 OR a.STATUS = 2 OR a.STATUS = 5)
</if>
<if test="searchVo.status != null">
AND a.STATUS = #{searchVo.status}
</if>
<if test="searchVo.limitStart != null">
limit #{searchVo.limitStart},#{searchVo.limitEnd}
</if>
</if>
</sql>
</mapper> </mapper>
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardSetMapper.xml
View file @ 86ffffec
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<id property="id" column="id"/> <id property="id" column="id"/>
<result property="salaryId" column="SALARY_ID"/> <result property="salaryId" column="SALARY_ID"/>
<result property="deptId" column="DEPT_ID"/> <result property="deptId" column="DEPT_ID"/>
<result property="createUser" column="CREATE_USER"/> <result property="createUser" column="CREATE_BY"/>
<result property="createTime" column="CREATE_TIME"/> <result property="createTime" column="CREATE_TIME"/>
<result property="isZero" column="IS_ZERO"/> <result property="isZero" column="IS_ZERO"/>
</resultMap> </resultMap>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
a.id, a.id,
a.SALARY_ID, a.SALARY_ID,
a.DEPT_ID, a.DEPT_ID,
a.CREATE_USER, a.CREATE_BY,
a.CREATE_TIME, a.CREATE_TIME,
a.IS_ZERO a.IS_ZERO
</sql> </sql>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
AND a.DEPT_ID = #{tSalaryStandardSet.deptId} AND a.DEPT_ID = #{tSalaryStandardSet.deptId}
</if> </if>
<if test="tSalaryStandardSet.createUser != null and tSalaryStandardSet.createUser.trim() != ''"> <if test="tSalaryStandardSet.createUser != null and tSalaryStandardSet.createUser.trim() != ''">
AND a.CREATE_USER = #{tSalaryStandardSet.createUser} AND a.CREATE_BY = #{tSalaryStandardSet.createUser}
</if> </if>
<if test="tSalaryStandardSet.createTime != null"> <if test="tSalaryStandardSet.createTime != null">
AND a.CREATE_TIME = #{tSalaryStandardSet.createTime} AND a.CREATE_TIME = #{tSalaryStandardSet.createTime}
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
View file @ 86ffffec
...@@ -969,6 +969,7 @@ public class TSocialFundInfo extends BaseEntity { ...@@ -969,6 +969,7 @@ public class TSocialFundInfo extends BaseEntity {
@ExcelAttribute(name = "公积金停缴日期", isDate = true) @ExcelAttribute(name = "公积金停缴日期", isDate = true)
@Schema(description = "公积金停缴日期" ) @Schema(description = "公积金停缴日期" )
@ExcelProperty("公积金停缴日期" ) @ExcelProperty("公积金停缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date fundReduceDate; private Date fundReduceDate;
/** /**
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 86ffffec
...@@ -823,6 +823,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -823,6 +823,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialFund.setPersonalBigailmentCardinal(null); socialFund.setPersonalBigailmentCardinal(null);
socialFund.setPersonalBigailmentPer(null); socialFund.setPersonalBigailmentPer(null);
socialFund.setPersonalBigailmentMoney(null); socialFund.setPersonalBigailmentMoney(null);
socialFund.setSocialStartDate(social.getWorkInjuryStart());
} }
if (Common.isNotNull(socialFund.getId())){ if (Common.isNotNull(socialFund.getId())){
socialFundMapper.updateById(socialFund); socialFundMapper.updateById(socialFund);
...@@ -2334,9 +2336,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2334,9 +2336,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 执行数据插入操作 组装 // 执行数据插入操作 组装
for (int i = 0; i < excelVOList.size(); i++) { for (int i = 0; i < excelVOList.size(); i++) {
socialFund = null; socialFund = null;
setInfoVo= null;
empVo= null; empVo= null;
dispatch= null;
excel = excelVOList.get(i); excel = excelVOList.get(i);
setInfoVo = getSetInfoVo(projectVoMap,excel.getDepartNo()); setInfoVo = getSetInfoVo(projectVoMap,excel.getDepartNo());
if (Common.isNotNull(socialFundMap)){ if (Common.isNotNull(socialFundMap)){
...@@ -2373,7 +2373,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2373,7 +2373,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
} }
private TDispatchInfo getDispatchInfo(DispatchEmpVo empVo, TDispatchReduceVo excel, TSocialFundInfo socialFund, ProjectSetInfoVo setInfoVo, YifuUser user) { private TDispatchInfo getDispatchInfo(DispatchEmpVo empVo,
TDispatchReduceVo excel,
TSocialFundInfo socialFund,
ProjectSetInfoVo setInfoVo,
YifuUser user) {
TDispatchInfo dispatch; TDispatchInfo dispatch;
dispatch = new TDispatchInfo(); dispatch = new TDispatchInfo();
if (Common.isNotNull(user)){ if (Common.isNotNull(user)){
...@@ -2403,7 +2407,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2403,7 +2407,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(excel.getSocialReduceDate())){ if (Common.isNotNull(excel.getSocialReduceDate())){
dispatch.setSocialHandleStatus(CommonConstants.ZERO_STRING); dispatch.setSocialHandleStatus(CommonConstants.ZERO_STRING);
dispatch.setSocialId(socialFund.getSocialId()); dispatch.setSocialId(socialFund.getSocialId());
dispatch.setSocialReduceDate(excel.getSocialReduceDate());
dispatch.setSocialProvince(socialFund.getSocialProvince()); dispatch.setSocialProvince(socialFund.getSocialProvince());
dispatch.setSocialCity(socialFund.getSocialCity()); dispatch.setSocialCity(socialFund.getSocialCity());
dispatch.setSocialTown(socialFund.getSocialTown()); dispatch.setSocialTown(socialFund.getSocialTown());
...@@ -2440,7 +2443,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2440,7 +2443,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
dispatch.setFundHandleStatus(CommonConstants.ZERO_STRING); dispatch.setFundHandleStatus(CommonConstants.ZERO_STRING);
dispatch.setFundId(socialFund.getFundId()); dispatch.setFundId(socialFund.getFundId());
dispatch.setFundReduceDate(excel.getSocialReduceDate());
dispatch.setFundProvince(socialFund.getFundProvince()); dispatch.setFundProvince(socialFund.getFundProvince());
dispatch.setFundCity(socialFund.getFundCity()); dispatch.setFundCity(socialFund.getFundCity());
dispatch.setFundTown(socialFund.getFundTown()); dispatch.setFundTown(socialFund.getFundTown());
...@@ -2697,6 +2699,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2697,6 +2699,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 作废更新：社保状态、同步预估数据 8 审核不通过直接作废 // 作废更新：社保状态、同步预估数据 8 审核不通过直接作废
sf.setSocialReduceStatus(CommonConstants.ONE_STRING_NEGATE); sf.setSocialReduceStatus(CommonConstants.ONE_STRING_NEGATE);
sf.setSocialStatus(CommonConstants.THREE_STRING); sf.setSocialStatus(CommonConstants.THREE_STRING);
sf.setSocialReduceDate(null);
} }
} }
socialMapper.updateById(socialInfo); socialMapper.updateById(socialInfo);
...@@ -2745,6 +2748,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2745,6 +2748,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 作废更新：公积金状态、同步档案的公积金状态 // 作废更新：公积金状态、同步档案的公积金状态
sf.setFundReduceStatus(CommonConstants.ONE_STRING_NEGATE); sf.setFundReduceStatus(CommonConstants.ONE_STRING_NEGATE);
sf.setFundStatus(CommonConstants.THREE_STRING); sf.setFundStatus(CommonConstants.THREE_STRING);
sf.setFundReduceDate(null);
} }
} }
fundMapper.updateById(providentFund); fundMapper.updateById(providentFund);
...@@ -3097,6 +3101,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3097,6 +3101,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialInfo.setReduceCan(CommonConstants.dingleDigitStrArray[0]);//改成可派减状态 socialInfo.setReduceCan(CommonConstants.dingleDigitStrArray[0]);//改成可派减状态
sf.setSocialReduceStatus(CommonConstants.THREE_STRING); sf.setSocialReduceStatus(CommonConstants.THREE_STRING);
sf.setSocialStatus(CommonConstants.NINE_STRING); sf.setSocialStatus(CommonConstants.NINE_STRING);
sf.setSocialReduceDate(null);
} }
socialInfo.setHandleTime(now); socialInfo.setHandleTime(now);
socialInfo.setHandleUser(user.getId()); socialInfo.setHandleUser(user.getId());
...@@ -3145,6 +3150,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3145,6 +3150,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
providentFund.setReduceCan(CommonConstants.dingleDigitStrArray[0]);//改成可派减状态 providentFund.setReduceCan(CommonConstants.dingleDigitStrArray[0]);//改成可派减状态
sf.setFundReduceStatus(CommonConstants.THREE_STRING); sf.setFundReduceStatus(CommonConstants.THREE_STRING);
sf.setFundStatus(CommonConstants.EIGHT_STRING); sf.setFundStatus(CommonConstants.EIGHT_STRING);
sf.setFundReduceDate(null);
} }
providentFund.setHandleTime(now); providentFund.setHandleTime(now);
providentFund.setHandleUser(user.getId()); providentFund.setHandleUser(user.getId());
...@@ -3226,7 +3232,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3226,7 +3232,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//1.派增办理失败 刷新预估数据 //1.派增办理失败 刷新预估数据
if (CommonConstants.ZERO_STRING.equals(dis.getType())) { if (CommonConstants.ZERO_STRING.equals(dis.getType())) {
// 全部办理失败 社保和公积金派增办理失败 减少预估 // 全部办理失败 社保和公积金派增办理失败 减少预估
if (CommonConstants.ONE_INT == flag && CommonConstants.FIVE_STRING.equals(sf.getSocialStatus())){ if (CommonConstants.ONE_INT == flag
&& (CommonConstants.FIVE_STRING.equals(sf.getSocialStatus())
|| CommonConstants.FOUR_STRING.equals(sf.getFundStatus()))){
// 派增办理，全部失败 同步预估库数据 // 派增办理，全部失败 同步预估库数据
forecastLibraryService.updateForecastLibaryByDispatchReduce(sf, forecastFlag); forecastLibraryService.updateForecastLibaryByDispatchReduce(sf, forecastFlag);
} }
...@@ -3420,7 +3428,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3420,7 +3428,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
updateSocialByHandle(flag, socialInfo, dis, sf); updateSocialByHandle(flag, socialInfo, dis, sf);
// 批量办理，或者办理选择对应的类型，修改对应的办理状态 // 批量办理，或者办理选择对应的类型，修改对应的办理状态
this.setSocialSixStatus(handleStatus, socialType, socialInfo,sf); this.setSocialSixStatus(handleStatus, socialType, socialInfo,sf);
if (CommonConstants.FOUR_STRING.equals(socialInfo.getHandleStatus())){
dis.setSocialHandleStatus(CommonConstants.THREE_STRING);
dis.setStatus(CommonConstants.TWO_STRING);
}
// HandleStatus办理状态 0 未办理 1 全部办理成功(原-已办理) 2 全部办理失败（原-办理失败） 3已派减 4办理中 5部分办理失败 // HandleStatus办理状态 0 未办理 1 全部办理成功(原-已办理) 2 全部办理失败（原-办理失败） 3已派减 4办理中 5部分办理失败
// 派减，审核不通过，社保状态不变更 // 派减，审核不通过，社保状态不变更
// 1.派减处理 // 1.派减处理
...@@ -3638,6 +3649,31 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3638,6 +3649,31 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialInfo.setBigailmentHandle(handleStatus); socialInfo.setBigailmentHandle(handleStatus);
sf.setBigailmentHandle(handleStatus); sf.setBigailmentHandle(handleStatus);
} }
// 单个办理的时候处理派单和社保的办理状态 有办理成功也有办理失败的 为办理中
if ((CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
|| CommonConstants.TWO_STRING.equals(sf.getPensionHandle())
|| CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
|| CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
|| CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
|| (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness()))
|| CommonConstants.TWO_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.TWO_STRING.equals(sf.getWorkInjuryHandle())
|| CommonConstants.TWO_STRING.equals(sf.getBirthHandle())
|| CommonConstants.TWO_STRING.equals(sf.getUnemployHandle())
|| (CommonConstants.TWO_STRING.equals(sf.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())))
&& (CommonConstants.ZERO_STRING.equals(sf.getPensionHandle())
|| CommonConstants.ZERO_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.ZERO_STRING.equals(sf.getWorkInjuryHandle())
|| CommonConstants.ZERO_STRING.equals(sf.getBirthHandle())
|| CommonConstants.ZERO_STRING.equals(sf.getUnemployHandle())
|| (CommonConstants.ZERO_STRING.equals(sf.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())))
){
socialInfo.setHandleStatus(CommonConstants.FOUR_STRING);
}
} }
/** /**
* @Author fxj * @Author fxj
......
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