diff --git a/src/com/engine/bjcj220907/web/MonthBonusCountController.java b/src/com/engine/bjcj220907/web/MonthBonusCountController.java index 17160ff..ee6d445 100644 --- a/src/com/engine/bjcj220907/web/MonthBonusCountController.java +++ b/src/com/engine/bjcj220907/web/MonthBonusCountController.java @@ -13,6 +13,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.Map; +import java.util.Objects; /** * @author Harryxzy @@ -43,18 +44,19 @@ public class MonthBonusCountController extends AbstractModeExpandJavaCodeNew { try { User user = (User)param.get("user"); Map jsonStr = JSON.parseObject((String) param.get("JSONStr"), Map.class); - int i=1; String sendM = ""; String bonusM = ""; + BaseBean bb = new BaseBean(); + String ffyfStr = "field" + Integer.valueOf( bb.getPropValue("bjcjydjx", "ffyf_field_id")); + String ssyfStr = "field" + Integer.valueOf( bb.getPropValue("bjcjydjx", "ssyf_field_id")); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); for (Map.Entry entry : jsonStr.entrySet()) { - if(i==1){ + if(Objects.equals(ffyfStr,entry.getKey())){ sendM = entry.getValue(); - } - if(i==2){ + }else if(Objects.equals(ssyfStr,entry.getKey())){ bonusM = entry.getValue(); } - i++; } CountMonthBonusParam countParam = CountMonthBonusParam.builder().bonusMonth(sdf.parse(bonusM)).bonusSendMonth(sdf.parse(sendM)).build(); baseBean.writeLog("开始核算绩效,绩效所属月:"+bonusM+",绩效发放月:"+sendM);