Skip to content

Y
yifu-mvp
Commit 8ae61757 authored by hongguangwu's avatar hongguangwu
Browse files
Options

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

parents b4e74fd2 9fb3fc65
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 77 deletions
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @ 8ae61757
......@@ -2153,9 +2153,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if (Common.isEmpty(mobile)){
return true;
}
return !(baseMapper.selectCount(Wrappers.<TEmployeeInfo>query().lambda()
return baseMapper.selectCount(Wrappers.<TEmployeeInfo>query().lambda()
.eq(TEmployeeInfo::getFileStatus,CommonConstants.ZERO_STRING)
.eq(TEmployeeInfo::getDeleteFlag,CommonConstants.ZERO_STRING)) > 0);
.eq(TEmployeeInfo::getEmpPhone,mobile)
.eq(TEmployeeInfo::getDeleteFlag,CommonConstants.ZERO_STRING)) > 0;
}
private void saveContract(Map<String, EmpProjectDispatchVo> projectsMap,
......
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/ExcelAttributeConstants.java
View file @ 8ae61757
......@@ -126,6 +126,9 @@ public class ExcelAttributeConstants {
public static final String DEPARTID_PROVINCE_CITY_TOWN = "departId_province_city_town";
//派减离职原因
public static final String REDUCE_PROJECT_REASON = "reduce_project_reason";
//派减离职原因
public static final String REDUCE_SOCIAL_REASON = "social_reduce_reason";
//社保缴纳月份
public static final String SOCIAL_PAY_MONTH = "socialPayMonth";
......
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java
View file @ 8ae61757
......@@ -448,6 +448,10 @@ public interface ErrorCodes {
* 派增异常： 社保各项起缴日不一致，委托备注必填
*/
String EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR = "emp.dispatch.social.date.limit.error";
/**
* 派增异常： 社保各项起缴日不一致，委托备注必填
*/
String EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR2 = "emp.dispatch.social.date.limit.error2";
/**
* 派增异常： 社保各项起缴月份需为可补缴月份，请确认后操作
*/
......
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/util/Common.java
View file @ 8ae61757
......@@ -342,6 +342,18 @@ public class Common {
}
return obj.toString();
}
public static String isNullToString(String obj) {
if(obj == null || "".equals(obj)) {
return CommonConstants.EMPTY_STRING;
}
if(obj.trim().length() == 0) {
return CommonConstants.EMPTY_STRING;
}
if(obj.trim().equals("null")) {
return CommonConstants.EMPTY_STRING;
}
return obj;
}
/**
* 两个日期中间年份
......
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @ 8ae61757
......@@ -163,10 +163,12 @@ emp.dispatch.social.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u793E\u4FDD\u6D3
emp.dispatch.fund.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u516C\u79EF\u91D1\u6D3E\u5355\u57FA\u6570\u4E0D\u53EF\u5C0F\u4E8E\u6700\u4F4E\u57FA\u6570\u4E14\u4E0D\u53EF\u5927\u4E8E\u6700\u9AD8\u57FA\u6570
emp.dispatch.social.base.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u793E\u4FDD\u5404\u9879\u57FA\u6570\u4E0D\u4E00\u81F4\uFF0C\u59D4\u6258\u5907\u6CE8\u5FC5\u586B
emp.dispatch.social.base.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5907\u6848\u57FA\u6570\u4E0E\u793E\u4FDD\u4EFB\u610F\u57FA\u6570\u4E0D\u4E00\u81F4\uFF0C\u59D4\u6258\u5907\u6CE8\u5FC5\u586B
emp.dispatch.social.date.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u793E\u4FDD\u5404\u9879\u8D77\u7F34\u65E5\u4E0D\u4E00\u81F4\uFF0C\u59D4\u6258\u5907\u6CE8\u5FC5\u586B
emp.dispatch.social.date.limit.error2=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5408\u540C\u8D77\u59CB\u65E5\u671F\u4E0E\u793E\u4FDD\u4EFB\u610F\u8D77\u7F34\u65E5\u671F\u4E0D\u4E00\u81F4\uFF0C\u59D4\u6258\u5907\u6CE8\u5FC5\u586B
emp.dispatch.social.start.is.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u793E\u4FDD\u5404\u9879\u8D77\u7F34\u6708\u4EFD\u9700\u4E3A\u53EF\u8865\u7F34\u6708\u4EFD\uFF0C\u8BF7\u786E\u8BA4\u540E\u64CD\u4F5C\uFF01
emp.dispatch.fund.start.is.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u516C\u79EF\u91D1\u8D77\u7F34\u6708\u4EFD\u9700\u4E3A\u53EF\u8865\u7F34\u6708\u4EFD\uFF0C\u8BF7\u786E\u8BA4\u540E\u64CD\u4F5C\uFF01
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/EKPUtil.java
View file @ 8ae61757
......@@ -140,6 +140,7 @@ public class EKPUtil {
public static TInsuranceSettlePushParam InsuranceDetail2PushParam(EKPInteractiveParam param){
String format = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
TInsuranceSettlePushParam pushParam = new TInsuranceSettlePushParam();
param.setHappenDate(format);
//ekpId
if(null != param.getId() && null != param.getDefaultSettleId()){
pushParam.setFd_3afa8a70006bea(param.getId()+CommonConstants.DOWN_LINE_STRING+param.getDefaultSettleId());
......@@ -181,7 +182,7 @@ public class EKPUtil {
pushParam.setFd_3adfe7a2688902(CommonConstants.EMPTY_STRING);
}
//发生日期
pushParam.setFd_3adfe67c24dace(format);
pushParam.setFd_3adfe67c24dace(param.getHappenDate());
//姓名
pushParam.setFd_3adfe65d759650(param.getEmpName());
if(null != param.getEmpName()){
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/EKPInteractiveParam.java
View file @ 8ae61757
......@@ -85,7 +85,7 @@ public class EKPInteractiveParam implements Serializable {
* 发生日期
*/
@Schema(description = "发生日期")
private Date happenDate;
private String happenDate;
/**
* 保单编号
......@@ -156,7 +156,7 @@ public class EKPInteractiveParam implements Serializable {
/**
* 单据状态
*/
@Schema(description = "状态:1新增结算单,2更新保单信息,3作废结算信息")
@Schema(description = "状态:1新增结算单,2更新结算单信息,3作废结算单信息")
private Integer interactiveType;
}
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryConfigStandard.java
View file @ 8ae61757
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
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.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.Data;
import lombok.EqualsAndHashCode;
......@@ -25,7 +26,7 @@ import java.time.LocalDateTime;
@EqualsAndHashCode(callSuper = true)
@TableName("t_salary_config_standard")
@Tag(name = "薪资识别配置（标准模板）")
public class TSalaryConfigStandard extends Model<TSalaryConfigStandard> implements Serializable {
public class TSalaryConfigStandard extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
......@@ -80,23 +81,6 @@ public class TSalaryConfigStandard extends Model<TSalaryConfigStandard> implemen
@ExcelAttribute(name = "是否进行计算扣税", isNotEmpty = true, errorInfo = "是否进行计算扣税不能为空")
private Integer isTax;
/**
* 创建人
*/
@ExcelProperty(value = "创建人")
@Length(max = 32, message = "创建人不能超过32个字符")
@NotBlank(message = "创建人不能为空")
@ExcelAttribute(name = "创建人", isNotEmpty = true, errorInfo = "创建人不能为空", maxLength = 32)
private String createUser;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
@NotBlank(message = "创建时间不能为空")
@ExcelAttribute(name = "创建时间", isNotEmpty = true, errorInfo = "创建时间不能为空")
private LocalDateTime createTime;
/**
* 排序项
*/
......
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryStandardExportVo.java
View file @ 8ae61757
......@@ -27,7 +27,7 @@ public class TSalaryStandardExportVo implements Serializable {
*/
@ExcelAttribute(name = "状态（0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印）")
@NotBlank(message = "状态（0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印）不能为空")
@ExcelProperty("状态（0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印）")
@ExcelProperty("状态）")
private Integer status;
/**
* 推送月份（YYYYMM）
......
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryStandardSearchVo.java
View file @ 8ae61757
......@@ -30,7 +30,7 @@ import java.time.LocalDateTime;
* @date 2022-08-05 11:40:14
*/
@Data
public class TSalaryStandardSearchVo extends TSalaryStandard implements Serializable {
public class TSalaryStandardSearchVo extends TSalaryStandard{
/**
* 多选导出或删除等操作
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryConfigStandardController.java
View file @ 8ae61757
......@@ -110,7 +110,7 @@ public class TSalaryConfigStandardController {
* @param tSalaryConfigStandard
* @return R
*/
@Operation(description = "新增")
@Operation(description = "新增 wxhr:tsalaryconfigstandard_add")
@SysLog("新增薪资识别配置（标准模板）")
@PostMapping
@PreAuthorize("@pms.hasPermission('wxhr:tsalaryconfigstandard_add')")
......@@ -121,7 +121,7 @@ public class TSalaryConfigStandardController {
}
// 填充个人代扣等java字段
this.setJavaFiedName(tSalaryConfigStandard);
tSalaryConfigStandard.setCreateUser(String.valueOf(user.getId()));
tSalaryConfigStandard.setCreateBy(String.valueOf(user.getId()));
tSalaryConfigStandard.setCreateTime(LocalDateTime.now());
tSalaryConfigStandard.setIsMustNeed(CommonConstants.ZERO_STRING);
tSalaryConfigStandard.setModelType(CommonConstants.ONE_STRING);
......@@ -135,7 +135,7 @@ public class TSalaryConfigStandardController {
* @param tSalaryConfigStandard
* @return R
*/
@Operation(description = "修改")
@Operation(description = "修改 wxhr:tsalaryconfigstandard_edit")
@SysLog("修改薪资识别配置（标准模板）")
@PutMapping
@PreAuthorize("@pms.hasPermission('wxhr:tsalaryconfigstandard_edit')")
......@@ -146,7 +146,7 @@ public class TSalaryConfigStandardController {
}
// 填充个人代扣等java字段
this.setJavaFiedName(tSalaryConfigStandard);
if (String.valueOf(user.getId()).equals(tSalaryConfigStandard.getCreateUser())) {
if (String.valueOf(user.getId()).equals(tSalaryConfigStandard.getCreateBy())) {
return new R<>(tSalaryConfigStandardService.updateById(tSalaryConfigStandard));
} else {
return R.failed("不可修改非自己创建的！");
......@@ -176,7 +176,7 @@ public class TSalaryConfigStandardController {
* @param id
* @return R
*/
@Operation(description = "删除")
@Operation(description = "删除 wxhr:tsalaryconfigstandard_del")
@SysLog("删除薪资识别配置（标准模板）")
@DeleteMapping("/{id}")
@PreAuthorize("@pms.hasPermission('wxhr:tsalaryconfigstandard_del')")
......@@ -186,7 +186,7 @@ public class TSalaryConfigStandardController {
return R.failed(NO_USER);
}
TSalaryConfigStandard sc = tSalaryConfigStandardService.getById(id);
if (String.valueOf(user.getId()).equals(sc.getCreateUser())) {
if (String.valueOf(user.getId()).equals(sc.getCreateBy())) {
return new R<>(tSalaryConfigStandardService.removeById(id));
} else {
return R.failed("不可删除非自己创建的！");
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryStandardMapper.java
View file @ 8ae61757
......@@ -52,5 +52,5 @@ public interface TSalaryStandardMapper extends BaseMapper<TSalaryStandard> {
List<TSalaryStandardExportVo> getSalaryStandardExport(@Param("searchVo") TSalaryStandardSearchVo searchVo);
int getSalaryStandardExportCount(TSalaryStandardSearchVo searchVo);
int getSalaryStandardExportCount(@Param("searchVo")TSalaryStandardSearchVo searchVo);
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @ 8ae61757
......@@ -93,7 +93,6 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
response.setCharacterEncoding("utf-8");
response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
// 这里 需要指定写用哪个class去写，然后写到第一个sheet，然后文件流会自动关闭
//EasyExcel.write(out, TEmpBadRecord.class).sheet("不良记录").doWrite(list);
ExcelWriter excelWriter = EasyExcel.write(out, TSalaryStandardExportVo.class).build();
int index = 0;
if (count > CommonConstants.ZERO_INT) {
......@@ -153,7 +152,6 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
public R<List<ErrorMessage>> importDiy(InputStream inputStream) {
List<ErrorMessage> errorMessageList = new ArrayList<>();
ExcelUtil<TSalaryStandardVo> util1 = new ExcelUtil<>(TSalaryStandardVo.class);
;
// 写法2：
// 匿名内部类 不用额外写一个DemoDataListener
// 这里 需要指定读用哪个class去读，然后读取第一个sheet 文件流会自动关闭
......
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryConfigStandardMapper.xml
View file @ 8ae61757
......@@ -12,7 +12,7 @@
<result property="modelType" column="MODEL_TYPE"/>
<result property="isMustNeed" column="IS_MUST_NEED"/>
<result property="isTax" column="IS_TAX"/>
<result property="createUser" column="CREATE_USER"/>
<result property="createBy" column="CREATE_BY"/>
<result property="createTime" column="CREATE_TIME"/>
<result property="orderLine" column="order_line"/>
</resultMap>
......@@ -37,8 +37,8 @@
<if test="tSalaryConfigStandard.isMustNeed != null and tSalaryConfigStandard.isMustNeed.trim() != ''">
AND IS_MUST_NEED = #{tSalaryConfigStandard.isMustNeed}
</if>
<if test="tSalaryConfigStandard.createUser != null and tSalaryConfigStandard.createUser.trim() != ''">
AND CREATE_USER = #{tSalaryConfigStandard.createUser}
<if test="tSalaryConfigStandard.createBy != null and tSalaryConfigStandard.createBy.trim() != ''">
AND CREATE_BY = #{tSalaryConfigStandard.createBy}
</if>
<if test="tSalaryConfigStandard.createTime != null">
AND CREATE_TIME = #{tSalaryStandard.createTime}
......@@ -56,7 +56,7 @@
MODEL_TYPE,
IS_MUST_NEED,
IS_TAX,
CREATE_USER,
CREATE_BY,
CREATE_TIME
FROM t_salary_config_standard
<where>
......
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @ 8ae61757
......@@ -267,10 +267,15 @@
<where>
1=1
<include refid="where_export"/>
<if test="searchVo != null">
<if test="searchVo.limitStart != null">
limit #{searchVo.limitStart},#{searchVo.limitEnd}
</if>
</if>
</where>
</select>
<!--tSalaryStandard简单分页查询-->
<select id="getSalaryStandardExportCount" resultType="java.lang.Integer" parameterType="com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardSearchVo">
<select id="getSalaryStandardExportCount" resultType="java.lang.Integer">
SELECT
count(1)
FROM t_salary_standard a
......@@ -315,9 +320,6 @@
<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>
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchReduceVo.java
View file @ 8ae61757
......@@ -92,7 +92,7 @@ public class TDispatchReduceVo extends RowIndex implements Serializable {
/**
* 减少原因
*/
@ExcelAttribute(name = "减少原因",isNotEmpty = true, isDataId = true,dataType = ExcelAttributeConstants.REDUCE_PROJECT_REASON)
@ExcelAttribute(name = "减少原因",isNotEmpty = true, isDataId = true,dataType = ExcelAttributeConstants.REDUCE_SOCIAL_REASON)
@Schema(description = "减少原因" )
@ExcelProperty("减少原因" )
private String reasonType;
......
yifu-social/yifu-social-biz/pom.xml
View file @ 8ae61757
......@@ -84,6 +84,12 @@
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>yifu-salary-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 8ae61757
......@@ -2158,7 +2158,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (!CommonConstants.ONE_STRING.equals(excel.getPaymentType()) && Common.isEmpty(excel.getTrustRemark())
&& !temp.equals(excel.getPensionStart())
){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR)));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR2)));
return true;
}
......@@ -2410,6 +2410,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch.setSocialProvince(socialFund.getSocialProvince());
dispatch.setSocialCity(socialFund.getSocialCity());
dispatch.setSocialTown(socialFund.getSocialTown());
dispatch.setSocialReduceDate(excel.getSocialReduceDate());
socialFund.setSocialReduceStatus(CommonConstants.ZERO_STRING);
socialFund.setSocialReduceDate(excel.getSocialReduceDate());
socialFund.setSocialReduceStatus(CommonConstants.ZERO_STRING);
......@@ -2446,6 +2447,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch.setFundProvince(socialFund.getFundProvince());
dispatch.setFundCity(socialFund.getFundCity());
dispatch.setFundTown(socialFund.getFundTown());
dispatch.setFundReduceDate(excel.getFundReduceDate());
socialFund.setFundReduceDate(excel.getFundReduceDate());
socialFund.setFundStatus(CommonConstants.FIVE_STRING);
socialFund.setFundReduceStatus(CommonConstants.ZERO_STRING);
......@@ -2608,7 +2610,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
auditInfo.setId(null);
auditInfo.setAuditStatus(handleStatus);
auditInfo.setAuditRemark(Common.isBlankToNullString(remark));
auditInfo.setAuditRemark(Common.isNullToString(remark));
auditInfo.setTitle(tile);
auditInfo.setOrganName(user.getDeptName());
auditInfo.setAuditUser(user.getNickname());
......@@ -2763,10 +2765,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
// 派单状态信息拼接
if (CommonConstants.ZERO_INT == flag) {
remarkTemp += "审核通过：" + Common.isBlankToNullString(auditRemark);
remarkTemp += "审核通过：" + Common.isNullToString(auditRemark);
initAuditInfo(auditInfo, remarkTemp, CommonConstants.ONE_STRING, user,remarkTemp,remark);
} else {
remarkTemp += "审核不通过：" + Common.isBlankToNullString(auditRemark);
remarkTemp += "审核不通过：" + Common.isNullToString(auditRemark);
initAuditInfo(auditInfo, remarkTemp, CommonConstants.TWO_STRING, user,remarkTemp, remark);
}
//记录处理意见到派单 最新的意见会覆盖之前的，详情 到流程中查询
......@@ -2885,7 +2887,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} else {
return R.failed("派单审核状态参数异常：0待审核 1审核通过 2审核不通过");
}
List<ErrorMessage> errorInfo = addBatchApplyAudit(Common.initStrToList(ids, CommonConstants.COMMA_STRING), user, flag, auditStatus, Common.isBlankToNullString(auditRemark),remark);
List<ErrorMessage> errorInfo = addBatchApplyAudit(Common.initStrToList(ids, CommonConstants.COMMA_STRING), user, flag, auditStatus, Common.isNullToString(auditRemark),remark);
return R.ok(errorInfo,"派单审核结果：");
} catch (Exception e) {
log.error("派单审核异常：" + e.getMessage());
......@@ -2914,7 +2916,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return R.failed("派单办理状态参数异常：0待办理 1办理通过 2办理不通过");
}
List<ErrorMessage> errorInfo = addBatchApplyHandle(Common.initStrToList(ids, CommonConstants.COMMA_STRING)
, typeSub, user, flag, handleStatus, Common.isBlankToNullString(handleRemark), socialType,remark);
, typeSub, user, flag, handleStatus, Common.isNullToString(handleRemark), socialType,remark);
if (errorInfo == null || errorInfo.isEmpty()) {
return R.ok(null,"办理成功！");
} else {
......@@ -3428,10 +3430,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
updateSocialByHandle(flag, socialInfo, dis, sf);
// 批量办理，或者办理选择对应的类型，修改对应的办理状态
this.setSocialSixStatus(handleStatus, socialType, socialInfo,sf);
if (CommonConstants.FOUR_STRING.equals(socialInfo.getHandleStatus())){
dis.setSocialHandleStatus(CommonConstants.THREE_STRING);
dis.setStatus(CommonConstants.TWO_STRING);
}
boolean handleing = CommonConstants.FOUR_STRING.equals(socialInfo.getHandleStatus());
// HandleStatus办理状态 0 未办理 1 全部办理成功(原-已办理) 2 全部办理失败（原-办理失败） 3已派减 4办理中 5部分办理失败
// 派减，审核不通过，社保状态不变更
// 1.派减处理
......@@ -3444,7 +3443,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialInfo.setUnemployHandle(CommonConstants.THREE_STRING);
socialInfo.setWorkInjuryHandle(CommonConstants.THREE_STRING);
socialInfo.setBirthHandle(CommonConstants.THREE_STRING);
socialInfo.setBigailmentHandle(CommonConstants.THREE_STRING);
socialInfo.setHandleStatus(CommonConstants.THREE_STRING);
socialInfo.setReduceCan(CommonConstants.dingleDigitStrArray[1]);//改成不可派减状态
sf.setSocialReduceStatus(CommonConstants.TWO_STRING);
......@@ -3454,8 +3452,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
sf.setUnemployHandle(CommonConstants.THREE_STRING);
sf.setWorkInjuryHandle(CommonConstants.THREE_STRING);
sf.setBirthHandle(CommonConstants.THREE_STRING);
sf.setBigailmentHandle(CommonConstants.THREE_STRING);
sf.setHandleStatus(CommonConstants.THREE_STRING);
if (CommonConstants.ZERO_STRING.equals(socialInfo.getIsIllness())){
sf.setBigailmentHandle(CommonConstants.THREE_STRING);
socialInfo.setBigailmentHandle(CommonConstants.THREE_STRING);
}
}
//办理失败不做处理,只更新社保公积金查询状态
if (CommonConstants.ONE_INT == flag){
......@@ -3506,6 +3507,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
sf.setSocialStatus(CommonConstants.TWO_STRING);
sf.setSocialAddStatus(CommonConstants.SIX_STRING);
dis.setSocialHandleStatus(CommonConstants.FOUR_STRING);
dis.setStatus(CommonConstants.TWO_STRING);
//排除兼职工伤的情况
} else {
// 其他：部分办理失败
......@@ -3515,6 +3517,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
sf.setSocialAddStatus(CommonConstants.THREE_STRING);
dis.setSocialHandleStatus(CommonConstants.THREE_STRING);
}
if (handleing){
dis.setSocialHandleStatus(CommonConstants.FOUR_STRING);
dis.setStatus(CommonConstants.TWO_STRING);
socialInfo.setHandleStatus(CommonConstants.FOUR_STRING);
socialInfo.setReduceCan(CommonConstants.dingleDigitStrArray[1]);//改成不可派减状态
sf.setSocialStatus(CommonConstants.TWO_STRING);
sf.setSocialAddStatus(CommonConstants.SIX_STRING);
}
}
}
......@@ -3650,27 +3660,27 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
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())))
if ((CommonConstants.ONE_STRING.equals(socialInfo.getPensionHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getPensionHandle())
|| CommonConstants.ONE_STRING.equals(socialInfo.getMedicalHandle())
|| CommonConstants.ONE_STRING.equals(socialInfo.getWorkInjuryHandle())
|| CommonConstants.ONE_STRING.equals(socialInfo.getBirthHandle())
|| CommonConstants.ONE_STRING.equals(socialInfo.getUnemployHandle())
|| (CommonConstants.ONE_STRING.equals(socialInfo.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(socialInfo.getIsIllness()))
|| CommonConstants.TWO_STRING.equals(socialInfo.getMedicalHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getWorkInjuryHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getBirthHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getUnemployHandle())
|| (CommonConstants.TWO_STRING.equals(socialInfo.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(socialInfo.getIsIllness())))
&& (CommonConstants.ZERO_STRING.equals(socialInfo.getPensionHandle())
|| CommonConstants.ZERO_STRING.equals(socialInfo.getMedicalHandle())
|| CommonConstants.ZERO_STRING.equals(socialInfo.getWorkInjuryHandle())
|| CommonConstants.ZERO_STRING.equals(socialInfo.getBirthHandle())
|| CommonConstants.ZERO_STRING.equals(socialInfo.getUnemployHandle())
|| (CommonConstants.ZERO_STRING.equals(socialInfo.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(socialInfo.getIsIllness())))
){
socialInfo.setHandleStatus(CommonConstants.FOUR_STRING);
}
......
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