酒测未通过审核

liujun001
1 parent 064837e1
Showing 14 changed files with 135 additions and 31 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/driver/dto/GetBusPlanListDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/LinggangScheduling.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/dto/LinggangSchedulingAddDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/dto/LinggangSchedulingQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/dto/LinggangSchedulingUpdateDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/vo/LinggangSchedulingVO.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/pojo/response/ResponseSchedulingDto.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/scheduling/LinggangSchedulingServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/utils/DateUtil.java
@@ -58,6 +58,8 @@ import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
+import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_OUT;
+
 /**
  * @author liujun
  * @date 2024年07月11日 16:37
@@ -252,7 +254,7 @@ public class DssDriverController extends BaseController {
         List<LinggangSignInResource> convertLinggangSignInResources = convertLinggangSignInResource(dto);
         try {
             boolean flag = signInResourceService.insertImage(convertLinggangSignInResources);
-           Set<String> paths = convertLinggangSignInResources.stream().map(LinggangSignInResource::getPath).collect(Collectors.toSet());
+            Set<String> paths = convertLinggangSignInResources.stream().map(LinggangSignInResource::getPath).collect(Collectors.toSet());
             return flag ? ResponseResult.success(paths) : ResponseResult.error("上传失败，请稍后再试");
         } catch (InterruptException e) {
             log.error("图片上传失败,[{}]", dto);
@@ -525,13 +527,19 @@ public class DssDriverController extends BaseController {
     private LinggangScheduling convertScheduling(GetBusPlanListDTO dto) {
         LinggangScheduling scheduling = new LinggangScheduling();
-         if (Objects.equals(1, dto.getDateType())) {
+        if (Objects.equals(1, dto.getDateType())) {
             scheduling.setStartScheduleDate(DateUtil.shortDate(DateUtils.addDays(new Date(), 1)));
-        }else{
+            scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(), 1));
+        } else if (Objects.equals(0, dto.getDateType())) {
+            scheduling.setStartScheduleDate(DateUtil.shortDate(new Date()));
+            scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(), 1));
+        } else {
             scheduling.setStartScheduleDate(DateUtil.shortDate(new Date()));
+            scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(), 3));
         }
-        scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(),3));
-         scheduling.setType(1);
+        scheduling.setType(1);
+        scheduling.setBcType(BC_TYPE_OUT);
+        scheduling.setJobCode(dto.getStaffCode());
         return scheduling;
     }
@@ -448,11 +448,12 @@ public class KeyBoxController extends BaseController {
         LinggangScheduling scheduling = new LinggangScheduling();
         scheduling.setJobCode(dto.getStaffCode());
-        String dateStr = DateUtils.YYYY_MM_DD.format(dto.getTime());
-        scheduling.setScheduleDate(DateUtils.YYYY_MM_DD.parse(dateStr));
+        scheduling.setStartScheduleDate(DateUtil.shortDate(dto.getTime()));
+        scheduling.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(scheduling.getStartScheduleDate(),1));
 //        String bcType = Objects.equals(0, dto.getEventType()) ? ConstDriverProperties.BC_TYPE_OUT : Objects.equals(1, dto.getEventType()) ? ConstDriverProperties.BC_TYPE_IN : "other";
-        String bcType = ConstDriverProperties.BC_TYPE_IN;
+        String bcType = ConstDriverProperties.BC_TYPE_OUT;
         scheduling.setBcType(bcType);
+        scheduling.setType(1);
         List<LinggangScheduling> linggangSchedulings = schedulingService.list(scheduling);
         if (CollectionUtils.isEmpty(linggangSchedulings)) {
@@ -34,6 +34,9 @@ public class GetBusPlanListDTO implements java.io.Serializable{
     @ApiModelProperty(value = "数据类型;0今天，1明天，2/null全部",required = true,example = "1")
     private Integer  dateType;
+    @ApiModelProperty(value = "工号")
+    private String staffCode;
+
     @NotNull(message = "第几页为空")
     @ApiModelProperty(value = "第几页",required = true,example = "1")
     private Integer    pageNumber;
@@ -78,7 +78,7 @@ public class LinggangScheduling {
     /***签到表id*/
     @Excel(name = "签到表id")
-    private Integer signInId;
+    private Long signInId;
     /***记录状态*/
@@ -51,7 +51,7 @@ public class LinggangSchedulingAddDTO implements java.io.Serializable {
     private Long zdsjT;
     /***签到表id*/
     @ApiModelProperty(value = "签到表id", example = "1")
-    private Integer signInId;
+    private Long signInId;
     /***记录状态*/
     @ApiModelProperty(value = "记录状态", example = "1")
     private Integer exType;
@@ -51,7 +51,7 @@ public class LinggangSchedulingQueryDTO implements java.io.Serializable {
     private Long zdsjT;
     /***签到表id*/
     @ApiModelProperty(value = "签到表id", example = "1")
-    private Integer signInId;
+    private Long signInId;
     /***记录状态*/
     @ApiModelProperty(value = "记录状态", example = "1")
     private Integer exType;
@@ -51,7 +51,7 @@ public class LinggangSchedulingUpdateDTO implements java.io.Serializable {
     private Long zdsjT;
     /***签到表id*/
     @ApiModelProperty(value = "签到表id", example = "1")
-    private Integer signInId;
+    private Long signInId;
     /***记录状态*/
     @ApiModelProperty(value = "记录状态", example = "1")
     private Integer exType;
@@ -56,7 +56,7 @@ public class LinggangSchedulingVO implements java.io.Serializable {
     private Long zdsjT;
     /***签到表id*/
     @ApiModelProperty(value = "签到表id", example = "1")
-    private Integer signInId;
+    private Long signInId;
     /***记录状态*/
     @ApiModelProperty(value = "记录状态", example = "1")
     private Integer exType;
 package com.ruoyi.in.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
@@ -258,7 +257,7 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
         signIn.setSchedulingId(scheduling.getId());
         signInMapper.insertSignIn(signIn);
-        scheduling.setSignInId(Convert.toInt(signIn.getId()));
+        scheduling.setSignInId(signIn.getId());
         // 更新考勤
         linggangSchedulingService.updateByPrimaryKey(scheduling);
 package com.ruoyi.pojo.response;
+import com.ruoyi.utils.DateUtil;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.io.Serializable;
+import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 /**
  * Auto-generated: 2023-07-05 21:23:27
@@ -51,4 +55,57 @@ public class ResponseSchedulingDto implements Serializable {
     private String name;
+    private String fcsj;
+    private Integer dfsj;
+    private String scheduleDateStr;
+
+    public void setScheduleDateStr(Object scheduleDateStr) {
+        if (Objects.nonNull(scheduleDateStr)) {
+            this.scheduleDateStr = scheduleDateStr.toString();
+            try {
+                scheduleDate = DateUtil.YYYY_MM_DD_LINK.parse(this.scheduleDateStr);
+            } catch (ParseException e) {
+                throw new RuntimeException(e);
+            }
+
+        }
+
+    }
+
+    public Long getfcsjTValue() {
+        if (Objects.nonNull(fcsjT) && fcsjT >0) {
+            return fcsjT;
+        }
+
+        if (StringUtils.isNotEmpty(fcsj) && StringUtils.isNotEmpty(this.scheduleDateStr)) {
+            String dateStr = StringUtils.join(this.scheduleDateStr, " ", fcsj);
+            try {
+                Date date = DateUtil.YYYY_MM_DD_LINK_HH_MM.parse(dateStr);
+                fcsjT = date.getTime();
+                return fcsjT;
+            } catch (ParseException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return null;
+    }
+
+    public Long getzdsjTTValue() {
+        if (Objects.nonNull(zdsjT) && zdsjT >0) {
+            return zdsjT;
+        }
+
+        if(Objects.nonNull(bcsj)){
+            Long value = getfcsjTValue();
+            zdsjT = value+bcsj*60000;
+            return zdsjT;
+        }
+        return null;
+    }
+
+    public void setUpDowm(String upDowm){
+        this.upDown = upDowm;
+    }
+
+
 }
 \ No newline at end of file
@@ -418,9 +418,9 @@ public class ThreadJobService {
     @Transactional(rollbackFor = {Exception.class})
     public void asyncComputedScheduling(Map<String, List<ResponseSchedulingDto>> originSchedulingMap, String timeOut, Date date, int type) {
         //查询当天是否保存过考情表  如果不存在则保存
-        List<DriverScheduling> bcList = schedulingMapper.queryToDay(DateUtil.YYYY_MM_DD_LINK.format(date),DateUtil.YYYY_MM_DD_LINK.format(org.apache.commons.lang3.time.DateUtils.addDays(date,1)), null, null, null);
+        List<DriverScheduling> bcList = schedulingMapper.queryToDay(DateUtil.YYYY_MM_DD_LINK.format(date), DateUtil.YYYY_MM_DD_LINK.format(org.apache.commons.lang3.time.DateUtils.addDays(date, 1)), null, null, null);
         Map<String, List<DriverScheduling>> dto = nowSchedulingCache.getCacheScheduling(ConstDateUtil.formatDate(date));
-        if(CollectionUtils.isNotEmpty(bcList) && MapUtils.isEmpty(dto) && Objects.equals(1,type)){
+        if (CollectionUtils.isNotEmpty(bcList) && MapUtils.isEmpty(dto) && Objects.equals(1, type)) {
             String dateStr = DateUtil.YYYY_MM_DD.format(date);
             Map<String, List<DriverScheduling>> resultMap = new HashMap<>(800);
             NowSchedulingCache.handlerResultMap(resultMap, bcList);
@@ -430,11 +430,11 @@ public class ThreadJobService {
         // 当天已有记录则不在保存  或者 调度记录为空则不在保存
         if ((CollectionUtil.isNotEmpty(dto) && CollectionUtil.isNotEmpty(bcList)) || originSchedulingMap.size() == 0) {
-            log.info("调度最新数据：{},当天获取数据：{},时间:[{}]", originSchedulingMap.size(),bcList.size(),date);
+            log.info("调度最新数据：{},当天获取数据：{},时间:[{}]", originSchedulingMap.size(), bcList.size(), date);
             return;
         }
-        if(Objects.equals(1,type)) {
+        if (Objects.equals(1, type)) {
             TempCache.resetMapStatus();
         }
         bcList = getBcList(originSchedulingMap, type);
@@ -444,7 +444,31 @@ public class ThreadJobService {
         // 插入排班
         List<LinggangScheduling> schedulings = bcList.stream().map(b -> {
             LinggangScheduling scheduling = new LinggangScheduling();
-            BeanUtils.copyProperties(b, scheduling);
+            scheduling.setJobCode(b.getJobCode());
+            scheduling.setName(b.getName());
+            scheduling.setPosts(b.getPosts());
+            scheduling.setScheduleDate(b.getScheduleDate());
+            scheduling.setLineName(b.getLineName());
+            scheduling.setLpName(b.getLpName());
+            scheduling.setNbbm(b.getNbbm());
+            scheduling.setBcType(b.getBcType());
+            scheduling.setFcsjT(b.getFcsjT());
+            scheduling.setZdsjT(b.getZdsjT());
+            scheduling.setSignInId(b.getSignInId());
+            scheduling.setExType(b.getExType());
+            scheduling.setSignType(b.getSignType());
+            scheduling.setSignTime(b.getSignTime());
+            scheduling.setAlcoholFlag(b.getAlcoholFlag());
+            scheduling.setAlcoholIntake(b.getAlcoholIntake());
+            scheduling.setRemark(b.getRemark());
+
+            scheduling.setUpdown(b.getUpDown());
+            scheduling.setQdzcode(b.getQdzCode());
+            scheduling.setQdzname(b.getQdzName());
+            scheduling.setZdzcode(b.getZdzCode());
+            scheduling.setZdzname(b.getZdzName());
+            scheduling.setType(b.getType());
+
             return scheduling;
         }).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(schedulings)) {
@@ -465,15 +489,15 @@ public class ThreadJobService {
                 if (size == 1) {
                     schedulings.add(entry.getValue().get(0));
                 } else if (size > 1) {
-                   List<LinggangScheduling> values = entry.getValue().stream().filter(s->!Objects.equals(s.getZdsjT(),s.getFcsjT())).collect(Collectors.toList());
+                    List<LinggangScheduling> values = entry.getValue().stream().filter(s -> !Objects.equals(s.getZdsjT(), s.getFcsjT())).collect(Collectors.toList());
                     size = CollectionUtils.size(values);
-                    if(size == 0){
+                    if (size == 0) {
                         schedulings.add(entry.getValue().get(0));
-                    }else if(size == 1){
+                    } else if (size == 1) {
                         schedulings.add(values.get(0));
-                    }else{
+                    } else {
                         values = values.stream().sorted(Comparator.comparing(LinggangScheduling::getZdsjT)).collect(Collectors.toList());
-                        schedulings.add(values.get(size-1));
+                        schedulings.add(values.get(size - 1));
                     }
                 }
             }
@@ -482,10 +506,10 @@ public class ThreadJobService {
         }
         String dateStr1 = DateUtil.YYYY_MM_DD_LINK.format(date);
         // 异常数据过多，不通过自增获取id再次查询获取
-        bcList = schedulingMapper.queryToDay(dateStr1, DateUtil.YYYY_MM_DD_LINK.format(org.apache.commons.lang3.time.DateUtils.addDays(date,1)), null, null, null);
+        bcList = schedulingMapper.queryToDay(dateStr1, DateUtil.YYYY_MM_DD_LINK.format(org.apache.commons.lang3.time.DateUtils.addDays(date, 1)), null, null, null);
         // 处理缓存和错误排班
         String dateStr = DateUtil.YYYY_MM_DD.format(date);
-        if (!CollectionUtil.isEmpty(bcList) && Objects.equals(1,type)) {
+        if (!CollectionUtil.isEmpty(bcList) && Objects.equals(1, type)) {
             Map<String, List<DriverScheduling>> resultMap = new HashMap<>(800);
             NowSchedulingCache.handlerResultMap(resultMap, bcList);
             // 更新缓存
@@ -590,6 +614,13 @@ public class ThreadJobService {
                         BeanUtils.copyProperties(item, scheduling, "id");
                         scheduling.setUpDown(Convert.toInt(item.getUpDown()));
                         scheduling.setType(type);
+                        if (Objects.isNull(scheduling.getFcsjT()) || Objects.equals(0L, scheduling.getFcsjT())) {
+                            scheduling.setFcsjT(item.getfcsjTValue());
+                        }
+
+                        if (Objects.nonNull(scheduling.getZdsjT()) || Objects.equals(0L, scheduling.getZdsjT())) {
+                            scheduling.setZdsjT(item.getzdsjTTValue());
+                        }
                         return scheduling;
                     })
                     .sorted(Comparator.comparing(DriverScheduling::getFcsjT))
@@ -44,7 +44,7 @@ import java.text.ParseException;
 import java.util.*;
 import java.util.stream.Collectors;
-import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_IN;
+import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_OUT;
 @Slf4j
 @Service
@@ -709,8 +709,9 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     private List<LinggangScheduling> querySchedulingByTiime(Date date) {
         LinggangScheduling scheduling = new LinggangScheduling();
-        scheduling.setScheduleDate(date);
-        scheduling.setBcType(BC_TYPE_IN);
+        scheduling.setStartScheduleDate(DateUtil.shortDate(date));
+        scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(),1));
+        scheduling.setBcType(BC_TYPE_OUT);
         List<LinggangScheduling> schedulings = schedulingService.list(scheduling);
         if (CollectionUtils.isEmpty(schedulings)) {
             log.info("没有查到排班信息:[{}]", date);
@@ -53,7 +53,9 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
     @Override
     public List<LinggangScheduling> list(LinggangScheduling entity) {
-        return list(new LambdaQueryWrapper<>(entity));
+        LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>(entity);
+        switchScheduleDate(wrapper,entity);
+        return list(wrapper);
     }
     @Override
@@ -16,6 +16,8 @@ import java.util.Date;
 public class DateUtil {
     public static FastDateFormat YYYY_MM_DD_LINK_HH_MM_SS = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss");
+
+    public static FastDateFormat YYYY_MM_DD_LINK_HH_MM = FastDateFormat.getInstance("yyyy-MM-dd HH:mm");
     public static FastDateFormat YYYY_MM_DD_LINK = FastDateFormat.getInstance("yyyy-MM-dd");
     public static FastDateFormat YYYY_MM_DD = FastDateFormat.getInstance("yyyyMMdd");
     public static FastDateFormat HH_MM_ss = FastDateFormat.getInstance("HH:mm:ss");