修改caldar表

application-facade/src/main/java/com/factory/web/entity/fa/FirstArticleCalendar.java

@@ -1,59 +1,70 @@
 package com.factory.web.entity.fa;
 
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.time.LocalTime;
+
 /**
- * 日周月点检规则
+ * 这个表日月周目前都只设置一个，目前对应useid也是一个本项目，但之后应该是
+ * 每个人可以有一套信息的这个时间表是为了扩展和满足现有设计
  *
- * @author wzy
- * @date 2021-07-09 12:00:00
+ * @author dl
+ * @date 2021-08-06 17:51:58
  */
 @Data
 @TableName("first_article_calendar")
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@JsonInclude()
 public class FirstArticleCalendar implements Serializable {
+	private static final long serialVersionUID = 1L;
 
 	@TableId(type = IdType.AUTO)
-	@ApiModelProperty(value = "规则id")
+
+	@ApiModelProperty(value = "唯一id主键")
 	private Long id;
 
-	@ApiModelProperty(value = "计划id")
+	@ApiModelProperty(value = "关联benteler_plan表的id")
 	private Long bentelerPlanId;
 
-	@ApiModelProperty(value = "日巡检开始时间 格式11:00")
-	private String startDay;
+	@ApiModelProperty(value = "首件开始时间")
+	private LocalTime firstStart;
 
-	@ApiModelProperty(value = "日巡检结束时间 格式11:00")
-	private String endDay;
+	@ApiModelProperty(value = "首件提醒时间")
+	private LocalTime firstRemind;
 
-	@ApiModelProperty(value = "日检查时长设置单位分钟 例如60")
-	private Integer dayValidate;
-	
-	@ApiModelProperty(value = "升级时长设置单位是分钟 例如60 这个时间其实是汇报超时给监督")
-	private Integer dayOuttime;
+	@ApiModelProperty(value = "首件（检测结束时间）")
+	private LocalTime firstEnd;
 
-	@ApiModelProperty(value = "200件最晚提交时间")
-	private String twoHundredSubmitTime;
+	@ApiModelProperty(value = "200件提交时间（pad提醒时间）")
+	private LocalTime twoRemind;
 
-	@ApiModelProperty(value = "点检人对应的用户ID")
-	private Long userId;
-	
-	@ApiModelProperty(value = "0表示首件 1表示200件 2表示中断")
+	@ApiModelProperty(value = "升级时长(分钟)")
+	private Integer upleverTimeNum;
+
+	@ApiModelProperty(value = "0 首件  1 200件  2中断   由于中断是主动提交没必要设置")
 	private Integer typeFlag;
-	
-	@ApiModelProperty(value = "班次")
-	private String shift;
+
+	@ApiModelProperty(value = "责任人1班次")
+	private String principalOneShift;
+
+	@ApiModelProperty(value = "责任人1  id")
+	private Integer principalOneId;
+
+	@ApiModelProperty(value = "责任人2班次")
+	private String principalTwoShift;
+
+	@ApiModelProperty(value = "责任人2id")
+	private Integer principalTwoId;
 
 }

application-facade/src/main/java/com/factory/web/entity/fa/FirstArticleCalendar1.java

@@ -0,0 +1,59 @@
+//package com.factory.web.entity.fa;
+//
+//import java.io.Serializable;
+//
+//import com.baomidou.mybatisplus.annotation.IdType;
+//import com.baomidou.mybatisplus.annotation.TableId;
+//import com.baomidou.mybatisplus.annotation.TableName;
+//
+//import io.swagger.annotations.ApiModelProperty;
+//import lombok.AllArgsConstructor;
+//import lombok.Builder;
+//import lombok.Data;
+//import lombok.NoArgsConstructor;
+//
+///**
+// * 日周月点检规则
+// *
+// * @author wzy
+// * @date 2021-07-09 12:00:00
+// */
+//@Data
+//@TableName("first_article_calendar")
+//@Builder
+//@NoArgsConstructor
+//@AllArgsConstructor
+//public class FirstArticleCalendar1 implements Serializable {
+//
+//	@TableId(type = IdType.AUTO)
+//	@ApiModelProperty(value = "规则id")
+//	private Long id;
+//
+//	@ApiModelProperty(value = "计划id")
+//	private Long bentelerPlanId;
+//
+//	@ApiModelProperty(value = "日巡检开始时间 格式11:00")
+//	private String startDay;
+//
+//	@ApiModelProperty(value = "日巡检结束时间 格式11:00")
+//	private String endDay;
+//
+//	@ApiModelProperty(value = "日检查时长设置单位分钟 例如60")
+//	private Integer dayValidate;
+//
+//	@ApiModelProperty(value = "升级时长设置单位是分钟 例如60 这个时间其实是汇报超时给监督")
+//	private Integer dayOuttime;
+//
+//	@ApiModelProperty(value = "200件最晚提交时间")
+//	private String twoHundredSubmitTime;
+//
+//	@ApiModelProperty(value = "点检人对应的用户ID")
+//	private Long userId;
+//
+//	@ApiModelProperty(value = "0表示首件 1表示200件 2表示中断")
+//	private Integer typeFlag;
+//
+//	@ApiModelProperty(value = "班次")
+//	private String shift;
+//
+//}

application-facade/src/main/java/com/factory/web/entity/fa/res/FaCalendarRes.java

@@ -2,11 +2,7 @@ package com.factory.web.entity.fa.res;
 
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.util.List;
 
-import com.factory.web.entity.fa.FirstArticleCalendar;
-import com.factory.web.entity.fa.FirstArticleTitle;
-import com.factory.web.entity.fa.FirstArticleWorkshop;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.swagger.annotations.ApiModel;

application-facade/src/main/java/com/factory/web/entity/fa/res/FaPlanRes.java

@@ -7,7 +7,6 @@ import java.util.List;
 import com.factory.web.entity.fa.FirstArticleCalendar;
 import com.factory.web.entity.fa.FirstArticleTitle;
 import com.factory.web.entity.fa.FirstArticleWorkshop;
-import com.factory.web.service.impl.FileEntry;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.swagger.annotations.ApiModel;

application-facade/src/main/java/com/factory/web/mapper/fa/FirstArticleCalendarMapper.java

@@ -1,15 +1,16 @@
 package com.factory.web.mapper.fa;
 
-import org.apache.ibatis.annotations.Mapper;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.factory.web.entity.fa.FirstArticleCalendar;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
- * 日周月点检规则
+ * 这个表日月周目前都只设置一个，目前对应useid也是一个本项目，但之后应该是
+ 每个人可以有一套信息的这个时间表是为了扩展和满足现有设计
  *
- * @author wzy
- * @date 2021-07-09 12:00:00
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2021-08-06 17:51:58
  */
 @Mapper
 public interface FirstArticleCalendarMapper extends BaseMapper<FirstArticleCalendar> {

application-facade/src/main/java/com/factory/web/service/fa/FirstArticleCalendarService.java

@@ -1,5 +1,6 @@
 package com.factory.web.service.fa;
 
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.factory.web.entity.fa.FirstArticleCalendar;
 

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleCalendarServiceImpl.java

@@ -1,22 +1,16 @@
 package com.factory.web.service.impl.fa;
 
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.factory.web.entity.fa.FirstArticleCalendar;
 import com.factory.web.mapper.fa.FirstArticleCalendarMapper;
 import com.factory.web.service.fa.FirstArticleCalendarService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
 
 
-/**
- * 日周月点检规则
- *
- * @author wzy
- * @date 2021-07-09 12:00:00
- */
 @Service("firstArticleCalendarService")
 @Transactional(rollbackFor = Exception.class)
 public class FirstArticleCalendarServiceImpl extends ServiceImpl<FirstArticleCalendarMapper, FirstArticleCalendar> implements FirstArticleCalendarService {
 
+
 }

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -6,7 +6,6 @@ import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -41,11 +40,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.*;
-import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -140,15 +137,6 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         List<FirstArticleCalendarReq> firstArticleCalendarList = req.getFirstArticleCalendarList();
         for (FirstArticleCalendarReq firstArticleCalendarReq : firstArticleCalendarList) {
             FirstArticleCalendar firstArticleCalendar = FirstArticleCalendar.builder()
-                    .bentelerPlanId(plan.getId())
-                    .startDay(firstArticleCalendarReq.getStartDay())
-                    .endDay(firstArticleCalendarReq.getEndDay())
-                    .dayValidate(firstArticleCalendarReq.getDayValidate())
-                    .dayOuttime(firstArticleCalendarReq.getDayOuttime())
-                    .twoHundredSubmitTime(firstArticleCalendarReq.getTwoHundredSubmitTime())
-                    .userId(firstArticleCalendarReq.getUserId())
-                    .typeFlag(firstArticleCalendarReq.getTypeFlag())
-                    .shift(firstArticleCalendarReq.getShift())
                     .build();
             firstArticleCalendarService.save(firstArticleCalendar);
         }
@@ -156,8 +144,6 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         /* 默认插入一条中断点检规则 */
         FirstArticleCalendar firstArticleCalendar = FirstArticleCalendar.builder()
                 .bentelerPlanId(plan.getId())
-                .userId(-1L)
-                .typeFlag(2) // 2中断
                 .build();
         firstArticleCalendarService.save(firstArticleCalendar);
 
@@ -373,24 +359,12 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
             List<FirstArticleCalendarReq> firstArticleCalendarList = req.getFirstArticleCalendarList();
             for (FirstArticleCalendarReq firstArticleCalendarReq : firstArticleCalendarList) {
                 FirstArticleCalendar firstArticleCalendar = FirstArticleCalendar.builder()
-                        .bentelerPlanId(plan.getId())
-                        .startDay(firstArticleCalendarReq.getStartDay())
-                        .endDay(firstArticleCalendarReq.getEndDay())
-                        .dayValidate(firstArticleCalendarReq.getDayValidate())
-                        .dayOuttime(firstArticleCalendarReq.getDayOuttime())
-                        .twoHundredSubmitTime(firstArticleCalendarReq.getTwoHundredSubmitTime())
-                        .userId(firstArticleCalendarReq.getUserId())
-                        .typeFlag(firstArticleCalendarReq.getTypeFlag())
-                        .shift(firstArticleCalendarReq.getShift())
                         .build();
                 firstArticleCalendarService.save(firstArticleCalendar);
             }
 
             /* 默认插入一条中断点检规则 */
             FirstArticleCalendar firstArticleCalendar = FirstArticleCalendar.builder()
-                    .bentelerPlanId(plan.getId())
-                    .userId(-1L)
-                    .typeFlag(2) // 2中断
                     .build();
             firstArticleCalendarService.save(firstArticleCalendar);
 
@@ -493,23 +467,11 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
             List<FirstArticleCalendarReq> firstArticleCalendarList = req.getFirstArticleCalendarList();
             for (FirstArticleCalendarReq firstArticleCalendarReq : firstArticleCalendarList) {
                 FirstArticleCalendar firstArticleCalendar = FirstArticleCalendar.builder()
-                        .bentelerPlanId(plan.getId())
-                        .startDay(firstArticleCalendarReq.getStartDay())
-                        .endDay(firstArticleCalendarReq.getEndDay())
-                        .dayValidate(firstArticleCalendarReq.getDayValidate())
-                        .dayOuttime(firstArticleCalendarReq.getDayOuttime())
-                        .twoHundredSubmitTime(firstArticleCalendarReq.getTwoHundredSubmitTime())
-                        .userId(firstArticleCalendarReq.getUserId())
-                        .typeFlag(firstArticleCalendarReq.getTypeFlag())
-                        .shift(firstArticleCalendarReq.getShift())
                         .build();
                 firstArticleCalendarService.save(firstArticleCalendar);
             }
             /* 默认插入一条中断点检规则 */
             FirstArticleCalendar firstArticleCalendar = FirstArticleCalendar.builder()
-                    .bentelerPlanId(plan.getId())
-                    .userId(-1L)
-                    .typeFlag(2) // 2中断
                     .build();
             firstArticleCalendarService.save(firstArticleCalendar);
 
@@ -957,9 +919,6 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         /* 更新中断的操作人 */
         if (req.getTypeFlag() == 2) {
             LambdaUpdateWrapper<FirstArticleCalendar> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-            lambdaUpdateWrapper.eq(FirstArticleCalendar::getBentelerPlanId, req.getBentelerPlanId())
-                    .eq(FirstArticleCalendar::getTypeFlag, 2)
-                    .set(FirstArticleCalendar::getUserId, req.getUserId());
             firstArticleCalendarService.update(lambdaUpdateWrapper);
         }
 

application-facade/src/main/java/com/factory/wx/entity/res/PlanReminderDetailRes.java

@@ -1,10 +1,7 @@
 package com.factory.wx.entity.res;
 
-import com.factory.web.entity.fa.FirstArticleCalendar;
-import com.factory.web.entity.fa.FirstArticleItem;
 import com.factory.web.entity.fa.FirstArticleTitle;
 import com.factory.web.entity.fa.FirstArticleWorkshop;
-import com.factory.web.entity.pm.OnsiteCalendar;
 import com.factory.web.entity.pm.OnsiteTitle;
 import com.factory.web.entity.pm.OnsiteWorkshop;
 import io.swagger.annotations.ApiModelProperty;

application-facade/src/main/java/com/factory/wx/service/impl/WxPlanServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.factory.base.entity.po.benteler.BentelerPlan;
 import com.factory.base.entity.po.remote.UserInfo;
 import com.factory.user.mapper.UserInfoMapper;
-import com.factory.web.entity.fa.FirstArticleCalendar;
+import com.factory.web.entity.fa.FirstArticleCalendar1;
 import com.factory.web.entity.fa.FirstArticleTitle;
 import com.factory.web.entity.pm.OnsiteCalendar;
 import com.factory.web.entity.pm.OnsiteTitle;
@@ -51,8 +51,8 @@ public class WxPlanServiceImpl implements WxPlanService {
     @Override
     public WxPlanBaseInfoRes getFirstArticlePlanBaseInfo(Long planId) {
         BentelerPlan bentelerPlan = bentelerPlanMapper.selectById(planId);
-        List<FirstArticleCalendar> firstArticleCalendarList = firstArticleCalendarMapper.selectList(Wrappers.<FirstArticleCalendar>lambdaQuery()
-                .eq(FirstArticleCalendar::getBentelerPlanId, planId));
+        List<FirstArticleCalendar1> firstArticleCalendarList = firstArticleCalendarMapper.selectList(Wrappers.<FirstArticleCalendar1>lambdaQuery()
+                .eq(FirstArticleCalendar1::getBentelerPlanId, planId));
 
         //获取点检负责人
         List<String> usersName = new ArrayList<>();

application-facade/src/main/resources/mapper/FirstArticleCalendarMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.jihon.dao.FirstArticleCalendarMapper">
+
+
+</mapper>