1. 发起申请时完成页面返回的数据为code bug修改

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

@@ -27,12 +27,16 @@ public class JyjcInspectionApplicationModel extends BaseModel {
 
     @ApiModelProperty(value = "检验检测单位编码")
     private String inspectionUnitCode;
+
     @ApiModelProperty(value = "检验检测单位名称")
     private String inspectionUnitName;
 
     @ApiModelProperty(value = "检验检测类型")
     private String inspectionType;
 
+    @ApiModelProperty(value = "检验检测类型名称")
+    private String inspectionTypeName;
+
     @ApiModelProperty(value = "设备种类")
     private String equipClassify;
 

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

@@ -11,11 +11,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sun.org.apache.bcel.internal.generic.NEW;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
-import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -23,7 +21,6 @@ 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.*;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.BizTypeEnum;
-import com.yeejoin.amos.boot.module.jyjc.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.DocumentEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.ResultStatusEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationEquipMapper;
@@ -34,14 +31,15 @@ import com.yeejoin.amos.boot.module.jyjc.biz.feign.JgFeignClient;
 import com.yeejoin.amos.boot.module.jyjc.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.TaskModelServiceImpl;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler.JyjcInspectionApplicationHandlerFactory;
+import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.*;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -56,16 +54,10 @@ import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
 
 
-import static com.alibaba.fastjson.JSON.parseArray;
-import static com.yeejoin.amos.boot.biz.common.service.impl.WorkflowExcuteServiceImpl.buildOrderNo;
-
 /**
  * 服务实现类
  *
@@ -120,6 +112,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     @Autowired
     DataDictionaryServiceImpl dataDictionaryService;
 
+    @Autowired
+    EquipmentCategoryMapper equipmentCategoryMapper;
+
     public JyjcInspectionApplicationModel save(@RequestBody JSONObject obj) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 
@@ -314,7 +309,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     jyjcInspectionApplicationAttachmentService.getBaseMapper().insert(attachments);
                 }
             }
-            model.setStatus(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode())); //6611 对应数据字典 检验流程状态 待受理
+            //6611 对应数据字典 检验流程状态 待受理
+            model.setStatus(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode()));
 
             ArrayList<String> roleList = new ArrayList<>();
             String taskId = model.getNextTaskId();
@@ -356,9 +352,22 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             executeOneStep(model, taskName1, nextUserIds);
             this.updateWithModel(model);
         }
+        return this.buildRedundancyField(model);
+    }
+
+    private JyjcInspectionApplicationModel buildRedundancyField(JyjcInspectionApplicationModel model) {
+        // 冗余前端显示检验检测类型名称
+        if(StringUtils.isNotEmpty(model.getInspectionType())){
+            model.setInspectionTypeName(getInspectionTypeName(model.getInspectionType()));
+        }
         return model;
     }
 
+    private String getInspectionTypeName(String inspectionType){
+        DataDictionary dictionary = dataDictionaryService.getByCode(inspectionType,"JYJC");
+        return dictionary != null ? dictionary.getName() : "";
+    }
+
 
     @Override
     public Boolean deleteBatchData(List<Long> sequenceNbr) {