Commit 2882c321 authored by hcing's avatar hcing

feat(tcm): 添加必要证书

parent 976175b5
package com.yeejoin.amos.boot.module.tcm.api.dto; package com.yeejoin.amos.boot.module.tcm.api.dto;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -96,6 +97,15 @@ public class TzsUserInfoDto extends BaseDto { ...@@ -96,6 +97,15 @@ public class TzsUserInfoDto extends BaseDto {
@ApiModelProperty(value = "劳动合同") @ApiModelProperty(value = "劳动合同")
private String laborContract; private String laborContract;
@ApiModelProperty(value = "授权书")
private String powerAttorney;
@ApiModelProperty(value = "养老保险证明")
private String pensionInsurance;
@TableField(value = "检验人员证书")
private String inspectorCert;
@ApiModelProperty(value = "人员内部编码") @ApiModelProperty(value = "人员内部编码")
private String innerPersonCode; private String innerPersonCode;
......
...@@ -125,6 +125,24 @@ public class TzsUserInfo extends BaseEntity { ...@@ -125,6 +125,24 @@ public class TzsUserInfo extends BaseEntity {
@TableField(value = "labor_contract") @TableField(value = "labor_contract")
private String laborContract; private String laborContract;
/**
* 授权书
*/
@TableField(value = "power_attorney")
private String powerAttorney;
/**
* 养老保险证明
*/
@TableField(value = "pension_insurance")
private String pensionInsurance;
/**
* 检验人员证书
*/
@TableField(value = "inspector_cert")
private String inspectorCert;
/** /**
* 账户名 * 账户名
......
...@@ -2171,6 +2171,8 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI ...@@ -2171,6 +2171,8 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
TzBaseEnterpriseInfo enterpriseInfo = baseEnterpriseInfoService.lambdaQuery() TzBaseEnterpriseInfo enterpriseInfo = baseEnterpriseInfoService.lambdaQuery()
.eq(TzBaseEnterpriseInfo::getUseCode, company.getCompanyCode()) .eq(TzBaseEnterpriseInfo::getUseCode, company.getCompanyCode())
.one(); .one();
// 省内企业标志
boolean shanXiFlag = enterpriseInfo.getDataSources().equals(UnitDataSourceEnum.SHAANXI.getName());
List<String> unitTypes = Arrays.asList(enterpriseInfo.getUnitType().split("#")); List<String> unitTypes = Arrays.asList(enterpriseInfo.getUnitType().split("#"));
unitTypes.forEach(unitType -> { unitTypes.forEach(unitType -> {
JsonNode companyTypeNode = postData.get(unitType); JsonNode companyTypeNode = postData.get(unitType);
...@@ -2182,6 +2184,11 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI ...@@ -2182,6 +2184,11 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
postDictCodeList.add(postCode); // 主岗位 postDictCodeList.add(postCode); // 主岗位
} }
} }
// 删除操作 : 省外 使用单位/安改维单位 企业独有的【检验检测机构区域负责人】6667
Set<String> validUnitTypes = new HashSet<>(Arrays.asList("使用单位", "安装改造维修单位"));
if (shanXiFlag && validUnitTypes.contains(unitType)) {
postDictCodeList.remove("6667");
}
}); });
return this.getAllUserType().stream() return this.getAllUserType().stream()
.filter(item -> postDictCodeList.contains(item.getCode())) .filter(item -> postDictCodeList.contains(item.getCode()))
...@@ -2215,8 +2222,6 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI ...@@ -2215,8 +2222,6 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
TzBaseEnterpriseInfo enterpriseInfo = baseEnterpriseInfoService.lambdaQuery() TzBaseEnterpriseInfo enterpriseInfo = baseEnterpriseInfoService.lambdaQuery()
.eq(TzBaseEnterpriseInfo::getUseCode, company.getCompanyCode()) .eq(TzBaseEnterpriseInfo::getUseCode, company.getCompanyCode())
.one(); .one();
// 省内企业标志
boolean shanXiFlag = enterpriseInfo.getDataSources().equals(UnitDataSourceEnum.SHAANXI.getName());
List<String> unitTypes = Arrays.asList(enterpriseInfo.getUnitType().split("#")); List<String> unitTypes = Arrays.asList(enterpriseInfo.getUnitType().split("#"));
unitTypes.forEach(unitType -> { unitTypes.forEach(unitType -> {
JsonNode companyTypeNode = postData.get(unitType); JsonNode companyTypeNode = postData.get(unitType);
...@@ -2233,11 +2238,6 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI ...@@ -2233,11 +2238,6 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
allPostUnderTheUnit.putIfAbsent(postCode, subPostCode); allPostUnderTheUnit.putIfAbsent(postCode, subPostCode);
} }
} }
// 删除操作 : 省外 使用单位/安改维单位 企业独有的【检验检测机构区域负责人】6667
Set<String> validUnitTypes = new HashSet<>(Arrays.asList("使用单位", "安装改造维修单位"));
if (shanXiFlag && validUnitTypes.contains(unitType)) {
allPostUnderTheUnit.remove("6667");
}
} }
}); });
allPostUnderTheUnit.forEach((postCode, subPostCode) -> { allPostUnderTheUnit.forEach((postCode, subPostCode) -> {
......
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