From cdf976f77ecd7ecca214dddf3f73c914b62b4073 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Sun, 8 Jan 2023 16:27:00 +0800
Subject: [PATCH] =?UTF-8?q?first=20=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bjcj220907/dao/AbroadBusinessDAO.java     | 20 ++++++++++---------
 .../engine/bjcj220907/dao/MonthBonusDAO.java  |  3 +++
 .../bjcj220907/dao/OverseasAllowanceDAO.java  | 18 ++++++++++-------
 weaver-bjcj.iml                               |  4 ++--
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/com/engine/bjcj220907/dao/AbroadBusinessDAO.java b/src/com/engine/bjcj220907/dao/AbroadBusinessDAO.java
index a821149..095fe1c 100644
--- a/src/com/engine/bjcj220907/dao/AbroadBusinessDAO.java
+++ b/src/com/engine/bjcj220907/dao/AbroadBusinessDAO.java
@@ -133,12 +133,12 @@ public class AbroadBusinessDAO {
             String ccMonth = sdf2.format(result.getMonth());
             double JWJTJE = result.getJwjtbz() * result.getAbroadAllowanceDays();
             double DQCCBTJE = result.getCcbtbz() * result.getBasicAllowanceDays();
-            String sql ="insert into uf_jwccts(formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,XM,GJ,XD,XCDJ,CCYF,CCBTBZ,JWJTBZ,CCBTTS,JWJTTS,JWCCTS,FFYF,JWJTJE,DQCCBTJE,jkdqbtje,CCBTHJ)" +
+            String sql ="insert into UF_JWCCTS(formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,XM,GJ,XD,XCDJ,CCYF,CCBTBZ,JWJTBZ,CCBTTS,JWJTTS,JWCCTS,FFYF,JWJTJE,DQCCBTJE,jkdqbtje,CCBTHJ)" +
                     "values('"+fieldValue+"','1','0','"+currDate+"','"+currTime+"',"+result.getUser()+",'"+result.getGj()+"','"+result.getXd()+"','"+result.getXcdj()+"','" +ccMonth+"',"+result.getCcbtbz()+","
                     +result.getJwjtbz()+","+result.getBasicAllowanceDays()+","+result.getAbroadAllowanceDays()+","+result.getTotalDays()+",'"+sendMonth+"',"+
                     JWJTJE+","+DQCCBTJE+","+result.getJkdqbtje()+","+(JWJTJE+DQCCBTJE+result.getJkdqbtje())+")";
             rs.execute(sql);
-            String sql2 ="select max(id) as id from uf_jwccts";
+            String sql2 ="select max(id) as id from UF_JWCCTS";
             rs.execute(sql2);
             int mainId = 0;
             while (rs.next()) {
@@ -146,14 +146,16 @@ public class AbroadBusinessDAO {
             }
             // 存明细表
             List<JKDQBT> jkdqbts = result.getJkdqbts();
-            JKDQBT first = jkdqbts.get(0);
-            StringBuilder sql3 = new StringBuilder( "insert into uf_jwccts_DT1(MAINID,LCBH,BCCCTS,JKDQBZ,JKDQBTJE)" +
-                    " select "+mainId+" , '"+first.getLcbh()+"' , "+first.getDays()+" , "+first.getJkdqbtbz()+" , "+first.getJkdqbt()+" from dual");
-            for(int j=1;j<jkdqbts.size();j++){
-                JKDQBT jkdqbt = jkdqbts.get(j);
-                sql3.append(" union select "+mainId+" , '"+jkdqbt.getLcbh()+"' , "+jkdqbt.getDays()+" , "+jkdqbt.getJkdqbtbz()+" , "+jkdqbt.getJkdqbt()+ " from dual");
+            if(jkdqbts != null && jkdqbts.size() > 0){
+                JKDQBT first = jkdqbts.get(0);
+                StringBuilder sql3 = new StringBuilder( "insert into UF_JWCCTS_DT1(MAINID,LCBH,BCCCTS,JKDQBZ,JKDQBTJE)" +
+                        " select "+mainId+" , '"+first.getLcbh()+"' , "+first.getDays()+" , "+first.getJkdqbtbz()+" , "+first.getJkdqbt()+" from dual");
+                for(int j=1;j<jkdqbts.size();j++){
+                    JKDQBT jkdqbt = jkdqbts.get(j);
+                    sql3.append(" union select "+mainId+" , '"+jkdqbt.getLcbh()+"' , "+jkdqbt.getDays()+" , "+jkdqbt.getJkdqbtbz()+" , "+jkdqbt.getJkdqbt()+ " from dual");
+                }
+                rs.execute(sql3.toString());
             }
-            rs.execute(sql3.toString());
             // 权限重构
             while (rs.next()) {
                 ModeRightInfo ModeRightInfo = new ModeRightInfo();
diff --git a/src/com/engine/bjcj220907/dao/MonthBonusDAO.java b/src/com/engine/bjcj220907/dao/MonthBonusDAO.java
index 60e856e..2c02e0b 100644
--- a/src/com/engine/bjcj220907/dao/MonthBonusDAO.java
+++ b/src/com/engine/bjcj220907/dao/MonthBonusDAO.java
@@ -191,6 +191,9 @@ public class MonthBonusDAO {
         CountMonthBonus first = new CountMonthBonus();
         if(result != null && result.size()>0){
             first = result.get(0);
+        }else {
+            baseBean.writeLog("result 为空");
+            return;
         }
         Integer fieldValue = Integer.valueOf( baseBean.getPropValue("bjcjydjx", "ydjj_module_id"));
         baseBean.writeLog("获取月度绩效建模中模块id："+fieldValue);
diff --git a/src/com/engine/bjcj220907/dao/OverseasAllowanceDAO.java b/src/com/engine/bjcj220907/dao/OverseasAllowanceDAO.java
index bc5ac07..8b15aba 100644
--- a/src/com/engine/bjcj220907/dao/OverseasAllowanceDAO.java
+++ b/src/com/engine/bjcj220907/dao/OverseasAllowanceDAO.java
@@ -60,6 +60,8 @@ public class OverseasAllowanceDAO {
                 }
                 if(jsglts == -1){
                     jsglts = 0.0;
+                }else{
+                    jsglts = Math.floor(jsglts / 365);
                 }
                 if(jwgzksrqStr!=null && jwgzksrqStr.length()!=0){
                     jwgzksrq = sdf.parse(jwgzksrqStr);
@@ -236,14 +238,16 @@ public class OverseasAllowanceDAO {
                 mainId = rs.getInt("id");
             }
             List<JKDQBT> jkdqbts = result.getJkdqbts();
-            JKDQBT first = jkdqbts.get(0);
-            StringBuilder sql3 = new StringBuilder( "insert into UF_JWCZ_DT1(MAINID,LX,JKDQBTBZ,TS,JKDQBTJE,DQ)" +
-                    " select "+mainId+" , "+first.getLx()+" , "+first.getJkdqbtbz()+" , "+first.getDays()+" , "+first.getJkdqbt()+",'"+first.getJkdq()+"' from dual");
-            for(int i=1;i<jkdqbts.size();i++){
-                JKDQBT jkdqbt = jkdqbts.get(i);
-                sql3.append(" union select "+mainId+" , "+jkdqbt.getLx()+" , "+jkdqbt.getJkdqbtbz()+" , "+jkdqbt.getDays()+" , "+jkdqbt.getJkdqbt()+" , '"+jkdqbt.getJkdq() + "' from dual");
+            if(jkdqbts != null && jkdqbts.size() > 0 ){
+                JKDQBT first = jkdqbts.get(0);
+                StringBuilder sql3 = new StringBuilder( "insert into UF_JWCZ_DT1(MAINID,LX,JKDQBTBZ,TS,JKDQBTJE,DQ)" +
+                        " select "+mainId+" , "+first.getLx()+" , "+first.getJkdqbtbz()+" , "+first.getDays()+" , "+first.getJkdqbt()+",'"+first.getJkdq()+"' from dual");
+                for(int i=1;i<jkdqbts.size();i++){
+                    JKDQBT jkdqbt = jkdqbts.get(i);
+                    sql3.append(" union select "+mainId+" , "+jkdqbt.getLx()+" , "+jkdqbt.getJkdqbtbz()+" , "+jkdqbt.getDays()+" , "+jkdqbt.getJkdqbt()+" , '"+jkdqbt.getJkdq() + "' from dual");
+                }
+                rs.execute(sql3.toString());
             }
-            rs.execute(sql3.toString());
             while (rs.next()) {
                 ModeRightInfo ModeRightInfo = new ModeRightInfo();
                 ModeRightInfo.setNewRight(true);
diff --git a/weaver-bjcj.iml b/weaver-bjcj.iml
index 4828872..d278a40 100644
--- a/weaver-bjcj.iml
+++ b/weaver-bjcj.iml
@@ -7,10 +7,10 @@
           <map>
             <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
             <entry key="jrebelEnabled" value="true" />
-            <entry key="lastExternalPluginCheckTime" value="1669881081342" />
+            <entry key="lastExternalPluginCheckTime" value="1672968433903" />
           </map>
         </option>
-        <option name="version" value="10" />
+        <option name="version" value="11" />
       </configuration>
     </facet>
   </component>