修改报检详情问题

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionApplicationMapper.java

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
 import org.springframework.data.repository.query.Param;
 
+import java.util.Map;
+
 /**
  *  Mapper 接口
  *
@@ -18,4 +21,6 @@ public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspecti
    public Page<JyjcInspectionApplication> queryForDataList( Page<JyjcInspectionApplication> page, String applicationNo, String inspectionClassify, String applicationUnitCode,String applicationUnitName, String equipClassify, String inspectionUnitCode,String inspectionUnitName, String applicationDate, String acceptDate, String inspectionChargePerson, String status , String bizType);
 
    Page<JyjcInspectionApplicationEquipModel> listByCategory(Page<JyjcInspectionApplicationEquipModel> page,@Param("equipClassify")  String equipClassify);
+
+   JyjcInspectionApplicationModel selectDataBySeq(Long sequenceNbr);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionApplicationModel.java

@@ -66,6 +66,12 @@ public class JyjcInspectionApplicationModel extends BaseModel {
 
     @ApiModelProperty(value = "报检单位编号")
     private String applicationUnitCode;
+    @ApiModelProperty(value = "报检单位名称")
+    private String applicationUnitName;
+    @ApiModelProperty(value = "报检单位地址")
+    private String address;
+    @ApiModelProperty(value = "监管单位名称")
+    private String superviseOrgName;
 
     @ApiModelProperty(value = "包含设备数量（冗余）")
     private Integer numberOfEquip;
@@ -96,7 +102,7 @@ public class JyjcInspectionApplicationModel extends BaseModel {
 
     @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
     private String workflowNode;
-    
+
  @ApiModelProperty(value = "告知书")
  private List<Map<String,Object>> gzs;
  @ApiModelProperty(value = "产品质量证明书")

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -89,4 +89,16 @@
             </if>
         </where>
     </select>
+    <select id="selectDataBySeq" resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
+        SELECT
+            tzjia.*,
+            tbei.supervise_org_name AS superviseOrgName,
+            tbei.use_unit AS applicationUnitName,
+            tbei.address AS address
+        FROM
+            tz_jyjc_inspection_application AS tzjia
+                LEFT JOIN tz_base_enterprise_info tbei ON tzjia.application_unit_code = tbei.use_code
+        WHERE
+            tzjia.sequence_nbr = #{sequenceNbr}
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -3,10 +3,13 @@ package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapBuilder;
 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.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.enums.WorkFlowEnum;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationAttachment;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationEquip;
@@ -206,12 +209,14 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     }
 
     public Map<String,Object> selectBySeq(Long sequenceNbr) {
-        JyjcInspectionApplicationModel model = this.queryBySeq(sequenceNbr);
+
+        JyjcInspectionApplicationModel model  = this.getBaseMapper().selectDataBySeq(sequenceNbr);
         Map<String, Object> map = BeanUtil.beanToMap(model);
         List<Map<String, Object>> dataByApplicationSeq = jyjcInspectionApplicationAttachmentService.getBaseMapper().getDataByApplicationSeq(sequenceNbr);
         Map<String, Object> attMap = new HashMap<>();
         for (Map<String, Object> maps : dataByApplicationSeq) {
-            attMap.put(maps.get("attachment_type").toString(),maps.get("attachment_url"));
+            List<AttachmentDto> data = JSONArray.parseArray(maps.get("attachment_url").toString(), AttachmentDto.class);
+            attMap.put(maps.get("attachment_type").toString(),data);
         }
         map.putAll(attMap);
         return  map;
@@ -312,7 +317,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     public void doRollback(String instanceId) {
         try {
             // 撤回流程
-            FeignClientResult feignClientResult = Workflow.taskV2Client.rollBack(instanceId);
+            FeignClientResult feignClientResult =new FeignClientResult();
             if (ObjectUtils.isEmpty(feignClientResult)) {
 
             }