Merge remote-tracking branch 'origin/master'

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryEmployee.java

@@ -205,4 +205,8 @@ public class TSalaryEmployee extends BaseEntity {
 	@TableField(exist = false)
 	private Integer lineNums;
 
+	// 是否暂停发0立即发、1暂停发
+	@TableField(exist = false)
+	private String salaryGiveTime;
+
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java

@@ -299,7 +299,11 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 			List<String> phoneList = new ArrayList<>();
 			TCheckBankNo checkBankNo;
 			for (TSalaryEmployee employee : saveNewEmpList) {
-				if (Common.isNotNull(employee.getBankNo()) && (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))) {
+				if (Common.isNotNull(employee.getBankNo())
+						&& (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))
+						&& (Common.isEmpty(employee.getSalaryGiveTime())
+						|| CommonConstants.ZERO_STRING.equals(employee.getSalaryGiveTime())
+						|| (CommonConstants.ONE_STRING.equals(employee.getSalaryGiveTime()) && Common.isNotNull(employee.getBankNo())))) {
 					checkBankNo = new TCheckBankNo();
 					checkBankNo.setName(employee.getEmpName());
 					checkBankNo.setBankNo(employee.getBankNo());
@@ -330,14 +334,20 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 
 			boolean isFalse = false;
 			for (TSalaryEmployee employee : saveNewEmpList) {
-				if (bankMap.get(employee.getBankNo()) != null) {
-					if (Boolean.FALSE.equals(bankMap.get(employee.getBankNo()))) {
-						errorList.add(new ErrorMessage((employee.getLineNums() + 2), "第" + (employee.getLineNums() + 2) + "行：该员工新建失败：【姓名与卡号验证：认证不一致】"));
+				if (Common.isNotNull(employee.getBankNo())
+						&& (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))
+						&& (Common.isEmpty(employee.getSalaryGiveTime())
+							|| CommonConstants.ZERO_STRING.equals(employee.getSalaryGiveTime())
+							|| (CommonConstants.ONE_STRING.equals(employee.getSalaryGiveTime()) && Common.isNotNull(employee.getBankNo())))) {
+					if (bankMap.get(employee.getBankNo()) != null) {
+						if (Boolean.FALSE.equals(bankMap.get(employee.getBankNo()))) {
+							errorList.add(new ErrorMessage((employee.getLineNums() + 2), "第" + (employee.getLineNums() + 2) + "行：该员工新建失败：【姓名与卡号验证：认证不一致】"));
+							isFalse = true;
+						}
+					} else {
+						errorList.add(new ErrorMessage((employee.getLineNums() + 2), "第" + (employee.getLineNums() + 2) + "行：该员工新建失败：【姓名与卡号验证：" + SalaryConstants.CHECK_NO_RESPONSE + "】"));
 						isFalse = true;
 					}
-				} else {
-					errorList.add(new ErrorMessage((employee.getLineNums() + 2), "第" + (employee.getLineNums() + 2) + "行：该员工新建失败：【姓名与卡号验证：" + SalaryConstants.CHECK_NO_RESPONSE + "】"));
-					isFalse = true;
 				}
 				if (phoneMap.get(employee.getEmpPhone()) != null) {
 					if (Boolean.FALSE.equals(phoneMap.get(employee.getEmpPhone()))) {

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java

@@ -473,6 +473,7 @@ public class SalaryAccountUtil implements Serializable {
 										, entity.getSaiList())) {
 									continue;
 								}
+								newEmps.setSalaryGiveTime(entity.getSalaryGiveTime());
 								saveNewEmpList.add(newEmps);
 								checkTaxMonthList.add(newEmps.getEmpIdcard());
 							} else {

yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml

@@ -103,8 +103,8 @@
 		<result property="isIncomeStatus" column="IS_INCOME_STATUS"/>
 		<result property="incomeSettleFlag" column="INCOME_SETTLE_FLAG"/>
 		<result property="incomeCollectFlag" column="INCOME_COLLECT_FLAG"/>
-		<result property="paySettleFlag" column="PAY_COLLECT_FLAG"/>
-		<result property="payCollectFlag" column="PAY_SETTLE_FLAG"/>
+		<result property="paySettleFlag" column="PAY_SETTLE_FLAG"/>
+		<result property="payCollectFlag" column="PAY_COLLECT_FLAG"/>
 	</resultMap>
 	<resultMap id="tPaymentInfoSumMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoExportVo">
 		<result property="empName" column="EMP_NAME"/>