艰苦地区补贴-2

src/com/engine/bjcj220907/dao/OverseasAllowanceDAO.java

@@ -25,7 +25,7 @@ public class OverseasAllowanceDAO {
      * @author Harryxzy
      * @date 2022/9/28 16:06
      */
-    public List<JwCZInfoDetail> getCZInfo() {
+    public List<JwCZInfoDetail> getCZInfo(Date startAttendanceCal,Date endAttendanceCal) {
         RecordSet rs = new RecordSet();
         //TODO 修改sqluf_bjcjtestgl
         String sql="select xm,jwgzksrq,jwgzjsrq,lx,jsglts,g.btbz,jwgzdw1, a.btbz dqbtbz " +
@@ -47,6 +47,7 @@ public class OverseasAllowanceDAO {
                 double btbz = rs.getDouble("btbz");
                 String jwgzdw1 = rs.getString("JWGZDW1");
                 double dqbtbz = rs.getDouble("DQBTBZ");
+                int lx = rs.getInt("lx");
                 if(dqbtbz == -1){
                     dqbtbz =0.0;
                 }
@@ -60,10 +61,8 @@ public class OverseasAllowanceDAO {
                 if(jwgzjsrqStr!=null && jwgzjsrqStr.length()!=0){
                     jwgzjsrq = sdf.parse(jwgzjsrqStr);
                 }
-                // 如果lx=0则补助天数为 自然日 lx=1 补助天数为区间间隔
+                JKDQBT lx1 = JKDQBT.builder().lx(rs.getInt("lx")).jkdqbtbz(dqbtbz).jkdq(Integer.valueOf(jwgzdw1)).build();
-
+                JwCZInfoDetail build = JwCZInfoDetail.builder().xm(rs.getString("xm")).lx(lx).jwczksrq(jwgzksrq).jwczjsrq(jwgzjsrq).jsglts(jsglts).glbtybz(btbz).jkdqbtbz(dqbtbz).jkdq(jwgzdw1).build();
-                JKDQBT.builder().lx(rs.getInt("lx")).jkdqbtbz(dqbtbz).jkdq(Integer.valueOf(jwgzdw1)).build();
-                JwCZInfoDetail build = JwCZInfoDetail.builder().xm(rs.getString("xm")).lx(rs.getInt("lx")).jwczksrq(jwgzksrq).jwczjsrq(jwgzjsrq).jsglts(jsglts).glbtybz(btbz).build();
                 results.add(build);
             }catch (Exception e){
                 baseBean.writeLog(e);

src/com/engine/bjcj220907/entity/JWJT.java

@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * @author Harryxzy
@@ -90,15 +89,15 @@ public class JWJT {
     private double jwgl;
 
 
-    /**
+//    /**
-     * 艰苦地区补贴总和
+//     * 艰苦地区补贴总和
-     */
+//     */
-    private double jkdqbtzh;
+//    private double jkdqbtzh;
-
+//
-    /**
+//    /**
-     * 艰苦地区补贴
+//     * 艰苦地区补贴
-     */
+//     */
-    private List<JKDQBT> jkdqbts;
+//    private List<JKDQBT> jkdqbts;
 
 
 }

src/com/engine/bjcj220907/entity/JwCZInfoDetail.java

@@ -60,4 +60,16 @@ public class JwCZInfoDetail {
     private double glbtrbz;
 
 
+
+    /**
+     * 艰苦地区补贴标准（天标准）
+     */
+    private double jkdqbtbz;
+
+    /**
+     * 艰苦地区
+     */
+    private Integer jkdq;
+
+
 }

src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java

@@ -44,15 +44,15 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse
     @Override
     public void countOverseasAllowance(Calendar countCal) {
         // 境外津贴包含：境外津贴（天标准）+境外工龄补贴（月标准）+艰苦地区补贴（天标准）
-        // 获取境外津贴(天标准) --计算当月应常驻天数
-        // 获取所有人的境外常驻信息
-        List<JwCZInfoDetail> czInfos = getOverseasAllowanceDAO().getCZInfo();
-        baseBean.writeLog("获取所有人的境外常驻信息,共:"+czInfos.size());
         // 考勤开始日期
         Calendar startAttendanceCal = BjcjCommonUtils.getStartAttendanceCal(countCal.getTime());
         // 考勤结束日期
         Calendar endAttendanceCal = BjcjCommonUtils.getEndAttendanceCal(countCal.getTime());
         baseBean.writeLog("考勤开始日期："+startAttendanceCal.getTime()+"，考勤结束日期："+endAttendanceCal);
+        // 获取境外津贴(天标准) --计算当月应常驻天数
+        // 获取所有人的境外常驻信息
+        List<JwCZInfoDetail> czInfos = getOverseasAllowanceDAO().getCZInfo(startAttendanceCal.getTime(),endAttendanceCal.getTime());
+        baseBean.writeLog("获取所有人的境外常驻信息,共:"+czInfos.size());
         // 将境外常驻信息格式化
         List<JwCZInfo> jwCZInfos = formatJwCZInfo(czInfos,startAttendanceCal,endAttendanceCal);
         baseBean.writeLog("将境外常驻信息格式化");