|
|
@@ -74,6 +74,22 @@ public class FinanceTblcuscolController {
|
|
|
item.setField3(list.get(2).getFieldName());
|
|
|
item.setField3Calculate(list.get(2).getNeedCalculate());
|
|
|
}
|
|
|
+ if (list.size() > 3) {
|
|
|
+ item.setField4(list.get(3).getFieldName());
|
|
|
+ item.setField4Calculate(list.get(3).getNeedCalculate());
|
|
|
+ }
|
|
|
+ if (list.size() > 4) {
|
|
|
+ item.setField5(list.get(4).getFieldName());
|
|
|
+ item.setField5Calculate(list.get(4).getNeedCalculate());
|
|
|
+ }
|
|
|
+ if (list.size() > 5) {
|
|
|
+ item.setField6(list.get(5).getFieldName());
|
|
|
+ item.setField6Calculate(list.get(5).getNeedCalculate());
|
|
|
+ }
|
|
|
+ if (list.size() > 6) {
|
|
|
+ item.setField7(list.get(6).getFieldName());
|
|
|
+ item.setField7Calculate(list.get(6).getNeedCalculate());
|
|
|
+ }
|
|
|
msg.data = item;
|
|
|
|
|
|
return msg;
|
|
|
@@ -117,6 +133,38 @@ public class FinanceTblcuscolController {
|
|
|
financeTblcuscolMapper.insert(col);
|
|
|
}
|
|
|
|
|
|
+ if (!StringUtils.isEmpty(item.getField4())) {
|
|
|
+ FinanceTblcuscol col = new FinanceTblcuscol();
|
|
|
+ col.setCompanyId(companyId);
|
|
|
+ col.setFieldName(item.getField4());
|
|
|
+ col.setNeedCalculate(item.getField4Calculate());
|
|
|
+ financeTblcuscolMapper.insert(col);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!StringUtils.isEmpty(item.getField5())) {
|
|
|
+ FinanceTblcuscol col = new FinanceTblcuscol();
|
|
|
+ col.setCompanyId(companyId);
|
|
|
+ col.setFieldName(item.getField5());
|
|
|
+ col.setNeedCalculate(item.getField5Calculate());
|
|
|
+ financeTblcuscolMapper.insert(col);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!StringUtils.isEmpty(item.getField6())) {
|
|
|
+ FinanceTblcuscol col = new FinanceTblcuscol();
|
|
|
+ col.setCompanyId(companyId);
|
|
|
+ col.setFieldName(item.getField6());
|
|
|
+ col.setNeedCalculate(item.getField6Calculate());
|
|
|
+ financeTblcuscolMapper.insert(col);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!StringUtils.isEmpty(item.getField7())) {
|
|
|
+ FinanceTblcuscol col = new FinanceTblcuscol();
|
|
|
+ col.setCompanyId(companyId);
|
|
|
+ col.setFieldName(item.getField7());
|
|
|
+ col.setNeedCalculate(item.getField7Calculate());
|
|
|
+ financeTblcuscolMapper.insert(col);
|
|
|
+ }
|
|
|
+
|
|
|
//存储自定义的固定字段
|
|
|
if (item.getMonthCost() != null || item.getBonus() != null || item.getAllowance() != null || item.getInsuranceInjury() != null
|
|
|
|| item.getInsuranceLosejob() != null || item.getInsuranceMedical() != null || item.getInsuranceOld() != null || item.getHouseFund() != null) {
|
Min