开发 项目竣工-焊口列表接口

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/ColorEnum.java

+package com.yeejoin.amos.boot.module.ugp.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ColorEnum {
+    red("#FF0000"),
+    green("#00FF00");
+
+    String color;
+}

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/WeldDto.java

@@ -67,4 +67,54 @@ public class WeldDto  extends BaseDto {
     @ApiModelProperty(value = "焊口状态(0-进行中，1-已完成)")
     private Integer status;
 
+    /**
+     * 材料检查
+     */
+    private String materialVerify;
+    private Long materialVerifyID;
+    private String materialVerifyColor;
+
+    /**
+     * 人员检查
+     */
+    private String welderVerify;
+    private Long welderVerifyID;
+    private String welderVerifyColor;
+
+    /**
+     * 工艺检查
+     */
+    private String craftVerify;
+    private Long craftVerifyID;
+    private String craftVerifyColor;
+
+    /**
+     * 耐压检查VOLTAGE
+     */
+    private String voltageVerify;
+    private Long voltageVerifyID;
+    private String voltageVerifyColor;
+
+    /**
+     * 埋深检查LAY
+     */
+    private String layVerify;
+    private Long layVerifyID;
+    private String layVerifyColor;
+
+    /**
+     * 敷设定位检查LOTCATION
+     */
+    private String lotcationVerify;
+    private Long lotcationVerifyID;
+    private String lotcationVerifyColor;
+
+    /**
+     * 焊口探伤 1期不做
+     */
+    private String backfillVerify;
+    private Long backfillVerifyID;
+    private String backfillVerifyColor;
+
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WeldController.java

@@ -184,6 +184,17 @@ public class WeldController extends BaseController {
     }
 
     /**
+     * 通过项目id获取焊口编码
+     */
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "查看焊口编码", notes = "查看焊口编码")
+    @GetMapping(value = "/weldInfos")
+    public ResponseModel<IPage<WeldDto>> getWeldInfoByProjectId(long current,long size,String projectId) {
+        return ResponseHelper.buildResponse(weldServiceImpl.getWeldInfoByProjectId(current,size,projectId));
+    }
+
+    /**
      * 通过项目id获取焊口智能监验信息
 
      */

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/WeldServiceImpl.java

@@ -9,10 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
-import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectInitiationEnum;
-import com.yeejoin.amos.boot.module.ugp.api.Enum.StageEnum;
-import com.yeejoin.amos.boot.module.ugp.api.Enum.WeldCodeEnum;
-import com.yeejoin.amos.boot.module.ugp.api.Enum.WeldMethodEnum;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.*;
 import com.yeejoin.amos.boot.module.ugp.api.dto.*;
 import com.yeejoin.amos.boot.module.ugp.api.entity.*;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectMapper;
@@ -22,8 +19,10 @@ import com.yeejoin.amos.boot.module.ugp.api.mapper.WeldMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.IWeldService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
+import org.apache.commons.beanutils.BeanMap;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.http.entity.ContentType;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
@@ -68,6 +67,9 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
     @Autowired
     ProjectServiceImpl projectService;
 
+    @Autowired
+    VerifyServiceImpl verifyService;
+
 
 //    Logger logger = LoggerFactory.getLogger(WeldServiceImpl.class);
 
@@ -239,8 +241,82 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
         page.setSize(size);
         LambdaQueryWrapper<Weld> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Weld::getProjectId,projectId);
-        IPage<Weld> weldList = this.page(page,wrapper);
-        return weldList;
+        IPage<Weld> weldPage = this.page(page,wrapper);
+        return weldPage;
+    }
+
+    public IPage<WeldDto> getWeldInfoByProjectId(long current,long size,String projectId){
+        IPage<Weld> weldPage = lookCode(current,size,projectId);
+        List<WeldDto> weldDtos = getWeldVerify(weldPage);
+        IPage<WeldDto> page = new Page<>();
+        BeanUtils.copyProperties(weldPage, page);
+        page.setRecords(weldDtos);
+        return page;
+    }
+
+    public List<WeldDto> getWeldVerify(IPage<Weld> weldPage){
+        List<Weld> weldList = weldPage.getRecords();
+        List<WeldDto> weldDtos = new ArrayList<>();
+        for(Weld weld : weldList){
+            WeldDto weldDto = new WeldDto();
+            BeanUtils.copyProperties(weld, weldDto);
+            String weldCode = weld.getCode();
+            LambdaQueryWrapper<Verify> wapper = new LambdaQueryWrapper<>();
+            wapper.eq(Verify::getCode,weldCode);
+            List<Verify> verifyList = verifyService.list(wapper);
+            for (Verify verify : verifyList) {
+                if(StageEnum.焊前人员.getStage().equals(verify.getStage())){
+                    weldDto.setWelderVerify("详情");
+                    weldDto.setWelderVerifyID(verify.getSequenceNbr());
+                    weldDto.setWelderVerifyColor(ColorEnum.green.getColor());
+                    if(VerifyEnum.未通过.getStatus().equals(verify.getStatus())){
+                        weldDto.setWelderVerifyColor(ColorEnum.red.getColor());
+                    }
+                }
+                if(StageEnum.焊前管材质量.getStage().equals(verify.getStage())){
+                    weldDto.setMaterialVerify("详情");
+                    weldDto.setMaterialVerifyID(verify.getSequenceNbr());
+                    weldDto.setMaterialVerifyColor(ColorEnum.green.getColor());
+                    if(VerifyEnum.未通过.getStatus().equals(verify.getStatus())){
+                        weldDto.setMaterialVerifyColor(ColorEnum.red.getColor());
+                    }
+                }
+                if(StageEnum.焊接工艺.getStage().equals(verify.getStage())){
+                    weldDto.setCraftVerify("详情");
+                    weldDto.setCraftVerifyID(verify.getSequenceNbr());
+                    weldDto.setCraftVerifyColor(ColorEnum.green.getColor());
+                    if(VerifyEnum.未通过.getStatus().equals(verify.getStatus())){
+                        weldDto.setCraftVerifyColor(ColorEnum.red.getColor());
+                    }
+                }
+                if(StageEnum.管道耐压.getStage().equals(verify.getStage())){
+                    weldDto.setVoltageVerify("详情");
+                    weldDto.setVoltageVerifyID(verify.getSequenceNbr());
+                    weldDto.setVoltageVerifyColor(ColorEnum.green.getColor());
+                    if(VerifyEnum.未通过.getStatus().equals(verify.getStatus())){
+                        weldDto.setVoltageVerifyColor(ColorEnum.red.getColor());
+                    }
+                }
+                if(StageEnum.敷设质量.getStage().equals(verify.getStage())){
+                    weldDto.setLayVerify("详情");
+                    weldDto.setLayVerifyID(verify.getSequenceNbr());
+                    weldDto.setLayVerifyColor(ColorEnum.green.getColor());
+                    if(VerifyEnum.未通过.getStatus().equals(verify.getStatus())){
+                        weldDto.setLayVerifyColor(ColorEnum.red.getColor());
+                    }
+                }
+                if(StageEnum.定位.getStage().equals(verify.getStage())){
+                    weldDto.setLotcationVerify("详情");
+                    weldDto.setLotcationVerifyID(verify.getSequenceNbr());
+                    weldDto.setLotcationVerifyColor(ColorEnum.green.getColor());
+                    if(VerifyEnum.未通过.getStatus().equals(verify.getStatus())){
+                        weldDto.setLotcationVerifyColor(ColorEnum.red.getColor());
+                    }
+                }
+            }
+            weldDtos.add(weldDto);
+        }
+        return weldDtos;
     }
 
     /**