1.修改每日工时获取

src/main/java/com/galaxis/manatee/dao/ChuanyunWorkHourDao.java

@@ -28,6 +28,7 @@ public interface ChuanyunWorkHourDao extends GalaxisRepository<ChuanyunWorkHourD
             "chuanyun_log.user_id," +
             "chuanyun_log.department_name," +
             "chuanyun_log.status," +
+            "chuanyun_log.bg_name," +
             "chuanyun_day_log.day_log_date " +
             "FROM chuanyun_day_log "+
             "LEFT JOIN chuanyun_log ON chuanyun_day_log.parent_object_id = chuanyun_log.object_id " +
@@ -53,6 +54,7 @@ public interface ChuanyunWorkHourDao extends GalaxisRepository<ChuanyunWorkHourD
             "  chuanyun_day_log.day_log_date,\n" +
             "  chuanyun_day_log.hours_worked,\n" +
             "  chuanyun_log.`status`,\n" +
+            "chuanyun_log.bg_name," +
             "  chuanyun_day_log.object_id\n" +
             "FROM\n" +
             "\tchuanyun_log\n" +
@@ -74,6 +76,7 @@ public interface ChuanyunWorkHourDao extends GalaxisRepository<ChuanyunWorkHourD
             "chuanyun_log.user_id," +
             "chuanyun_log.department_name," +
             "chuanyun_log.status," +
+            "chuanyun_log.bg_name," +
             "chuanyun_day_log.day_log_date " +
             "FROM chuanyun_day_log "+
             "LEFT JOIN chuanyun_log ON chuanyun_day_log.parent_object_id = chuanyun_log.object_id " +
@@ -100,6 +103,7 @@ public interface ChuanyunWorkHourDao extends GalaxisRepository<ChuanyunWorkHourD
             "chuanyun_log.user_id," +
             "chuanyun_log.department_name," +
             "chuanyun_log.status," +
+            "chuanyun_log.bg_name," +
             "chuanyun_day_log.day_log_date " +
             "FROM chuanyun_day_log "+
             "LEFT JOIN chuanyun_log ON chuanyun_day_log.parent_object_id = chuanyun_log.object_id " +
@@ -127,6 +131,7 @@ public interface ChuanyunWorkHourDao extends GalaxisRepository<ChuanyunWorkHourD
             "\t\tchuanyun_day_log.hours_worked\n" +
             "\t) AS hours_worked,\n" +
             "\tchuanyun_log.`status`,\n" +
+            "chuanyun_log.bg_name," +
             "\tchuanyun_day_log.object_id\n" +
             "FROM\n" +
             "\tchuanyun_log\n" +

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunSelfWorkHourDO.java

@@ -40,6 +40,8 @@ public class ChuanyunSelfWorkHourDO {
 
     private String departmentName;
 
+    private String bg;
+
     /**
      * 流程状态
      */

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunWorkHourDO.java

@@ -37,6 +37,8 @@ public class ChuanyunWorkHourDO {
 
     private String departmentName;
 
+    private String bgName;
+
     /**
      * 流程状态
      */

src/main/java/com/galaxis/manatee/service/LogStandardService.java

@@ -246,6 +246,13 @@ public class LogStandardService {
         }else{
             throw new Exception("获取每日总工时失败");
         }
+        //获取人员所属BG
+        if (StringUtils.isEmpty(chuanyunWorkHourDO.getBgName())){
+            ChuanyunUserCompanyDO chuanyunUserCompanyDO = chuanyunUserCompanyDao.findByUserId(chuanyunSelfWorkHourDO.getUserId());
+            chuanyunSelfWorkHourDO.setBg(chuanyunUserCompanyDO.getBg());
+        }else {
+            chuanyunSelfWorkHourDO.setBg(chuanyunWorkHourDO.getBgName());
+        }
         return chuanyunSelfWorkHourDO;
     }