微信小程序后端更新

application-facade/src/main/java/com/factory/controller/wx/PlanApprovalController.java

@@ -45,14 +45,14 @@ public class PlanApprovalController {
     @ApiOperation(value = "计划审批详情-首件")
     @PostMapping("/detail/initial")
     public ResponseBean<PlanApprovalDetailRes> approvalDetail(@RequestBody PlanInfoReq planInfoReq) {
-        // TODO
-        return ResponseBeanBuilder.ok();
+        PlanApprovalDetailRes planApprovalDetailRes = planApprovalService.getApprovalDetailInitial(planInfoReq);
+        return ResponseBeanBuilder.ok(planApprovalDetailRes);
     }
 
     @ApiOperation(value = "计划审批详情-防错")
     @PostMapping("/detail/pm")
     public ResponseBean<PlanApprovalDetailRes> approvalDetailPM(@RequestBody PlanInfoReq planInfoReq) {
-        PlanApprovalDetailRes planApprovalDetailRes = planApprovalService.getApprovalDetail(planInfoReq);
+        PlanApprovalDetailRes planApprovalDetailRes = planApprovalService.getApprovalDetailPM(planInfoReq);
         return ResponseBeanBuilder.ok(planApprovalDetailRes);
     }
 

application-facade/src/main/java/com/factory/controller/wx/PlanReminderController.java

@@ -1,8 +1,6 @@
 package com.factory.controller.wx;
 
-import com.factory.base.entity.aggregates.PageBean;
 import com.factory.base.entity.aggregates.ResponseBean;
-import com.factory.base.entity.po.benteler.BentelerPlan;
 import com.factory.base.util.res.ResponseBeanBuilder;
 import com.factory.wx.entity.req.PlanInfoReq;
 import com.factory.wx.entity.req.PlanPageReq;
@@ -47,13 +45,20 @@ public class PlanReminderController {
         return ResponseBeanBuilder.ok(map);
     }
 
-    @ApiOperation(value = "计划提醒详情")
-    @PostMapping("/detail")
+    @ApiOperation(value = "首件计划提醒详情")
+    @PostMapping("/detail/initial")
     public ResponseBean<PlanReminderDetailRes> reminderDetail(@RequestBody PlanInfoReq planInfoReq) {
         PlanReminderDetailRes planReminderDetailRes = planReminderService.getReminderDetail(planInfoReq);
         return ResponseBeanBuilder.ok(planReminderDetailRes);
     }
 
+    @ApiOperation(value = "防错计划提醒详情")
+    @PostMapping("/detail/pm")
+    public ResponseBean<PlanReminderDetailRes> reminderDetailPM(@RequestBody PlanInfoReq planInfoReq) {
+        PlanReminderDetailRes planReminderDetailRes = planReminderService.getReminderDetailPM(planInfoReq);
+        return ResponseBeanBuilder.ok(planReminderDetailRes);
+    }
+
     @ApiOperation(value = "计划提醒确认")
     @PostMapping("/operate")
     public ResponseBean passOperate(@RequestBody PlanInfoReq planInfoReq) {
@@ -61,10 +66,4 @@ public class PlanReminderController {
         return ResponseBeanBuilder.ok();
     }
 
-
-    @PostMapping("/test")
-    public ResponseBean<PageBean<BentelerPlan>> reminder(@RequestBody PlanPageReq planPageReq) {
-        PageBean<BentelerPlan> reminderList = planReminderService.getReminderListByPage(planPageReq);
-        return ResponseBeanBuilder.ok(reminderList);
-    }
 }

application-facade/src/main/java/com/factory/controller/wx/StatisticsController.java

@@ -18,7 +18,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 微信小程序端异常统计
@@ -45,9 +47,11 @@ public class StatisticsController {
 
     @ApiOperation(value = "异常计划列表")
     @PostMapping("/list")
-    public ResponseBean<List<AbnormalPlanRes>> statisticsList(@RequestBody AbnormalPlanReq abnormalPlanReq) {
+    public ResponseBean<Map> statisticsList(@RequestBody AbnormalPlanReq abnormalPlanReq) {
         List<AbnormalPlanRes> abnormalPlanResList = abnormalStatisticsService.getExceptionPlansByMonth(abnormalPlanReq);
-        return ResponseBeanBuilder.ok(abnormalPlanResList);
+        Map map = new HashMap<>();
+        map.put("row", abnormalPlanResList);
+        return ResponseBeanBuilder.ok(map);
     }
 
     @ApiOperation(value = "异常计划详情")

application-facade/src/main/java/com/factory/wx/entity/req/AbnormalPlanReq.java

@@ -24,4 +24,10 @@ public class AbnormalPlanReq {
 
     @ApiModelProperty(value = "异常类型 1已重检 2已放行")
     private int abnormalType;
+
+    @ApiModelProperty(value = "计划列表页号")
+    private int page;
+
+    @ApiModelProperty(value = "计划列表每页数量")
+    private int size;
 }

application-facade/src/main/java/com/factory/wx/entity/req/PlanApprovalReq.java

@@ -23,9 +23,10 @@ public class PlanApprovalReq {
 
     @ApiModelProperty(value = "计划Id")
     private Long planId;
-    /**
-     * 默认0，通过1，不通过2
-     */
-    @ApiModelProperty(value = "审批状态")
+
+    @ApiModelProperty(value = "计划类型")
+    private Long checkType;
+
+    @ApiModelProperty(value = "审批状态 默认0，通过1，不通过2")
     private int status;
 }

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

@@ -1,5 +1,7 @@
 package com.factory.wx.entity.res;
 
+import com.factory.web.entity.fa.FirstArticleCalendar;
+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;
@@ -10,7 +12,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDate;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -36,11 +37,17 @@ public class PlanApprovalDetailRes {
     private LocalDate effectiveDate;
     @ApiModelProperty(value = "表头信息")
     private OnsiteTitle titleInfo;
+    @ApiModelProperty(value = "当前用户审批级别")
+    private String approvalLevel;
+
     @ApiModelProperty(value = "防错计划基本信息")
     private List<OnsiteCalendar> onsiteCalendars;
     @ApiModelProperty(value = "防错计划工作站点检")
     private List<OnsiteWorkshop> onsiteWorkshops;
-    @ApiModelProperty(value = "当前用户审批级别")
-    private String approvalLevel;
+
+    @ApiModelProperty(value = "首件计划基本信息")
+    private List<FirstArticleCalendar> firstArticleCalendars;
+    @ApiModelProperty(value = "首件计划工作站")
+    private List<FirstArticleWorkshop> firstArticleWorkshops;
 
 }

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

@@ -33,13 +33,22 @@ public interface PlanApprovalService {
      */
     PageBean<BentelerPlan> getApprovalListByPage(PlanPageReq planPageReq);
 
+
+    /**
+     * 获取首件审批计划详情
+     *
+     * @param planInfoReq
+     * @return
+     */
+    PlanApprovalDetailRes getApprovalDetailInitial(PlanInfoReq planInfoReq);
+
     /**
-     * 获取审批计划详情
+     * 获取防错审批计划详情
      *
      * @param planInfoReq
      * @return
      */
-    PlanApprovalDetailRes getApprovalDetail(PlanInfoReq planInfoReq);
+    PlanApprovalDetailRes getApprovalDetailPM(PlanInfoReq planInfoReq);
 
     /**
      * 计划审批
@@ -48,5 +57,4 @@ public interface PlanApprovalService {
      * @return
      */
     ResponseBean approvalOperate(PlanApprovalReq planApprovalReq);
-
 }

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

@@ -33,12 +33,12 @@ public interface PlanReminderService {
     PageBean<BentelerPlan> getReminderListByPage(PlanPageReq planPageReq);
 
     /**
-     * 计划提醒详情
+     * 防错计划提醒详情
      *
      * @param planInfoReq
      * @return
      */
-    PlanReminderDetailRes getReminderDetail(PlanInfoReq planInfoReq);
+    PlanReminderDetailRes getReminderDetailPM(PlanInfoReq planInfoReq);
 
     /**
      * 确认已提醒
@@ -46,4 +46,11 @@ public interface PlanReminderService {
      * @param planInfoReq
      */
     void confirmReminder(PlanInfoReq planInfoReq);
+
+    /**
+     * 首件计划提醒详情
+     * @param planInfoReq
+     * @return
+     */
+    PlanReminderDetailRes getReminderDetail(PlanInfoReq planInfoReq);
 }

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

@@ -1,5 +1,6 @@
 package com.factory.wx.service.impl;
 
+import com.factory.base.util.res.ResponseBeanBuilder;
 import com.factory.wx.entity.req.AbnormalPlanReq;
 import com.factory.wx.entity.res.AbnormalPlanRes;
 import com.factory.wx.mapper.AbnormalStatisticsMapper;
@@ -7,7 +8,10 @@ import com.factory.wx.service.AbnormalStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -28,14 +32,36 @@ public class AbnormalStatisticsServiceImpl implements AbnormalStatisticsService
      */
     @Override
     public List<AbnormalPlanRes> getExceptionPlansByMonth(AbnormalPlanReq abnormalPlanReq) {
+        String month = getMonth(abnormalPlanReq);
+        abnormalPlanReq.setMonth(month);
+
         List<AbnormalPlanRes> releasedAbnormalPlans = new ArrayList<>();
         if (abnormalPlanReq.getAbnormalType() == 1) {
-            abnormalStatisticsMapper.getReleasedAbnormalPlans(abnormalPlanReq);
+            releasedAbnormalPlans.addAll(abnormalStatisticsMapper.getReleasedAbnormalPlans(abnormalPlanReq));
         }
         if (abnormalPlanReq.getAbnormalType() == 2) {
-            abnormalStatisticsMapper.getRecheckedAbnormalPlans(abnormalPlanReq);
+            releasedAbnormalPlans.addAll(abnormalStatisticsMapper.getRecheckedAbnormalPlans(abnormalPlanReq));
         }
         return releasedAbnormalPlans;
     }
 
+    /**
+     * 验证日期格式
+     *
+     * @param abnormalPlanReq 默认2021-06
+     * @return
+     */
+    private String getMonth(AbnormalPlanReq abnormalPlanReq) {
+        String month = "2021-06";
+        try {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM");
+            Date date = simpleDateFormat.parse(abnormalPlanReq.getMonth());
+            month = simpleDateFormat.format(date);
+        } catch (ParseException e) {
+            e.printStackTrace();
+            ResponseBeanBuilder.fail("年月格式错误");
+        }
+        return month;
+    }
+
 }

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

@@ -11,9 +11,15 @@ import com.factory.base.entity.po.benteler.BentelerPlan;
 import com.factory.base.entity.po.remote.UserInfo;
 import com.factory.base.util.res.ResponseBeanBuilder;
 import com.factory.user.mapper.UserInfoMapper;
+import com.factory.web.entity.fa.FirstArticleCalendar;
+import com.factory.web.entity.fa.FirstArticleItem;
+import com.factory.web.entity.fa.FirstArticleWorkshop;
 import com.factory.web.entity.pm.*;
 import com.factory.web.entity.pm.res.ApprovalUserRes;
 import com.factory.web.mapper.BentelerPlanMapper;
+import com.factory.web.mapper.fa.FirstArticleCalendarMapper;
+import com.factory.web.mapper.fa.FirstArticleItemMapper;
+import com.factory.web.mapper.fa.FirstArticleWorkshopMapper;
 import com.factory.web.mapper.pm.*;
 import com.factory.web.service.pm.PreventMistakeService;
 import com.factory.wx.entity.req.PlanApprovalReq;
@@ -68,6 +74,12 @@ public class PlanApprovalServiceImpl implements PlanApprovalService {
     private UserInfoMapper userInfoMapper;
     @Autowired
     private PreventMistakeService preventMistakeService;
+    @Autowired
+    private FirstArticleCalendarMapper firstArticleCalendarMapper;
+    @Autowired
+    private FirstArticleWorkshopMapper firstArticleWorkshopMapper;
+    @Autowired
+    private FirstArticleItemMapper firstArticleItemMapper;
 
 
     /**
@@ -111,6 +123,42 @@ public class PlanApprovalServiceImpl implements PlanApprovalService {
         return PageBean.<BentelerPlan>builder().row(bentelerPlanIPage.getRecords()).total(bentelerPlanIPage.getTotal()).page(bentelerPlanIPage.getPages()).build();
     }
 
+    /**
+     * 获取审批计划详情-首件
+     *
+     * @param planInfoReq
+     * @return
+     */
+    @Override
+    public PlanApprovalDetailRes getApprovalDetailInitial(PlanInfoReq planInfoReq) {
+        BentelerPlan bentelerPlan = bentelerPlanMapper.selectById(planInfoReq.getPlanId());
+        List<FirstArticleCalendar> firstArticleCalendarList = firstArticleCalendarMapper.selectList(Wrappers.<FirstArticleCalendar>lambdaQuery()
+                .eq(FirstArticleCalendar::getBentelerPlanId, planInfoReq.getPlanId()));
+        List<String> usersName = new ArrayList<>();
+        firstArticleCalendarList.forEach(firstArticleCalendar -> {
+            UserInfo userInfo = userInfoMapper.selectById(firstArticleCalendar.getUserId());
+            usersName.add(userInfo.getName());
+        });
+        List<FirstArticleWorkshop> firstArticleWorkshopList = firstArticleWorkshopMapper.selectList(Wrappers.<FirstArticleWorkshop>lambdaQuery()
+                .eq(FirstArticleWorkshop::getBentelerPlanId, planInfoReq.getPlanId()));
+        firstArticleWorkshopList.forEach(firstArticleWorkshop -> {
+            firstArticleWorkshop.setFirstArticleItemList(firstArticleItemMapper.selectList(Wrappers.<FirstArticleItem>lambdaQuery()
+                    .eq(FirstArticleItem::getWorkshopId, firstArticleWorkshop.getId())));
+        });
+
+        //获取title
+        OnsiteTitle title = preventMistakeService.getTitle(planInfoReq.getPlanId());
+        return PlanApprovalDetailRes.builder()
+                .planId(bentelerPlan.getId())
+                .planName(bentelerPlan.getName())
+                .effectiveDate(bentelerPlan.getEffectiveDate())
+                .usersName(usersName)
+                .titleInfo(title)
+                .firstArticleCalendars(firstArticleCalendarList)
+                .firstArticleWorkshops(firstArticleWorkshopList)
+                .build();
+    }
+
     /**
      * 获取审批计划详情-防错
      *
@@ -118,7 +166,7 @@ public class PlanApprovalServiceImpl implements PlanApprovalService {
      * @return
      */
     @Override
-    public PlanApprovalDetailRes getApprovalDetail(PlanInfoReq planInfoReq) {
+    public PlanApprovalDetailRes getApprovalDetailPM(PlanInfoReq planInfoReq) {
         BentelerPlan bentelerPlan = bentelerPlanMapper.selectById(planInfoReq.getPlanId());
         List<OnsiteCalendar> onsiteCalendarList = onsiteCalendarMapper.selectList(Wrappers.<OnsiteCalendar>lambdaQuery()
                 .eq(OnsiteCalendar::getBentelerPlanId, planInfoReq.getPlanId()));
@@ -131,6 +179,7 @@ public class PlanApprovalServiceImpl implements PlanApprovalService {
 
         //获取title
         OnsiteTitle title = preventMistakeService.getTitle(planInfoReq.getPlanId());
+        title.setUploadAttachmentId(null);//去除附件
 
         List<OnsiteWorkshop> onsiteWorkshopList = onsiteWorkshopMapper.selectList(Wrappers.<OnsiteWorkshop>lambdaQuery()
                 .eq(OnsiteWorkshop::getBentelerPlanId, planInfoReq.getPlanId()));

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

@@ -104,13 +104,13 @@ public class PlanReminderServiceImpl implements PlanReminderService {
     }
 
     /**
-     * 提醒详情
+     * 防错提醒详情
      *
      * @param planInfoReq
      * @return
      */
     @Override
-    public PlanReminderDetailRes getReminderDetail(PlanInfoReq planInfoReq) {
+    public PlanReminderDetailRes getReminderDetailPM(PlanInfoReq planInfoReq) {
         BentelerPlan bentelerPlan = bentelerPlanMapper.selectById(planInfoReq.getPlanId());
         List<OnsiteCalendar> onsiteCalendarList = onsiteCalendarMapper.selectList(Wrappers.<OnsiteCalendar>lambdaQuery()
                 .eq(OnsiteCalendar::getBentelerPlanId, planInfoReq.getPlanId()));
@@ -145,4 +145,15 @@ public class PlanReminderServiceImpl implements PlanReminderService {
         reminderMapper.confirmReminder(planInfoReq);
     }
 
+    /**
+     * 首件提醒
+     *
+     * @param planInfoReq
+     * @return
+     */
+    @Override
+    public PlanReminderDetailRes getReminderDetail(PlanInfoReq planInfoReq) {
+        return null;
+    }
+
 }

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

@@ -43,8 +43,8 @@
     <select id="getRecheckedAbnormalPlans" parameterType="com.factory.wx.entity.req.AbnormalPlanReq"
             resultType="com.factory.wx.entity.res.AbnormalPlanRes">
         SELECT DISTINCT
-            bp.id,
-            bp.`name`,
+            bp.id AS plan_id,
+            bp.`name` AS plan_name,
             bp.plan_type
         FROM
             onsite_task_his_blob othb,
@@ -58,11 +58,11 @@
         <if test="name != ''">
             AND bp.`name` LIKE CONCAT('%',#{name},'%')
         </if>
-        AND ot.task_time LIKE CONCAT(#{month},'%');
+        AND ot.task_time LIKE CONCAT(#{month},'%')
         UNION
         SELECT DISTINCT
-            bp.id,
-            bp.`name`,
+            bp.id AS plan_id,
+            bp.`name` AS plan_name,
             bp.plan_type
         FROM
             first_article_task_his_blob othb,