修改 calendar 表相关字段 部分关联

application-facade/src/main/java/com/factory/controller/pad/InitialPlanPadController.java

@@ -1,97 +0,0 @@
-package com.factory.controller.pad;
-
-
-import com.factory.base.entity.aggregates.ResponseBean;
-import com.factory.base.entity.po.benteler.BentelerIniWorkstation;
-import com.factory.base.entity.vo.req.BaseTypeReq;
-import com.factory.web.entity.vo.req.pad.submitCheckReq;
-import com.factory.web.entity.vo.req.pad.workDetailsReq;
-import com.factory.web.entity.vo.res.pad.ini.abnormalListRes;
-import com.factory.web.entity.vo.res.pad.ini.planlistRes;
-import com.factory.web.entity.vo.res.pad.ini.workDetailsRes;
-import com.factory.web.entity.vo.res.pad.ini.workTypeDetailsRes;
-import com.factory.web.service.ini.BentelerIniVersionService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiOperationSupport;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 计划 - 检验报告单
- *
- * @author Dl
- * @date 2021-05-12 09:37:25
- */
-@Api(tags = "pad  -  首件")
-@RestController
-@RequestMapping("/benteler/pad")
-@Slf4j
-public class InitialPlanPadController {
-    @Autowired
-    private BentelerIniVersionService versionService;
-
-    @ApiOperation(value = "首件记录列表")
-    @PostMapping("/planlist")
-    @ApiOperationSupport(order = 1)
-    public ResponseBean<planlistRes> planlist() {
-
-        return versionService.planlist_pad();
-    }
-
-    @ApiOperation(value = "首件工作站详情")
-    @PostMapping("/workDetails")
-    @ApiOperationSupport(order = 1)
-    public ResponseBean<List<workDetailsRes>> workDetails(@RequestBody BaseTypeReq req) {
-
-        return versionService.workDetails(req);
-    }
-
-    @ApiOperation(value = "工作站单类别详情")
-    @PostMapping("/workTypeDetails")
-    @ApiOperationSupport(order = 1)
-    public ResponseBean<workTypeDetailsRes> workTypeDetails(@RequestBody workDetailsReq req) {
-
-        return versionService.workTypeDetails(req);
-    }
-
-    @ApiOperation(value = "保存点检结果")
-    @PostMapping("/saveCheckItem")
-    @ApiOperationSupport(order = 1)
-    public ResponseBean saveCheckItem(@RequestBody workTypeDetailsRes req) {
-
-        return versionService.saveCheckItem(req);
-    }
-
-    @ApiOperation(value = "提交计划点检结果")
-    @PostMapping("/submitCheck")
-    @ApiOperationSupport(order = 1)
-    public ResponseBean submitCheck(@RequestBody submitCheckReq req) {
-
-        return versionService.submitCheck(req);
-    }
-
-    @ApiOperation(value = "异常列表")
-    @PostMapping("/abnormalList")
-    @ApiOperationSupport(order = 1)
-    public ResponseBean<List<abnormalListRes>> abnormalList() {
-
-        return versionService.abnormalList();
-    }
-
-    @ApiOperation(value = "异常列表详情 工作站分组")
-    @PostMapping("/abnormalWorkGroup")
-    @ApiOperationSupport(order = 1)
-    public ResponseBean<List<BentelerIniWorkstation>> abnormalWorkGroup(BaseTypeReq req) {
-        // 版本id
-        return versionService.abnormalWorkGroup(req);
-    }
-
-
-}

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

@@ -46,6 +46,10 @@ public class FirstArticleTask implements Serializable {
     @ApiModelProperty(value = "没工作提醒是不是已经完成 0没提醒 1已提醒")
     private Integer remindNoworkFlag;
 
+    @ApiModelProperty(value = "首件类型 0首件 1：200件 2中断")
+    private Integer typeFlag;
+
+
     @TableField(exist = false)
     @ApiModelProperty(value = "任务审批信息")
     private List<FirstArticleApprovalTask> firstArticleApprovalTasks;

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

@@ -606,7 +606,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
     }
 
     /**
-     * 得Pad端首件计划对应的工作站
+     * 取得Pad端首件计划对应的工作站
      *
      * @param req
      * @return 工作站
@@ -1290,6 +1290,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
      * @param @req
      * @return 取得用户列表
      */
+    @Override
     public List<UserListRes> getUserList() {
         SearchUserListReq searchUserListReq = new SearchUserListReq();
         searchUserListReq.setRoleId(ROLE_ID);
@@ -1514,6 +1515,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
      * @param req
      * @return 点检人
      */
+    @Override
     public List<FaCalendarRes> getFaCalendarList(SearchFaCalendarReq req) {
         List<FaCalendarRes> faCalendarList = firstArticleMapper.getFaCalendarList(req);
         return faCalendarList;

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

@@ -142,7 +142,7 @@
                faat.reason,
                faat.updated_time,
                fat.`status`,
-               fac.type_flag,
+               fat.type_flag,
                fat.id        AS task_id
         FROM first_article_task fat,
              first_article_calendar fac,
@@ -191,7 +191,7 @@
                uu.username AS person,
                2           AS method,
                fat.`status`,
-               fac.type_flag,
+               fat.type_flag,
                fat.id      AS task_id
         FROM first_article_task fat,
              first_article_calendar fac,
@@ -204,9 +204,10 @@
                  WHERE fathb.first_article_task_id = fat.id
              ) r
         WHERE fat.id = r.first_article_task_id
-          AND fat.first_article_calendar_id = fac.id
-          AND fac.benteler_plan_id = bp.id
-          AND fac.user_id = uu.id
+            AND fat.first_article_calendar_id = fac.id
+            AND fac.benteler_plan_id = bp.id
+            AND fac.principal_one_id = uu.id
+           or fac.principal_two_id = uu.id)
           AND bp.id = #{planId}
     </select>
 

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

@@ -61,21 +61,24 @@
             SELECT DISTINCT fac.benteler_plan_id,
             bp.`name` AS benteler_plan_name
         </if>
-
         <if test="req.type == 1 || req.type == 2"><!-- 已完成 --><!-- 待重检（不放行） -->
             SELECT fat.id AS first_article_task_id,
             fat.`status`,
             fac.benteler_plan_id,
             bp.`name` AS benteler_plan_name,
             fac.id AS first_article_calendar_id,
-            fac.type_flag
+            fat.type_flag
         </if>
+
+        <![CDATA[
         FROM first_article_task fat,
         first_article_calendar fac,
         benteler_plan bp
         WHERE fat.first_article_calendar_id = fac.id
         AND fac.benteler_plan_id = bp.id
         AND bp.pause_flag = 0
+        AND fat.type_flag <> 2]]>
+        <!-- 0 初始化 1 待审核状态 2放行 3 不通过 4 员工提交直接通过 -->
         <if test="req.type == 0"> <!-- 未完成 -->
             AND fat.`status` = 0
         </if>
@@ -86,10 +89,10 @@
             AND fat.`status` = 3
         </if>
         <if test="req.typeFlag != null"><!-- 0表示首件 1表示200件 -->
-            AND fac.type_flag = #{req.typeFlag}
+            AND fat.type_flag = #{req.typeFlag}
         </if>
         AND TO_DAYS(fat.task_time) = TO_DAYS(NOW())
-        AND fac.user_id = #{req.userId}
+        AND (fac.principal_one_id = #{req.userId} or fac.principal_two_id = #{req.userId} )
         -- GROUP BY fat.id
     </select>
 
@@ -220,9 +223,9 @@
         WHERE fat.first_article_calendar_id = fac.id
         AND fac.benteler_plan_id = #{req.bentelerPlanId}
         AND TO_DAYS(fat.task_time) = TO_DAYS(NOW())
-        AND fac.type_flag = #{req.typeFlag}
+        AND fat.type_flag = #{req.typeFlag}
         <if test="req.userId != null">
-            AND fac.user_id = #{req.userId}
+            AND (fac.principal_one_id = #{req.userId} OR fac.principal_two_id = #{req.userId})
         </if>
         <if test="req.status != null">
             AND fat.`status` = #{req.status}
@@ -237,8 +240,9 @@
         WHERE fat.first_article_calendar_id = fac.id
           AND fac.benteler_plan_id = #{req.bentelerPlanId}
           AND TO_DAYS(fat.task_time) = TO_DAYS(NOW())
-          AND fac.type_flag = 2
-        ORDER BY fat.id DESC LIMIT 0,1
+          AND fat.type_flag = 2
+        ORDER BY fat.id DESC
+        LIMIT 0,1
     </select>
 
     <!-- 取得不放行任务对应的审批人、审批意见、审批时间 -->

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

@@ -115,7 +115,7 @@
                bp.plan_type,
                faat.approval_level,
                faat.`status`,
-               fac.type_flag,
+               fat.type_flag,
                fat.id               AS task_id
         FROM first_article_task fat,
              first_article_calendar fac,

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

@@ -479,7 +479,7 @@
                faat.reason,
                faat.updated_time,
                fat.`status`,
-               fac.type_flag,
+               fat.type_flag,
                fat.id      AS task_id
         FROM first_article_task fat,
              first_article_calendar fac,
@@ -503,7 +503,7 @@
                uu.username AS person,
                2           AS method,
                fat.`status`,
-               fac.type_flag,
+               fat.type_flag,
                fat.id      AS task_id
         FROM first_article_task fat,
              first_article_calendar fac,
@@ -518,7 +518,7 @@
         WHERE fat.id = r.first_article_task_id
           AND fat.first_article_calendar_id = fac.id
           AND fac.benteler_plan_id = bp.id
-          AND fac.user_id = uu.id
+          AND (fac.principal_one_id = uu.id or fac.principal_two_id = uu.id)
           AND DATE_FORMAT(fat.task_time, '%Y-%m-%d') = #{req.checkDate}
     </select>
 

application-task/src/main/resources/mappers/FirstTaskMapper.xml

@@ -66,7 +66,7 @@
 
 
     <select id="getCalenderFirstForType" parameterType="java.lang.Integer" resultType="java.lang.Long">
-        SELECT b.benteler_plan_id
+        SELECT b.id
         FROM benteler_plan a,
              first_article_calendar b
         WHERE a.id = b.benteler_plan_id

common-base/src/main/java/com/factory/base/util/time/TimeConvert.java

@@ -36,8 +36,7 @@ public class TimeConvert {
     }
 
     private static String timeString2String(String format, int seconds) {
-        String replace = format.replace(" ", "T");
-        LocalTime res = LocalTime.parse(replace).plusSeconds(seconds);
+        LocalTime res = LocalTime.parse(format).plusSeconds(seconds);
         return res.format(DateTimeFormatter.ofPattern("HH:mm:ss"));
     }