update...

潘钊
1 parent e5f79a2a
Showing 5 changed files with 54 additions and 21 deletions
src/main/java/com/bsth/server_ws/attendance/AttendanceService.java
src/main/java/com/bsth/server_ws/attendance/AttendanceServiceSoap.java
src/main/java/com/bsth/server_ws/attendance/entity/NH_jsy_attendance.java → src/main/java/com/bsth/server_ws/attendance/entity/Jsy_attendance.java
src/main/java/com/bsth/server_ws/util/ScheduleCalculator.java
src/main/java/com/bsth/server_ws/util/WSDataConver.java
 package com.bsth.server_ws.attendance;
  
-import com.bsth.server_ws.attendance.entity.NH_jsy_attendance;
+import com.bsth.server_ws.attendance.entity.Jsy_attendance;
  
 import javax.jws.WebParam;
 import javax.jws.WebService;
@@ -19,15 +19,15 @@ public interface AttendanceService {
      * 驾驶员考勤信息
      * @param password
      * @param rq
-     * @param ddy_id 调度员ID
+     * @param company 公司编码
      * @param result
      * @param fError
      * @return
      */
-    boolean jsy_attendance_NH(
+    boolean jsy_attendance(
             @WebParam(name = "password") String password,
             @WebParam(name = "rq") String rq,
-            @WebParam(name = "ddy_id") String ddy_id,
-            @WebParam(name = "resultArray", mode = WebParam.Mode.INOUT) Holder<NH_jsy_attendance[]> result,
+            @WebParam(name = "company") String company,
+            @WebParam(name = "resultArray", mode = WebParam.Mode.INOUT) Holder<Jsy_attendance[]> result,
             @WebParam(name = "fError", mode = WebParam.Mode.INOUT) Holder<String> fError);
 }
@@ -4,10 +4,11 @@ import com.bsth.entity.SchedulePlanInfo;
 import com.bsth.entity.ScheduleRealInfo;
 import com.bsth.redis.PlanScheduleRedisService;
 import com.bsth.redis.ScheduleRedisService;
+import com.bsth.server_ws.WebServiceProxy;
+import com.bsth.server_ws.attendance.entity.Jsy_attendance;
+import com.bsth.server_ws.util.WSDataConver;
 import com.bsth.service.DDYAuthorityService;
 import com.bsth.service.UserService;
-import com.bsth.server_ws.attendance.entity.NH_jsy_attendance;
-import com.bsth.server_ws.util.WSDataConver;
 import org.slf4j.Logger;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
@@ -42,7 +43,7 @@ public class AttendanceServiceSoap implements AttendanceService, ApplicationCont
     static UserService userService;
  
     @Override
-    public boolean jsy_attendance_NH(String password, String rq, String ddy_id, Holder<NH_jsy_attendance[]> result, Holder<String> fError) {
+    public boolean jsy_attendance(String password, String rq, String company, Holder<Jsy_attendance[]> result, Holder<String> fError) {
         try {
             if(userService.get(password) == null){
                 fError.value = "无效的密码！";
@@ -50,7 +51,9 @@ public class AttendanceServiceSoap implements AttendanceService, ApplicationCont
             }
  
             //该调度员分管的线路
-            List<String> lineArray = ddyAuthorityService.findLinesByDDY(ddy_id);
+            //List<String> lineArray = ddyAuthorityService.findLinesByDDY(ddy_id);
+            //按公司编码获取线路
+            List<String> lineArray = WebServiceProxy.findLinesByCompany(company);
             //计划排班
             List<SchedulePlanInfo> plans = planScheduleRedisService.findByMultiLine(lineArray, rq);
             //实际排班
@@ -4,11 +4,17 @@ package com.bsth.server_ws.attendance.entity;
  * 南汇驾驶员考勤
  * Created by panzhao on 2017/3/27.
  */
-public class NH_jsy_attendance {
+public class Jsy_attendance {
  
     /** 日期 */
     private String rq;
  
+    /** 公司编码 */
+    private String company;
+
+    /** 分公司编码 */
+    private String fgsCompany;
+
     /** 线路编码 */
     private String xlBm;
  
@@ -109,4 +115,20 @@ public class NH_jsy_attendance {
     public void setStatus(String status) {
         this.status = status;
     }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getFgsCompany() {
+        return fgsCompany;
+    }
+
+    public void setFgsCompany(String fgsCompany) {
+        this.fgsCompany = fgsCompany;
+    }
 }
@@ -443,12 +443,16 @@ public class ScheduleCalculator {
             }
         }
  
-        if(sets.size() == 1)
-            return sets.iterator().next();
-        else if(sets.size() > 1)
-            return Joiner.on(",").join(sets);
-        else
+        try{
+            if(sets.size() == 1)
+                return sets.iterator().next();
+            else if(sets.size() > 1)
+                return Joiner.on(",").join(sets);
+            else
+                return "";
+        }catch (NullPointerException e){
             return "";
+        }
     }
  
     /**
@@ -4,10 +4,10 @@ import com.bsth.entity.DutyEmployee;
 import com.bsth.entity.OilInfo;
 import com.bsth.entity.SchedulePlanInfo;
 import com.bsth.entity.ScheduleRealInfo;
+import com.bsth.server_ws.attendance.entity.Jsy_attendance;
+import com.bsth.server_ws.waybill.entity.*;
 import com.bsth.util.Arith;
 import com.bsth.util.ConvertUtil;
-import com.bsth.server_ws.attendance.entity.NH_jsy_attendance;
-import com.bsth.server_ws.waybill.entity.*;
 import com.google.common.collect.ArrayListMultimap;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -537,18 +537,18 @@ public class WSDataConver {
      * @param types
      * @return
      */
-    public static NH_jsy_attendance[] to_jsyAttendanceNH(List<SchedulePlanInfo> plans, List<ScheduleRealInfo> reals, Map<String, String> types, String rq) {
+    public static Jsy_attendance[] to_jsyAttendanceNH(List<SchedulePlanInfo> plans, List<ScheduleRealInfo> reals, Map<String, String> types, String rq) {
         List<String> ghArray = new ArrayList<>(types.keySet());
-        NH_jsy_attendance[] rs = new NH_jsy_attendance[ghArray.size()];
+        Jsy_attendance[] rs = new Jsy_attendance[ghArray.size()];
  
-        NH_jsy_attendance attendance;
+        Jsy_attendance attendance;
         SchedulePlanInfo plan;
         ScheduleRealInfo real;
         String jGh;
         for(int i = 0; i < ghArray.size(); i ++){
             jGh = ghArray.get(i);
  
-            attendance = new NH_jsy_attendance();
+            attendance = new Jsy_attendance();
             attendance.setRq(rq);
             //计划
             plan = searchByJsy(plans, jGh);
@@ -567,6 +567,8 @@ public class WSDataConver {
                 attendance.setjName(real.getjName());
                 attendance.setsGh(real.getsGh());
                 attendance.setsName(real.getsName());
+                attendance.setCompany(real.getGsBm());
+                attendance.setFgsCompany(real.getFgsBm());
             }
             else if(plan != null){
                 attendance.setXlBm(plan.getXlBm());
@@ -574,6 +576,8 @@ public class WSDataConver {
                 attendance.setjName(plan.getjName());
                 attendance.setsGh(plan.getsGh());
                 attendance.setsName(plan.getsName());
+                attendance.setCompany(plan.getGsBm());
+                attendance.setFgsCompany(plan.getFgsBm());
             }
  
             rs[i] = attendance;