fixBUG

src/com/api/bjcj220907/web/MonthBonusCountWeb.java

@@ -1,10 +1,14 @@
-package com.api.bjcj220907.web;
-
-/**
- * @author Harryxzy
- * @date 2022/09/08 13:51
- * @description 月度绩效奖金计算
- */
+//package com.api.bjcj220907.web;
+//
+//import com.engine.bjcj220907.web.MonthBonusCountController;
+//
+//import javax.ws.rs.Path;
+//
+///**
+// * @author Harryxzy
+// * @date 2022/09/08 13:51
+// * @description 月度绩效奖金计算
+// */
 //@Path("/bs/MonthBonus")
 //public class MonthBonusCountWeb extends MonthBonusCountController {
 //}

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

@@ -355,7 +355,9 @@ public class MonthBonusDAO {
         while (rs.next()){
             try {
 //                Date lzrq = sdf.parse(rs.getString("lzrq"));
-                DepartureInfo build = DepartureInfo.builder().xm(rs.getInt("xm")).lzrq(sdf.parse(rs.getString("LZRQ"))).build();
+                DepartureInfo build = new DepartureInfo();
+                build.setXm(rs.getInt("xm"));
+                build.setLzrq(sdf.parse(rs.getString("LZRQ")));
                 departure.add(build);
             } catch (ParseException e) {
                 baseBean.writeLog("离职人员信息 日期格式化错误");
@@ -376,7 +378,8 @@ public class MonthBonusDAO {
         String sql="select xm,lzrq from uf_rybs where lz=0 and sfyjhsjx=1";
         rs.execute(sql);
         while (rs.next()){
-            DepartureInfo build = DepartureInfo.builder().xm(rs.getInt("xm")).build();
+            DepartureInfo build = new DepartureInfo();
+            build.setXm(rs.getInt("xm"));
             departure.add(build);
         }
         return departure;
@@ -406,9 +409,9 @@ public class MonthBonusDAO {
                 if(StringUtils.isNotEmpty(lzrqStr)){
                     lzrq = sdf.parse(lzrqStr);
                 }
-                int rzqqts = rs.getInt("rzqqts") == -1 ? 0 : rs.getInt("rzqqts");
-                int lzqqts = rs.getInt("lzqqts") == -1 ? 0 : rs.getInt("lzqqts");
-                DepartureInfo build = DepartureInfo.builder().xm(rs.getInt("xm")).lzrq(lzrq).rzrq(rzrq).rzqqts(rzqqts ).lzqqts(lzqqts).build();
+                double rzqqts = rs.getDouble("rzqqts") == -1.0 ? 0.0 : rs.getDouble("rzqqts");
+                double lzqqts = rs.getDouble("lzqqts") == -1.0 ? 0.0 : rs.getDouble("lzqqts");
+                DepartureInfo build = new DepartureInfo(rs.getInt("xm"), lzrq, rzrq, rzqqts, lzqqts);
                 departure.add(build);
             }catch (ParseException e) {
                 baseBean.writeLog("所有人的入职日期、离职日期、其他缺勤天数 日期格式化错误");

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

@@ -51,14 +51,14 @@ public class OverseasAllowanceDAO {
                 if(jwgzdw1 == ""){
                    jwgzdw1="0";
                 }
-                if(dqbtbz == -1){
+                if(dqbtbz == -1.0){
                     dqbtbz =0.0;
                 }
-                if(btbz == -1){
+                if(btbz == -1.0){
                     // 境外工龄未满1年
                     btbz=0.0;
                 }
-                if(jsglts == -1){
+                if(jsglts == -1.0){
                     jsglts = 0.0;
                 }else{
                     jsglts = Math.floor(jsglts / 365);

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

@@ -1,10 +1,5 @@
 package com.engine.bjcj220907.entity;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.util.Date;
 
 /**
@@ -12,10 +7,6 @@ import java.util.Date;
  * @date 2022/09/15 11:19
  * @description 离职信息
  */
-@Builder
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
 public class DepartureInfo {
     /**
      * 姓名
@@ -27,6 +18,7 @@ public class DepartureInfo {
      */
     private Date lzrq;
 
+
     /**
      * 入职日期
      */
@@ -35,10 +27,61 @@ public class DepartureInfo {
     /**
      * 入职缺勤天数
      */
-    private Integer rzqqts;
+    private double rzqqts;
 
     /**
      * 离职缺勤天数
      */
-    private Integer lzqqts;
+    private double lzqqts;
+
+    public Integer getXm() {
+        return xm;
+    }
+
+    public void setXm(Integer xm) {
+        this.xm = xm;
+    }
+
+    public Date getLzrq() {
+        return lzrq;
+    }
+
+    public void setLzrq(Date lzrq) {
+        this.lzrq = lzrq;
+    }
+
+    public Date getRzrq() {
+        return rzrq;
+    }
+
+    public void setRzrq(Date rzrq) {
+        this.rzrq = rzrq;
+    }
+
+    public double getRzqqts() {
+        return rzqqts;
+    }
+
+    public void setRzqqts(double rzqqts) {
+        this.rzqqts = rzqqts;
+    }
+
+    public double getLzqqts() {
+        return lzqqts;
+    }
+
+    public void setLzqqts(double lzqqts) {
+        this.lzqqts = lzqqts;
+    }
+
+    public DepartureInfo(Integer xm, Date lzrq, Date rzrq, double rzqqts, double lzqqts) {
+        this.xm = xm;
+        this.lzrq = lzrq;
+        this.rzrq = rzrq;
+        this.rzqqts = rzqqts;
+        this.lzqqts = lzqqts;
+    }
+
+    public DepartureInfo() {
+    }
 }