优化RED_DATA

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

@@ -264,6 +264,11 @@ public class SalaryAccountUtil implements Serializable {
 										sai.setSalaryMoney(cellValueBig);
 									}
 								} catch (NumberFormatException e) {
+									if (cellValueStr.length() > 500) {
+										errorFlag = false;
+										errorList.add(new ErrorMessage((i + 2), "文本超长！"));
+										continue;
+									}
 									sai.setTextValue(cellValueStr);
 								}
 								saiList.add(sai);

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TIncomeServiceImpl.java

@@ -275,14 +275,31 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 		TIncome income = new TIncome();
 		income.setEmpIdcard(tIncomeDetail.getEmpIdcard());
 		income.setDeptId(tIncomeDetail.getDeptId());
-		income.setPayMonth(tIncomeDetail.getPayMonth());
 		List<TIncome> incomeList = baseMapper.getTIncomeList(income);
+		// 不存在，直接新增
 		if (incomeList == null || incomeList.isEmpty()) {
-			BeanUtil.copyProperties(tIncomeDetail, income);
-			income.setPushStatus(CommonConstants.ZERO_STRING);
+			return this.saveIncome(tIncomeDetail);
+		} else {
+			// 核心判断
+			return this.copyCore(tIncomeDetail, incomeList);
 		}
+	}
+
+	// 复制并保存
+	private boolean saveIncome(TIncomeDetail tIncomeDetail) {
+		TIncome income = new TIncome();
+		BeanUtil.copyProperties(tIncomeDetail, income);
+		income.setPushStatus(CommonConstants.ZERO_STRING);
+		return this.save(income);
+	}
 
+	private boolean copyCore(TIncomeDetail tIncomeDetail, List<TIncome> incomeList) {
+		// 判断
+		if (CommonConstants.TWO_STRING.equals(tIncomeDetail.getFeeMode())) {
 
-		return true;
+		}
+		return false;
 	}
+
+
 }