修改表头存储代码 自测完毕 还差导出

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

@@ -2,6 +2,8 @@ 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.BaseIdReq;
 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;
@@ -19,6 +21,7 @@ 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 sun.reflect.generics.tree.BaseType;
 
 import java.util.List;
 
@@ -28,7 +31,7 @@ import java.util.List;
  * @author Dl
  * @date 2021-05-12 09:37:25
  */
-@Api(tags = "本特勒 - 首件pad端")
+@Api(tags = "pad  -  首件")
 @RestController
 @RequestMapping("/benteler/pad")
 @Slf4j
@@ -78,6 +81,13 @@ public class InitialPlanPadController {
 
        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/controller/web/InitialPlanWebController.java

@@ -30,7 +30,7 @@ import java.util.List;
  * @author Dl
  * @date 2021-05-12 09:37:25
  */
-@Api(tags = "本特勒 - 首件")
+@Api(tags = "WEB - 首件")
 @RestController
 @RequestMapping("/benteler/web")
 @Slf4j
@@ -84,13 +84,13 @@ public class InitialPlanWebController {
 
     }
 
-    @ApiOperation(value = "查看版本 - 待审核标准详情")
+    @ApiOperation(value = "查看版本 - 待审核标准详情 计划id")
     @PostMapping("/getUnAuditDetails")
     public ResponseBean<AddIniPlanReq> getUnAuditDetails(@RequestBody BaseIdReq req) {
         return bentelerIniVersionService.getUnAuditDetails(req);
     }
     @ApiOperation(value = "查看版本 - 正在使用标准详情")
-    @PostMapping("/getVersionDetails")
+    @PostMapping("/getCurrentDetails")
     public ResponseBean<AddIniPlanReq> getCurrentDetails(@RequestBody BaseIdReq req) {
         return bentelerIniVersionService.getCurrentDetails(req);
     }
@@ -112,5 +112,4 @@ public class InitialPlanWebController {
 
         return bentelerIniVersionService.exportInitialPlan(req);
     }
-
 }

application-facade/src/main/java/com/factory/scheduled/CreateIniBase.java

@@ -75,7 +75,6 @@ public class CreateIniBase {
                     .versionId(version.getId())
                     .checkStatus(0)
                     .abnormalFlag(false)
-                    .repeat(0)
                     .build();
             checkResultService.save(result);
 

application-facade/src/main/java/com/factory/web/entity/vo/res/web/ini/getCheckResutGreadRes.java

@@ -54,7 +54,7 @@ public class getCheckResutGreadRes {
     private String workstationId;
 
 
-    @ApiModelProperty(value = "首件订单号")
+    @ApiModelProperty(value = "首件订单号",hidden = true)
     private String orderId;
 
     @ApiModelProperty(value = "首件订单号")

application-facade/src/main/java/com/factory/web/mapper/ini/BentelerIniVersionMapper.java

@@ -32,7 +32,7 @@ public interface BentelerIniVersionMapper extends BaseMapper<BentelerIniVersion>
 
     Page<PagePlanRes> pagePlan(@Param("page") Page<PagePlanRes> page,
                                @Param("name") String name,
-                               @Param("CheckStatus") Integer checkStatus);
+                               @Param("checkStatus") Integer checkStatus);
 
 
     List<PagePlanRes> Planlist(@Param("page") Page<PagePlanRes> page,
@@ -40,7 +40,7 @@ public interface BentelerIniVersionMapper extends BaseMapper<BentelerIniVersion>
                                @Param("checkStatus") Integer checkStatus,
                                @Param("VersionId") Long VersionId);
 
-    Page<unAuditListRes> unAuditList(@Param("req") PlanListReq req);
+    Page<unAuditListRes> unAuditList(@Param("page") Page page, @Param("req") PlanListReq req);
 
 
     BentelerIniVersion getPlan_CurrentVersion(@Param("planId") Long planId);

application-facade/src/main/java/com/factory/web/service/impl/ini/BentelerIniVersionServiceImpl.java

@@ -43,6 +43,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
+import javax.validation.constraints.NotNull;
 import java.io.File;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -84,7 +85,6 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
         Integer checkStatus = req.getCheckStatus();
         Page<PagePlanRes> page = new Page<>(req.getPage(), req.getSize());
         return ResponseBeanBuilder.ok(versionMapper.pagePlan(page, name, checkStatus));
-
     }
 
     @Override
@@ -122,12 +122,12 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
         );
         /*基础信息*/
         Map<String, String> baseMap = new HashMap<String, String>() {{
-            put("project", req.getName());
-            put("part", req.getName());
-            put("btlPartNo", req.getName());
-            put("clientPartNo", req.getName());
-            put("verson", req.getName());
-            put("Dmba", req.getName());
+            put("project", req.getProject());
+            put("part", req.getPart());
+            put("btlPartNo", req.getBtlPartNo());
+            put("clientPartNo", req.getClientPartNo());
+            put("verson", req.getVerson());
+            put("Dmba", req.getDmba());
         }};
 
         List<Long> principalIds = req.getPrincipalIds();
@@ -140,7 +140,7 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
         BentelerIniVersion version = BentelerIniVersion.builder()
                 .planId(plan.getId())
                 .allChecktype(Convert.toStr(allCheckType))
-                .baseMap(Convert.toStr(baseMap))
+                .baseMap(JSONUtil.toJsonStr(baseMap))
                 .checkStatus(CheckStatus.未完成.value)
                 .beginDate(req.getBeginDate())
                 .endDate(req.getEndDate())
@@ -223,7 +223,8 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
 
     @Override
     public ResponseBean<PageBean<unAuditListRes>> unAuditList(PlanListReq req) {
-        Page<unAuditListRes> unAuditListResPage = versionMapper.unAuditList(req);
+        Page<unAuditListRes> page = new Page<>(req.getPage(), req.getSize());
+        Page<unAuditListRes> unAuditListResPage = versionMapper.unAuditList(page, req);
         return ResponseBeanBuilder.ok(unAuditListResPage, Function.identity());
     }
 
@@ -232,7 +233,8 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
         Long versionId = req.getId();
         BentelerIniVersion version = versionService.getById(versionId);
         String baseMap = version.getBaseMap();
-        Map<String, String> stringStringMap = Convert.toMap(String.class, String.class, baseMap);
+        Map<String, String> stringStringMap = Convert.toMap(String.class, String.class, JSONUtil.parseObj(baseMap));
+
         GetVersionBaseRes basemap = GetVersionBaseRes.builder()
                 .project(stringStringMap.get("project"))
                 .part(stringStringMap.get("part"))
@@ -249,21 +251,47 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
     public ResponseBean<AddIniPlanReq> getUnAuditDetails(BaseIdReq req) {
         Long planId = req.getId();
         BentelerPlan plan_DB = planService.getById(planId);
+        if (plan_DB==null){
+            return ResponseBeanBuilder.fail("计划不存在,请检查计划id");
+        }
         BentelerIniVersion unAuditVersion = versionMapper.getPlan_UnAuditVersion(planId);
-        BentelerPlan plan = BentelerPlan.builder()
-                .name(plan_DB.getName())
-                .version(unAuditVersion)
-                .build();
-        return ResponseBeanBuilder.ok(planPo2planReq(plan));
+        if (unAuditVersion==null){
+            ResponseBeanBuilder.fail("计划无审核中信息");
+        }
+        BentelerPlan plan1 = assemblerVersionId_plan(unAuditVersion.getId());
+
+
+        return ResponseBeanBuilder.ok(planPo2planReq(plan1));
     }
 
     @Override
     public ResponseBean<AddIniPlanReq> getCurrentDetails(BaseIdReq req) {
-        Long versionId = req.getId();
+        Long planId = req.getId();
+        BentelerIniVersion currentVersion = versionMapper.getPlan_CurrentVersion(planId);
+        if (currentVersion==null){
+            return ResponseBeanBuilder.fail("版本暂未审核通过");
+        }
+        BentelerPlan plan = assemblerVersionId_plan(currentVersion.getId());
+
+        return ResponseBeanBuilder.ok(planPo2planReq(plan));
+    }
+
+    private BentelerPlan assemblerVersionId_plan(Long versionId) {
         BentelerIniVersion version = versionService.getById(versionId);
         BentelerPlan plan = planService.getById(version.getPlanId());
-        plan.setVersion(versionMapper.getPlan_UnAuditVersion(plan.getId()));
-        return ResponseBeanBuilder.ok(planPo2planReq(plan));
+
+        List<BentelerIniWorkstation> works = workstationService.list(Wrappers.<BentelerIniWorkstation>lambdaQuery()
+                .eq(BentelerIniWorkstation::getVersionId, version.getId())
+        );
+        List<BentelerIniWorkstation> ass_works = works.stream().map(workstation -> {
+            List<BentelerIniVersionItem> versionItems = versionItemService.list(Wrappers.<BentelerIniVersionItem>lambdaQuery()
+                    .eq(BentelerIniVersionItem::getWorkstationId, workstation.getId()));
+            workstation.setVersionItems(versionItems);
+            return workstation;
+        }).collect(Collectors.toList());
+        version.setWorkstations(ass_works);
+        plan.setVersion(version);
+        return plan;
     }
 
     @Override
@@ -299,8 +327,6 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
 
             }
         });
-
-
         return ResponseBeanBuilder.ok();
     }
 
@@ -379,7 +405,7 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
 
             workDetailsRes res = workDetailsRes.builder()
                     .workName(workstation.getWorkstation() + "-" + workstation.getProductionLine())
-                    .submitType(saveOrSubmit==true?1:2)
+                    .submitType(saveOrSubmit == true ? 1 : 2)
                     .build();
             resList.add(res);
         });
@@ -392,7 +418,6 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
         BentelerIniCheckResult checkResult = checkResultService.getOne(Wrappers.<BentelerIniCheckResult>lambdaQuery()
                 .eq(BentelerIniCheckResult::getVersionId, versionId)
                 .like(BentelerIniCheckResult::getCreatedTime, LocalDate.now())
-                .eq(BentelerIniCheckResult::getRepeat, 0)
         );
         List<BentelerIniVersionItem> versionItems = versionMapper.getWork_VersionItem(
                 req.getWorkStationId(),
@@ -569,7 +594,7 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
         BentelerIniVersion version = BentelerIniVersion.builder()
                 .planId(plan.getId())
                 .allChecktype(Convert.toStr(allCheckType))
-                .baseMap(Convert.toStr(baseMap))
+                .baseMap(JSONUtil.toJsonStr(baseMap))
                 .checkStatus(CheckStatus.未完成.value)
                 .beginDate(req.getBeginDate())
                 .endDate(req.getEndDate())
@@ -665,7 +690,10 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
 
 
         String baseMapStr = version.getBaseMap();
-        Map<String, String> baseMap = Convert.toMap(String.class, String.class, baseMapStr);
+
+
+        Map<String, String> baseMap = Convert.toMap(String.class, String.class, JSONUtil.parseObj(baseMapStr));
+
         //责任人
         Long principleOne = version.getPrincipleOne();
         Long getPrincipleTwo = version.getPrincipleTwo();
@@ -718,7 +746,11 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
 
         List<getCheckResutGreadRes> checkResutGread = getCheckResutGread(resutGreadReq);
         BentelerIniVersion version = versionService.getById(versionId);
-        Map<String, String> baseMap = Convert.toMap(String.class, String.class, version.getBaseMap());
+
+
+        Map<String, String> baseMap = Convert.toMap(String.class, String.class,
+                JSONUtil.parseObj(version.getBaseMap()));
+
 
         // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替
         String templateFileName = "systemLib/template/首件计划表.xlsx";
@@ -784,6 +816,7 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
 
     @Override
     public ResponseBean<List<abnormalListRes>> abnormalList() {
+        //异常记录
         List<BentelerIniAbnormal> abnormals = iniAbnormalService.list(Wrappers.<BentelerIniAbnormal>lambdaQuery()
                 .eq(BentelerIniAbnormal::getSolveFlag, false)
                 .like(BentelerIniAbnormal::getOpenTime, LocalDate.now())
@@ -797,4 +830,20 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
         }).collect(Collectors.toList());
         return ResponseBeanBuilder.ok(resList);
     }
+
+    @Override
+    public ResponseBean<List<BentelerIniWorkstation>> abnormalWorkGroup(BaseTypeReq req) {
+        Long versionId = req.getId();
+        List<BentelerIniAbnormal> abnormals = iniAbnormalService.list(Wrappers.<BentelerIniAbnormal>lambdaQuery()
+                .eq(BentelerIniAbnormal::getSolveFlag, false)
+                .like(BentelerIniAbnormal::getOpenTime, LocalDate.now())
+                .eq(BentelerIniAbnormal::getVersionId, versionId)
+                .eq(BentelerIniAbnormal::getCheckType, req.getType())
+        );
+        Map<Long, List<BentelerIniAbnormal>> work_map = abnormals.stream().collect(Collectors.groupingBy(BentelerIniAbnormal::getWorkstationId));
+        List<BentelerIniWorkstation> works = work_map.keySet().stream()
+                .map(bentelerIniAbnormals -> workstationService.getById(bentelerIniAbnormals))
+                .collect(Collectors.toList());
+        return ResponseBeanBuilder.ok(works);
+    }
 }

application-facade/src/main/java/com/factory/web/service/ini/BentelerIniVersionService.java

@@ -77,5 +77,7 @@ public interface BentelerIniVersionService extends IService<BentelerIniVersion>
     List<getCheckResutGreadRes> getCheckResutGread(getCheckResutGreadReq req);
 
     ResponseBean<List<abnormalListRes>> abnormalList();
+
+    ResponseBean<List<BentelerIniWorkstation>> abnormalWorkGroup(BaseTypeReq id);
 }
 

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

@@ -28,12 +28,12 @@
             and biv.deleted=0
             and biw.deleted=0
             and bivi.deleted=0
-            #名称过滤的
+            -- 名称过滤的
             <if test="name!=null and name!=''">
                 <bind name="pname" value="'%'+name+'%'"/>
                 and bp.name like #{pname}
             </if>
-            #状态过滤
+            -- 状态过滤
             <if test="checkStatus!=null">
                 and biv.check_status = #{checkStatus}
             </if>
@@ -96,14 +96,12 @@
         left join benteler_ini_workstation biw on biv.id = biw.version_id
         left join benteler_ini_version_item bivi on biw.id = bivi.workstation_id
         <where>
-            #名称过滤的
-            <if test="name!=null and name!=''">
-                <bind name="pname" value="'%'+name+'%'"/>
+            <if test="req.name!=null and req.name!=''">
+                <bind name="pname" value="'%'+req.name+'%'"/>
                 and bp.name like #{pname}
             </if>
-            #状态过滤
-            <if test="checkStatus!=null">
-                and biv.check_status = #{checkStatus}
+            <if test="req.checkStatus!=null">
+                and biv.check_status = #{req.checkStatus}
             </if>
             and (biv.review_status &lt; 2 or biv.review_status = 4)
             and biv.deleted=0

common-base/src/main/java/com/factory/base/entity/po/benteler/BentelerIniAbnormal.java

@@ -54,4 +54,8 @@ public class BentelerIniAbnormal implements Serializable {
     @ApiModelProperty(value = "0未解决 1已解决")
     private Boolean solveFlag;
 
+    @ApiModelProperty(value = "1首件2二百件3中断")
+    private Integer checkType;
+
+
 }

common-base/src/main/java/com/factory/base/entity/po/benteler/BentelerIniCheckItem.java

@@ -58,6 +58,10 @@ public class BentelerIniCheckItem implements Serializable {
     @ApiModelProperty(value = "审核结果json")
     private String gread;
 
+
+    @ApiModelProperty(value = "重检序号")
+    private Integer repeat;
+
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "逻辑删除", hidden = true)
     private Integer deleted;

common-base/src/main/java/com/factory/base/entity/po/benteler/BentelerIniCheckResult.java

@@ -52,9 +52,6 @@ public class BentelerIniCheckResult implements Serializable {
     @ApiModelProperty(value = "存在异常")
     private Boolean abnormalFlag;
 
-    @ApiModelProperty(value = "重检序号")
-    private Integer repeat;
-
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "逻辑删除", hidden = true)
     private Integer deleted;

common-base/src/main/java/com/factory/base/entity/po/benteler/BentelerIniWorkstation.java

@@ -39,9 +39,6 @@ public class BentelerIniWorkstation implements Serializable {
     @ApiModelProperty(value = "工作站")
     private String workstation;
 
-    @ApiModelProperty(value = "保存状态 1 保存 2提交")
-    private Integer status;
-
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "逻辑删除", hidden = true)
     private Integer deleted;