update...

潘钊
1 parent 3c3f246b
Showing 3 changed files with 12 additions and 8 deletions
src/main/java/com/bsth/server_ws/attendance/AttendanceServiceSoap.java
src/main/java/com/bsth/server_ws/electric_oil/entity/Electric.java
src/main/java/com/bsth/server_ws/util/WSDataConver.java
@@ -64,7 +64,7 @@ public class AttendanceServiceSoap implements AttendanceService, ApplicationCont
             Map<String, String> types = ddyAuthorityService.findMultiType(jsySet);
  
             //转换成工资系统想要的数据
-            result.value = WSDataConver.to_jsyAttendanceNH(plans, reals, types, rq);
+            result.value = WSDataConver.to_jsyAttendanceNH(plans, reals, jsySet, types, rq);
         }catch (Exception e){
             logger.error("", e);
             fError.value = "服务器出现异常！";
@@ -53,7 +53,7 @@ public class Electric {
             elec.setGsBm(car.getCompanyCode());
             elec.setGsName(BusinessCodeData.code2Name.get(elec.getGsBm()));
             elec.setFgsBm(car.getBrancheCompanyCode());
-            elec.setFgsName(BusinessCodeData.code2Name.get(elec.getFgsBm()));
+            elec.setFgsName(BusinessCodeData.code2Name.get(elec.getGsBm() + "_" + elec.getFgsBm()));
             elec.setRq(fmtyyyyMMdd.parseDateTime(clsCDL.getYyrq()).toDate());
             elec.setCreateDate(fmtyyyyMMddHHmmss.parseDateTime(clsCDL.getCreateRq()).toDate());
             elec.setNbbm(nbbm);
@@ -537,16 +537,19 @@ public class WSDataConver {
      * @param types
      * @return
      */
-    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());
-        Jsy_attendance[] rs = new Jsy_attendance[ghArray.size()];
+    public static Jsy_attendance[] to_jsyAttendanceNH(List<SchedulePlanInfo> plans, List<ScheduleRealInfo> reals, Set<String> jsySet, Map<String, String> types, String rq) {
+        //List<String> ghArray = new ArrayList<>(types.keySet());
+        Jsy_attendance[] rs = new Jsy_attendance[jsySet.size()];
  
         Jsy_attendance attendance;
         SchedulePlanInfo plan;
         ScheduleRealInfo real;
-        String jGh;
-        for(int i = 0; i < ghArray.size(); i ++){
-            jGh = ghArray.get(i);
+        //String jGh;
+
+        int i = 0;
+        for(String jGh : jsySet){
+        //for(int i = 0; i < ghArray.size(); i ++){
+            //jGh = ghArray.get(i);
  
             attendance = new Jsy_attendance();
             attendance.setRq(rq);
@@ -581,6 +584,7 @@ public class WSDataConver {
             }
  
             rs[i] = attendance;
+            i++;
         }
         return rs;
     }