From 03189347242ffa681b1b6ff1b64a04ba9dfa8ff5 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Tue, 21 Feb 2023 10:06:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=A9=E6=95=88=E5=8F=91=E6=94=BE=E6=9C=88?=
 =?UTF-8?q?=E4=BB=BD=EF=BC=8C=E7=BB=A9=E6=95=88=E6=89=80=E5=B1=9E=E6=9C=88?=
 =?UTF-8?q?=E4=BB=BD=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bjcj220907/web/MonthBonusCountController.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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<String,String> 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<String, String> 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);