焊工附件详情

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

@@ -323,4 +323,14 @@ public class WelderController extends BaseController {
                                                      @RequestParam(value = "size") int size) {
         return ResponseHelper.buildResponse(welderServiceImpl.getWelderChangeList(projectId,current,size));
     }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "焊工附件详情", notes = "焊工附件详情")
+    @GetMapping(value = "/getWelderDetailData/{sequenceNbr}")
+    public ResponseModel<Object> getWelderDetail(@PathVariable String sequenceNbr) {
+        return ResponseHelper.buildResponse(welderServiceImpl.getWelderDetail(sequenceNbr));
+    }
+
+
 }

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

@@ -759,7 +759,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
             projectResourceAuditDto.getResourceObject().forEach(item -> {
                 ProjectResource projectResource = new ProjectResource();
                 projectResource.setProjectId(projectResourceAuditDto.getProjectId());
-                projectResource.setResourceId(Long.valueOf(String.valueOf(item.get("id"))));
+                projectResource.setResourceId(Long.valueOf(String.valueOf(item.get("sequenceNbr"))));
                 projectResource.setName(String.valueOf(item.get("name")));
                 projectResource.setType(projectResourceAuditDto.getType());
                 projectResource.setStatus("0");

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

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormInstanceServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectResourceEnum;
@@ -34,6 +36,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 import static com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectResourceEnum.*;
@@ -50,6 +53,9 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,P
     @Autowired
     ProjectResourceMapper projectResourceMapper;
 
+    @Resource
+    DynamicFormInstanceServiceImpl alertFormValueServiceImpl;
+
     @Autowired
     EquipmentMapper equipmentMapper;
 
@@ -378,4 +384,6 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,P
         }
        return projectResource;
     }
+
+
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -288,10 +289,10 @@ public class WelderServiceImpl {
             objectLambdaQueryWrapper.eq(DynamicFormInstance::getInstanceId,userSequenceNbr);
             List<DynamicFormInstance> list = alertFormValueServiceImpl.list(objectLambdaQueryWrapper);
             Map<String, Object> maps = new HashMap<>();
+            maps.put("sequenceNbr",userSequenceNbr);
             for (DynamicFormInstance dynamicFormInstance : list) {
                 maps.put(dynamicFormInstance.getFieldCode(),dynamicFormInstance.getFieldValue());
             }
-            maps.put("sequenceNbr",userSequenceNbr);
             objects.add(maps);
         }
         page.setRecords(objects);
@@ -300,4 +301,26 @@ public class WelderServiceImpl {
 
     }
 
+    private static  final String IMAGES="images";
+    public Map<String, Object> getWelderDetail(String sequenceNbr) {
+        Map<String, Object> maps = new HashMap<>();
+        maps.put("sequenceNbr",sequenceNbr);
+        LambdaQueryWrapper<DynamicFormInstance> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        objectLambdaQueryWrapper.eq(DynamicFormInstance::getInstanceId,sequenceNbr);
+        List<DynamicFormInstance> list = alertFormValueServiceImpl.list(objectLambdaQueryWrapper);
+        for (DynamicFormInstance dynamicFormInstance : list) {
+            if ("image".equals(dynamicFormInstance.getFieldCode())) {
+                String fieldValue = dynamicFormInstance.getFieldValue();
+                JSONArray jsonArray = JSONArray.parseArray(fieldValue);
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("image1",jsonArray);
+
+                maps.put(IMAGES,jsonObject);
+
+            }else {
+                maps.put(dynamicFormInstance.getFieldCode(),dynamicFormInstance.getFieldValue());
+            }
+        }
+        return maps;
+    }
 }