Commit ea46089b authored by huyuchen's avatar huyuchen

huych-入职登记商险待办提交

parent f1269790
...@@ -276,7 +276,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -276,7 +276,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
} }
if (null != preExit.getContractSubName() && null == pre.getContractSubName()) { if (null != preExit.getContractSubName() && null == pre.getContractSubName()) {
Map<String, String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue().get( Map<String, String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue().get(
CacheConstants.DICT_DETAILS + CommonConstants.COLON_STRING + "personnel_type_sub"); CacheConstants.DICT_DETAILS + CommonConstants.COLON_STRING + "contract_business_type");
for (Map.Entry<String, String> entry : dicObj.entrySet()) { for (Map.Entry<String, String> entry : dicObj.entrySet()) {
if (Common.isNotNull(entry.getKey()) && entry.getKey().equals(preExit.getContractSubName())) { if (Common.isNotNull(entry.getKey()) && entry.getKey().equals(preExit.getContractSubName())) {
contractXfBefore = entry.getValue(); contractXfBefore = entry.getValue();
...@@ -286,7 +286,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -286,7 +286,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
} }
if (null == preExit.getContractSubName() && null != pre.getContractSubName()) { if (null == preExit.getContractSubName() && null != pre.getContractSubName()) {
Map<String, String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue().get( Map<String, String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue().get(
CacheConstants.DICT_DETAILS + CommonConstants.COLON_STRING + "personnel_type_sub"); CacheConstants.DICT_DETAILS + CommonConstants.COLON_STRING + "contract_business_type");
for (Map.Entry<String, String> entry : dicObj.entrySet()) { for (Map.Entry<String, String> entry : dicObj.entrySet()) {
if (Common.isNotNull(entry.getKey()) && entry.getKey().equals(pre.getContractSubName())) { if (Common.isNotNull(entry.getKey()) && entry.getKey().equals(pre.getContractSubName())) {
contractXfAfter = entry.getValue(); contractXfAfter = entry.getValue();
...@@ -297,7 +297,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -297,7 +297,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
if (null != preExit.getContractSubName() && null != pre.getContractSubName() if (null != preExit.getContractSubName() && null != pre.getContractSubName()
&& !preExit.getContractSubName().equals(pre.getContractSubName())) { && !preExit.getContractSubName().equals(pre.getContractSubName())) {
Map<String, String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue().get( Map<String, String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue().get(
CacheConstants.DICT_DETAILS + CommonConstants.COLON_STRING + "personnel_type_sub"); CacheConstants.DICT_DETAILS + CommonConstants.COLON_STRING + "contract_business_type");
for (Map.Entry<String, String> entry : dicObj.entrySet()) { for (Map.Entry<String, String> entry : dicObj.entrySet()) {
if (Common.isNotNull(entry.getKey()) && entry.getKey().equals(preExit.getContractSubName())) { if (Common.isNotNull(entry.getKey()) && entry.getKey().equals(preExit.getContractSubName())) {
contractXfBefore = entry.getValue(); contractXfBefore = entry.getValue();
...@@ -425,7 +425,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -425,7 +425,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
} }
if (null != comparePre.getContractSubName() && null == employeeRegistrationPre.getContractSubName()) { if (null != comparePre.getContractSubName() && null == employeeRegistrationPre.getContractSubName()) {
Map<String,String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue().get( Map<String,String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue().get(
CacheConstants.DICT_DETAILS + CommonConstants.COLON_STRING + "personnel_type_sub"); CacheConstants.DICT_DETAILS + CommonConstants.COLON_STRING + "contract_business_type");
for (Map.Entry<String,String> entry:dicObj.entrySet()){ for (Map.Entry<String,String> entry:dicObj.entrySet()){
if (Common.isNotNull(entry.getKey()) && entry.getKey().equals(comparePre.getContractSubName())){ if (Common.isNotNull(entry.getKey()) && entry.getKey().equals(comparePre.getContractSubName())){
contractXfBefore = entry.getValue(); contractXfBefore = entry.getValue();
...@@ -435,7 +435,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -435,7 +435,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
} }
if (null == comparePre.getContractSubName() && null != employeeRegistrationPre.getContractSubName()) { if (null == comparePre.getContractSubName() && null != employeeRegistrationPre.getContractSubName()) {
Map<String,String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue().get( Map<String,String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue().get(
CacheConstants.DICT_DETAILS + CommonConstants.COLON_STRING + "personnel_type_sub"); CacheConstants.DICT_DETAILS + CommonConstants.COLON_STRING + "contract_business_type");
for (Map.Entry<String,String> entry:dicObj.entrySet()){ for (Map.Entry<String,String> entry:dicObj.entrySet()){
if (Common.isNotNull(entry.getKey()) && entry.getKey().equals(employeeRegistrationPre.getContractSubName())){ if (Common.isNotNull(entry.getKey()) && entry.getKey().equals(employeeRegistrationPre.getContractSubName())){
contractXfAfter = entry.getValue(); contractXfAfter = entry.getValue();
...@@ -446,7 +446,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -446,7 +446,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
if (null != comparePre.getContractSubName() && null != employeeRegistrationPre.getContractSubName() if (null != comparePre.getContractSubName() && null != employeeRegistrationPre.getContractSubName()
&& !comparePre.getContractSubName().equals(employeeRegistrationPre.getContractSubName())) { && !comparePre.getContractSubName().equals(employeeRegistrationPre.getContractSubName())) {
Map<String,String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue().get( Map<String,String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue().get(
CacheConstants.DICT_DETAILS + CommonConstants.COLON_STRING + "personnel_type_sub"); CacheConstants.DICT_DETAILS + CommonConstants.COLON_STRING + "contract_business_type");
for (Map.Entry<String,String> entry:dicObj.entrySet()){ for (Map.Entry<String,String> entry:dicObj.entrySet()){
if (Common.isNotNull(entry.getKey()) && entry.getKey().equals(comparePre.getContractSubName())){ if (Common.isNotNull(entry.getKey()) && entry.getKey().equals(comparePre.getContractSubName())){
contractXfBefore = entry.getValue(); contractXfBefore = entry.getValue();
......
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