焊口修复接口,已经焊口修复弹窗接口

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

+package com.yeejoin.amos.boot.module.ugp.api.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author cpp
+ * @Description
+ * @Date 2022/12/1
+ */
+@Data
+public class CodeWeldDto {
+    private String code;
+    private Date date;
+}

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/VerifyMapper.java

 package com.yeejoin.amos.boot.module.ugp.api.mapper;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ugp.api.dto.CodeWeldDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.SmartListDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Verify;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -31,6 +33,8 @@ public interface VerifyMapper extends BaseMapper<Verify> {
    //
     List<Verify> selectByWelder(Long projectId,Long welderId,String code,String stage,Long random);
     Verify selectByCode(String code,Long projectId,String stage,Long random);
+    List<CodeWeldDto> getCode();
+    List<Verify> getVerity(String code);
 
 
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/WeldMapper.java

@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.ugp.api.dto.WeldDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Weld;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -27,4 +28,7 @@ public interface WeldMapper extends BaseMapper<Weld> {
 
      IPage<WeldDto> queryForWeldPage(IPage<WeldDto> page, Set<String> codes,@RequestBody(required = false) WeldDto weldDto) ;
 
+
+    @Select("select * from tz_ugp_weld where `code` =#{code}")
+    WeldDto getSqe(@Param("code") String code);
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/VerifyMapper.xml

@@ -111,4 +111,39 @@
             target_info -> "$.random" =#{random}
         </if>
     </select>
+
+    <select id="getCode" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.CodeWeldDto">
+        select
+         `code`,
+         MAX(verify_time) AS `date`
+         from
+         tz_ugp_verify
+         where
+         `status`='0'
+          AND
+          stage ='CRAFT' or stage ='VOLTAGE' or stage ='LAY' or stage ='LOTCATION' or stage ='BACKFILL'
+          GROUP BY `code`
+    </select>
+
+    <select id="getVerity" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Verify">
+       select
+        sequence_nbr,
+        project_id,
+        `code`,
+        stage,
+        target_info,
+        `status`,
+        type,
+        submit_time,
+        verify_time,
+        verify_unit_id,
+        charger_person_id,
+        inspector_id
+        from tz_ugp_verify where stage='CRAFT'
+         AND
+         `code`=#{code}
+    </select>
+
+
+
 </mapper>

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

@@ -447,6 +447,36 @@ public class VerifyController extends BaseController {
 		return ResponseHelper.buildResponse(objectPage1);
 	}
 
+
+
+	/**
+	 *
+	 焊口修复
+	 */
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "焊口修复", notes = "焊口修复")
+	@GetMapping(value = "/repair")
+	public ResponseModel<Page<WeldDto>> repair(@RequestParam(value = "current") int current, @RequestParam
+			(value = "size") int size, WeldDto weldDto) {
+
+		return ResponseHelper.buildResponse(verifyServiceImpl.repair(current,size,weldDto));
+	}
+
+
+
+	/**
+	 *
+	 焊口修复弹窗
+	 */
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "焊口修复弹窗", notes = "焊口修复弹窗")
+	@GetMapping(value = "/fixedPopovers")
+	public ResponseModel<Page<TableDto>> fixedPopovers(@RequestParam String code) {
+		return ResponseHelper.buildResponse(verifyServiceImpl.fixedPopovers(code));
+	}
+
 }