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

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

@@ -299,6 +299,23 @@ public class SalaryAccountUtil implements Serializable {
 									errorList.add(new ErrorMessage((i + 2), "请注意：工资发放时间，只能是【立即发】或【暂停发】！你的内容：【"+cellValueStr+"】"));
 									continue;
 								}
+								if (SalaryConstants.SALARY_STYLE.equals(scs.getJavaFiedName())
+										&& !SalaryConstants.SALARY_STYLE_YIN.equals(cellValueStr)
+										&& !SalaryConstants.SALARY_STYLE_XIAN.equals(cellValueStr)) {
+									errorFlag = false;
+									errorList.add(new ErrorMessage((i + 2), "请注意：发放方式，只能是【银行】或【现金】！你的内容：【"+cellValueStr+"】"));
+									continue;
+								}
+								if (SalaryConstants.IS_PERSON_TAX.equals(scs.getJavaFiedName())
+										&& !SalaryConstants.IS_COMPANY.equals(cellValueStr)
+										&& !SalaryConstants.IS_PERSON_OTHER.equals(cellValueStr)
+										&& !SalaryConstants.IS_PERSON.equals(cellValueStr)) {
+									errorFlag = false;
+									errorList.add(new ErrorMessage((i + 2), "请注意：是否个人承担部分税费，只能是【"
+											+SalaryConstants.IS_COMPANY+"】或【"+SalaryConstants.IS_PERSON_OTHER+"】或【"
+											+SalaryConstants.IS_PERSON+"】！你的内容：【"+cellValueStr+"】"));
+									continue;
+								}
 								setFields(field, cellValueStr, attr, fieldType, entity);
 								error = validateUtil(cellValueStr, attr, (i + 2));
 								if (null != error) {
@@ -481,6 +498,7 @@ public class SalaryAccountUtil implements Serializable {
 									continue;
 								}
 								newEmps.setSalaryGiveTime(entity.getSalaryGiveTime());
+								log.error(newEmps.getEmpName());
 								saveNewEmpList.add(newEmps);
 								checkTaxMonthList.add(newEmps.getEmpIdcard());
 							} else {
@@ -963,9 +981,14 @@ public class SalaryAccountUtil implements Serializable {
 					}
 					areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + entity.getBankCity().trim()
 							+ CommonConstants.DOWN_LINE_STRING + entity.getBankProvince().trim());
+					log.error("entity.getBankCity():"+entity.getBankCity());
+					log.error("entity.getBankProvince():"+entity.getBankProvince());
+					log.error("areaStr:"+areaStr);
 					if (Common.isNotNull(areaStr)) {
 						newEmp.setBankCity(areaStr);
+						log.error("1：areaStr:"+areaStr);
 					} else {
+						log.error("2：开户行市错误:"+areaStr);
 						error = "第" + (i + 2) + "行：" + newEmpStr + "-开户行市错误：" + entity.getBankCity();
 						errorList.add(new ErrorMessage((i + 2), error));
 						return false;

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

@@ -195,4 +195,9 @@ public class SalaryConstants {
 	public static final String TAX_MONTH_LENGTH = "计税月份错误";
 	// 暂停发java
 	public static final String SALARY_GIVE_TIME_JAVA = "salaryGiveTime";
+	public static final String SALARY_STYLE = "salaryStyle";
+	public static final String SALARY_STYLE_YIN = "银行";
+	public static final String SALARY_STYLE_XIAN = "现金";
+
+	public static final String IS_PERSON_TAX = "isPersonTax";
 }