Skip to content

Y
yifu-mvp
Commit a94c7cf7 authored by huyuchen's avatar huyuchen
Browse files
Options

Merge remote-tracking branch 'origin/MVP1.2' into MVP1.2

parents 6c59df1b 22fad489
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 32 deletions
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @ a94c7cf7
......@@ -395,14 +395,15 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
.eq(TEmployeeContractInfo::getEmpIdcard,tEmployeeProject.getEmpIdcard())
.eq(TEmployeeContractInfo::getIsObsolete,CommonConstants.ZERO_STRING)
.eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
.and(obj->obj.eq(TEmployeeContractInfo::getInUse,CommonConstants.ZERO_STRING))
.eq(TEmployeeContractInfo::getDeptNo,tEmployeeProject.getDeptNo())
.and(obj->obj.eq(TEmployeeContractInfo::getInUse,CommonConstants.ZERO_STRING)
.or()
.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.ZERO_STRING)
.or()
.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.ONE_STRING)
.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.ONE_STRING))
);
if (contractCount > CommonConstants.ZERO_INT){
return R.failed(ErrorCodes.ARCHIVES_PROJECT_CHANGE_CONTRACT_EXIST);
return R.failed(MsgUtils.getMessage(ErrorCodes.ARCHIVES_PROJECT_CHANGE_CONTRACT_EXIST));
}
tEmployeeProject.setProjectStatus(CommonConstants.dingleDigitIntArray[1]);
tEmployeeProject.setLeaveTime(LocalDateTime.now());
......@@ -581,11 +582,12 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
.eq(TEmployeeContractInfo::getEmpIdcard,tEmployeeProject.getEmpIdcard())
.eq(TEmployeeContractInfo::getIsObsolete,CommonConstants.ZERO_STRING)
.eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
.and(obj->obj.eq(TEmployeeContractInfo::getInUse,CommonConstants.ZERO_STRING))
.eq(TEmployeeContractInfo::getDeptNo,tEmployeeProject.getDeptNo())
.and(obj->obj.eq(TEmployeeContractInfo::getInUse,CommonConstants.ZERO_STRING)
.or()
.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.ZERO_STRING)
.or()
.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.ONE_STRING)
.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.ONE_STRING))
);
if (contractCount > CommonConstants.ZERO_INT){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), errorMessage +
......
yifu-check/yifu-check-api/src/main/java/com/yifu/cloud/plus/v1/check/constant/ChecksConstants.java
View file @ a94c7cf7
......@@ -8,7 +8,9 @@ package com.yifu.cloud.plus.v1.check.constant;
*/
public interface ChecksConstants {
String NACOS_CHECK_CONFIG_ERROR="nacos中checks.yaml的配置canCheck未开启！";
String NACOS_CHECK_CONFIG_ERROR="校验服务验证开关关闭！";
String CHECK_CONFIG_ACCESS="校验服务验证关闭,自动放行！";
String CODE="code";
......
yifu-check/yifu-check-api/src/main/java/com/yifu/cloud/plus/v1/check/utils/ChecksUtil.java
View file @ a94c7cf7
......@@ -13,6 +13,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
......@@ -39,8 +40,10 @@ public class ChecksUtil {
// 1.调用身份信息校验api
checkIdCardMethod(checkIdCard);
} else {
checkIdCard.setIsTrue(CommonConstants.ZERO_INT);
checkIdCard.setReason(ChecksConstants.NACOS_CHECK_CONFIG_ERROR);
//checkIdCard.setIsTrue(CommonConstants.ZERO_INT);
//checkIdCard.setReason(ChecksConstants.NACOS_CHECK_CONFIG_ERROR);
checkIdCard.setIsTrue(CommonConstants.ONE_INT);
checkIdCard.setReason(ChecksConstants.CHECK_CONFIG_ACCESS);
}
}
/**
......@@ -52,10 +55,23 @@ public class ChecksUtil {
public static R<Map<String,TCheckMobile>> checkMobile(String mobiles, boolean canCheck) {
Map<String,TCheckMobile> checkMobiles = new HashMap<>();
if (canCheck) {
// 1.调用身份信息校验api
// 1.调用手机信息校验api
return checkMobileMethod(mobiles,checkMobiles);
} else {
return R.failed(ChecksConstants.NACOS_CHECK_CONFIG_ERROR);
TCheckMobile checkMobile;
List<String> mobileList = Common.initStrToList(mobiles,CommonConstants.COMMA_STRING);
Map<String,TCheckMobile> resMap = new HashMap<>();
if (Common.isNotNull(mobileList)){
for (String m:mobileList){
checkMobile = new TCheckMobile();
checkMobile.setMobile(m);
checkMobile.setStatus(CommonConstants.ONE_STRING);
checkMobile.setType(CommonConstants.ONE_STRING);
checkMobile.setMessage(ChecksConstants.CHECK_CONFIG_ACCESS);
resMap.put(m,checkMobile);
}
}
return R.ok(resMap);
}
}
/**
......@@ -67,10 +83,17 @@ public class ChecksUtil {
**/
public static R<TCheckBankNo> checkBankNoTwo(String name, String cardNo, boolean canCheck) {
if (canCheck) {
// 1.调用身份信息校验api
// 1.调用银行卡信息校验api
return checkBankNoTwoMethod(name,cardNo);
} else {
return R.failed(ChecksConstants.NACOS_CHECK_CONFIG_ERROR);
TCheckBankNo checkBankNo = new TCheckBankNo();
checkBankNo.setBankNo(cardNo);
checkBankNo.setName(name);
checkBankNo.setMessage(ChecksConstants.CHECK_CONFIG_ACCESS);
checkBankNo.setResult("01");
checkBankNo.setType(CommonConstants.ONE_STRING);
checkBankNo.setRemark(ChecksConstants.CHECK_CONFIG_ACCESS);
return R.ok(checkBankNo);
}
}
......
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @ a94c7cf7
......@@ -97,6 +97,8 @@ archives.project.emp.not.exist=\u8BE5\u4EBA\u5458\u65E0\u5BF9\u5E94\u7684\u9879\
archives.project.change.not.exist=\u4EBA\u5458\u5728\u8BE5\u9879\u76EE\u4E0B\u5B58\u5728\u8FDB\u884C\u4E2D/\u672A\u5B8C\u7ED3\u7684\u670D\u52A1
archives.project.change.contract.exist=\u4EBA\u5458\u5728\u8BE5\u9879\u76EE\u4E0B\u5B58\u5728\u5B58\u5728\u5728\u7528\u6216\u5F85\u5BA1\u6838\u3001\u5F85\u63D0\u4EA4\u7684\u5408\u540C\uFF0C\u4E0D\u5141\u8BB8\u51CF\u9879
archives.project.emp.lose.fee.not.empty=\u4E0D\u826F\u8BB0\u5F55\u8D39\u7528\u635F\u5931\u548C\u5176\u4ED6\u635F\u5931\u4E0D\u53EF\u540C\u65F6\u4E3A\u7A7A
qt.project.change.not.exist=\u4EBA\u5458\u5728\u539F\u9879\u76EE\u4E2D\u5B58\u5728\u5728\u9014\u7684\u670D\u52A1\uFF0C\u8BF7\u5148\u7EC8\u6B62\u540E\uFF0C\u518D\u8FDB\u884C\u5212\u8F6C
......
yifu-common/yifu-common-dapr/src/main/resources/daprConfig.properties
View file @ a94c7cf7
#\u6D4B\u8BD5\u73AF\u5883-\u7BA1\u7406\u540E\u53F0
dapr.upms.appUrl=http://yifu-upms.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.upms.appUrl=http://localhost:3500/v1.0/invoke/
dapr.upms.appId=yifu-upms
#\u6D4B\u8BD5\u73AF\u5883-\u6821\u9A8C\u670D\u52A1
dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u6D4B\u8BD5\u73AF\u5883
#dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u672C\u5730
#dapr.check.appUrl=http://localhost:3502/v1.0/invoke/
dapr.check.appUrl=http://localhost:3507/v1.0/invoke/
dapr.check.appId=yifu-check
#\u6D4B\u8BD5\u73AF\u5883-\u6863\u6848\u670D\u52A1
dapr.archives.appUrl=http://yifu-archives.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u672C\u5730
dapr.archives.appUrl=http://localhost:3508/v1.0/invoke/
dapr.archives.appId=yifu-archives
dapr.insurances.appUrl=http://yifu-auth.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.insurances.appId=yifu-insurances
#\u6D4B\u8BD5\u73AF\u5883-\u85AA\u8D44\u670D\u52A1
dapr.salary.appUrl=http://yifu-salary.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.salary.appId=yifu-salary
dapr.social.appUrl=http://localhost:3510/v1.0/invoke/
dapr.social.appId=yifu-social
#\u6D4B\u8BD5\u73AF\u5883-\u793E\u4FDD\u670D\u52A1
dapr.social.appUrl=http://yifu-social.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.social.appId=yifu-social
\ No newline at end of file
#\u672C\u5730
dapr.mail.appUrl=http://localhost:3524/v1.0/invoke/
dapr.mail.appId=yifu-mail
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @ a94c7cf7
......@@ -690,7 +690,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
//累计个人养老
sdSum = sdSum.add(this.saveNewItems(saiList, SalaryConstants.SUM_PRIVATE_PENSION,
SalaryConstants.SUM_PRIVATE_PENSION_JAVA, sds.getSumPrivatePension(), CommonConstants.ZERO_INT));
a.setSumBabyMoney(sds.getSumBabyMoney());
a.setSumPrivatePension(sds.getSumBabyMoney());
//累计专项扣除总额
this.saveNewItems(saiList, SalaryConstants.SPECIAL_DEDU_MONEY_SUM,
SalaryConstants.SPECIAL_DEDU_MONEY_SUM_JAVA, sdSum, CommonConstants.ZERO_INT);
......
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @ a94c7cf7
......@@ -250,11 +250,11 @@
<if test="tSalaryStandard.createName != null and tSalaryStandard.createName.trim() != ''">
AND a.CREATE_NAME = #{tSalaryStandard.createName}
</if>
<if test="tDispatchInfo.createTimeStart != null">
AND a.CREATE_TIME <![CDATA[ >= ]]> #{tDispatchInfo.createTimeStart}
<if test="tSalaryStandard.createTimeStart != null">
AND a.CREATE_TIME <![CDATA[ >= ]]> #{tSalaryStandard.createTimeStart}
</if>
<if test="tDispatchInfo.createTimeEnd != null">
AND a.CREATE_TIME <![CDATA[ <= ]]> #{tDispatchInfo.createTimeEnd}
<if test="tSalaryStandard.createTimeEnd != null">
AND a.CREATE_TIME <![CDATA[ <= ]]> #{tSalaryStandard.createTimeEnd}
</if>
<if test="tSalaryStandard.updateBy != null and tSalaryStandard.updateBy.trim() != ''">
AND a.UPDATE_BY = #{tSalaryStandard.updateBy}
......
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