修改弹窗接口

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

@@ -15,4 +15,6 @@ public class OpenDto {
     private  String accord;     //符合性
      private String   valid;    //有效性
     private  String result;//结果
+    private Long detailId;//跳转id
+
 }

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

@@ -110,7 +110,7 @@ public class SmartListDto extends BaseDto {
     private String stage;
 
 
-
-
-
+    private Long  welderId;
+    private Long  weldingId;
+    private Long  materialId;
 }

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

@@ -290,8 +290,10 @@ public class VerifyController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@GetMapping(value = "/selectById")
 	@ApiOperation(httpMethod = "GET", value = "主键id查询verity表", notes = "主键id查询verity表")
-	public ResponseModel<OpenDto> selectById(@RequestParam Long sequenceNbr) {
-		return ResponseHelper.buildResponse(verifyServiceImpl.selectById(sequenceNbr));
+	public ResponseModel<Page<OpenDto>> selectById(@RequestParam Long sequenceNbr) {
+		Page<OpenDto> page = new Page<>( );
+		page.setRecords(verifyServiceImpl.selectById(sequenceNbr));
+		return ResponseHelper.buildResponse(page);
 	}
 
 

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

@@ -191,6 +191,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
 
                 Long welderId = jsonObject.getLong("welderId");
                 if (welderId!=null) {
+                    dto.setWelderId(welderId);
                     OrgUsr orgUsr = orgService.getOrgUsrById(welderId.toString());
                     if (orgUsr != null) {
                         if (!StringUtils.isEmpty(orgUsr.getBizOrgName())) {
@@ -221,6 +222,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
 
                 Long weldingId = jsonObject.getLong("weldingId");
                 if (weldingId !=null) {
+                    dto.setWeldingId(weldingId);
                     EquipmentDto equipmentDto = equipmentService.queryBySeq(weldingId);
                     if (equipmentDto != null) {
                         //设备名  设备编号
@@ -231,6 +233,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
 
                 Long materialId = jsonObject.getLong("materialId");
                 if (materialId!=null) {
+                    dto.setMaterialId(materialId);
                     MaterialDto materialDto = materialService.queryBySeq(materialId);
                     if (materialDto != null) {
                         //管材厂家 生产编号
@@ -808,7 +811,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
      * @param sequenceNbr
      * @return
      */
-    public OpenDto selectById(Long sequenceNbr ){
+    public List<OpenDto> selectById(Long sequenceNbr ){
 
         Verify verify = verifyMapper.selectById(sequenceNbr);
         OpenDto openDto = new OpenDto( );
@@ -845,9 +848,32 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
             openDto.setValid("有效");
             openDto.setAccord("符合");
 
+            if (StageEnum.焊前人员.getStage().equals(verify.getStage())) {
+                Long welderId = object.getLong("welderId");
+                if (welderId != null) {
+                    openDto.setDetailId(welderId);
+                }
+            }
+            if (StageEnum.焊前设备.getStage().equals(verify.getStage())) {
+                Long weldingId = object.getLong("weldingId");
+                if (weldingId != null) {
+                    openDto.setDetailId(weldingId);
+                }
+            }
+            if (StageEnum.焊前管材质量.getStage().equals(verify.getStage())) {
+                Long materialId = object.getLong("materialId");
+                if (materialId != null) {
+                    openDto.setDetailId(materialId);
+                }
+            }
+
+
+
 
         }
-        return openDto ;
+        ArrayList<OpenDto> list = new ArrayList<>( );
+        list.add(openDto);
+        return list  ;
     }