获取当前用户所在运输公司名称方法

backend/inz.basis/src/main/java/com/beecode/inz/basis/config/constants/DriverUserConstants.java

@@ -15,6 +15,7 @@ public class DriverUserConstants extends CommonBaseConst{
 	public static final String TELEPHONE = "telephone";
 	public static final String ENABLED = "enabled";
 	public static final String TRANSPORT_COMPANY_ID = "transportCompanyId";
+	public static final String TRANSPORT_COMPANY_ENTITY = "com.xyst.dinas.transport.datamodel.TransportCompany";
 	public static final String DRIVERID = "driverId";
 	
 }

backend/inz.basis/src/main/java/com/beecode/inz/basis/internal/service/DriverUserServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.util.Assert;
 import javax.transaction.Transactional;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
 /**
@@ -231,6 +232,11 @@ public class DriverUserServiceImpl implements DriverUserService {
 		return flag;
 	}
 
+    @Override
+    public String getTransportCompanyNameByDriverUser(DriverUser driverUser) {
+        KObject load = dao.load(DriverUserConstants.TRANSPORT_COMPANY_ENTITY, driverUser.getTransportCompanyId());
+        return Optional.ofNullable(load).map(a -> a.getString("companyName")).orElse("");
+    }
 
 
 }

backend/inz.basis/src/main/java/com/beecode/inz/basis/service/DriverUserService.java

@@ -68,4 +68,6 @@ public interface DriverUserService {
 	Boolean userNameRepeatCheck(String parameter);
 
     Boolean idCardRepeatCheck(String idCard);
+
+    String getTransportCompanyNameByDriverUser(DriverUser driverUser);
 }

backend/inz.common/src/main/java/com/beecode/inz/common/util/DateTimeUtils.java

@@ -355,4 +355,42 @@ public class DateTimeUtils {
     }
 
 
+    /**
+     * 获取某个周的第一天00:00:00
+     * @param date 时间
+     * @param offsetWeek 偏移周 如果为0 则依旧是date 所在的周 如果为1 则为下周
+     * @return Date
+     * **/
+    public static Date getWeekStart(Date date,int offsetWeek){
+        Calendar cal=Calendar.getInstance();
+        cal.setTime(date);
+        cal.add(Calendar.WEEK_OF_MONTH, offsetWeek);
+        cal.set(Calendar.DAY_OF_WEEK, 2);
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        return cal.getTime();
+    }
+
+    /**
+     * 获取本周的最后一天 23:59:59
+     * @param date 时间
+     * @param offsetWeek 偏移周 如果为0 则依旧是date 所在的周 如果为1 则为下周
+     * @return Date
+     * **/
+    public static Date getWeekEnd(Date date,int offsetWeek){
+        Calendar cal=Calendar.getInstance();
+        cal.setTime(date);
+        cal.set(Calendar.DAY_OF_WEEK, cal.getActualMaximum(Calendar.DAY_OF_WEEK));
+        cal.add(Calendar.WEEK_OF_MONTH, offsetWeek);
+        cal.add(Calendar.DAY_OF_WEEK, 1);
+        cal.set(Calendar.HOUR_OF_DAY, 23);
+        cal.set(Calendar.SECOND, 59);
+        cal.set(Calendar.MINUTE, 59);
+        cal.set(Calendar.MILLISECOND, 0);
+        return cal.getTime();
+    }
+
+
 }
\ No newline at end of file