检验检测结果上传结果到安全追溯表

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/JyjcInspectionResultServiceImpl.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -18,9 +20,12 @@ import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultAttach
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultParamService;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultService;
 import com.yeejoin.amos.boot.module.jyjc.biz.utils.JsonUtils;
+import com.yeejoin.amos.boot.module.ymt.api.entity.CategoryOtherInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.InspectionDetectionInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.CategoryOtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.InspectionDetectionInfoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
@@ -68,8 +73,12 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
     @Autowired
     CategoryOtherInfoMapper categoryOtherInfoMapper;
 
-//    @Autowired
-//    InspectionDetectionInfoServiceImpl inspectionDetectionInfoService;
+    @Autowired
+    InspectionDetectionInfoMapper inspectionDetectionInfoMapper;
+
+    @Autowired
+    private Sequence sequence;
+
     /**
      * 检验检测单位分页查询
      */
@@ -117,43 +126,48 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
             attachmentService.saveBatch(attachmentList);
         }
 
-        if (!CollectionUtils.isEmpty(model.getResultParamModelMap())){
+        if (!CollectionUtils.isEmpty(model.getResultParamModelMap())) {
             JyjcInspectionResultParam resultParam = new JyjcInspectionResultParam();
             resultParam.setResultSeq(model.getSequenceNbr());
             resultParam.setParamJson(JSON.toJSONString(model.getResultParamModelMap()));
             resultParamService.save(resultParam);
         }
-
-//        InspectionDetectionInfo info = new InspectionDetectionInfo();
-//        QueryWrapper<InspectionDetectionInfo> wrapper = new QueryWrapper<>();
-//        wrapper.lambda().eq(InspectionDetectionInfo::getInspectReportNo,model.getResultNo());
-//        List<InspectionDetectionInfo> list = inspectionDetectionInfoService.list(wrapper);
-//        if(CollectionUtils.isEmpty(list)){
-//            QueryWrapper<CategoryOtherInfo> queryWrapper = new QueryWrapper<>();
-//            queryWrapper.lambda().eq(CategoryOtherInfo::getSupervisoryCode,model.getEquipUnicode());
-//            List<CategoryOtherInfo> otherInfos = categoryOtherInfoMapper.selectList(queryWrapper);
-//            if(!CollectionUtils.isEmpty(otherInfos)){
-//                info.setRecord(otherInfos.get(0).getRecord());
-//            }
-//        }else{
-//            info = list.get(0);
-//        }
-//        extracted(model, info);
-//        inspectionDetectionInfoService.save(info);
+        //插入操作历史记录
+        InspectionDetectionInfo info = new InspectionDetectionInfo();
+        QueryWrapper<InspectionDetectionInfo> wrapper = new QueryWrapper<>();
+        wrapper.lambda().eq(InspectionDetectionInfo::getInspectReportNo, model.getResultNo());
+        List<InspectionDetectionInfo> list = inspectionDetectionInfoMapper.selectList(wrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            QueryWrapper<CategoryOtherInfo> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(CategoryOtherInfo::getSupervisoryCode, model.getEquipUnicode());
+            List<CategoryOtherInfo> otherInfos = categoryOtherInfoMapper.selectList(queryWrapper);
+            if (!CollectionUtils.isEmpty(otherInfos)) {
+                info.setRecord(otherInfos.get(0).getRecord());
+            }
+            extracted(model, info);
+            info.setSequenceNbr(sequence.nextId() + "");
+            inspectionDetectionInfoMapper.insert(info);
+        } else {
+            info = list.get(0);
+            extracted(model, info);
+            inspectionDetectionInfoMapper.updateById(info);
+        }
         return model;
     }
-//    private void extracted(JyjcInspectionResultModel model, InspectionDetectionInfo info) {
-//        info.setInspectType(model.getInspectionType());
-//        info.setInspectOrgName(model.getInspectionUnitCode());
-////        info.setInspectReport(JSON.toJSONString(model.getResultAttachmentModelList()));
-//        info.setInspectDate(model.getInspectionDate());
-//        info.setInspectConclusion(model.getInspectionConclusion());
-//        info.setProblemRemark(model.getNonConformance());
-//        info.setNextInspectDate(model.getNextInspectionDate());
-//        info.setSequenceCode(model.getEquipUnicode());
-//        info.setInspectOrgCode(model.getUseUnitCreditCode());
-//        info.setInspectReportNo(model.getResultNo());
-//    }
+
+    private void extracted(JyjcInspectionResultModel model, InspectionDetectionInfo info) {
+        info.setInspectType(model.getInspectionType());
+        info.setInspectOrgName(model.getInspectionUnitCode());
+//        info.setInspectReport(JSON.toJSONString(model.getResultAttachmentModelList()));
+        info.setInspectDate(model.getInspectionDate());
+        info.setInspectConclusion(model.getInspectionConclusion());
+        info.setProblemRemark(model.getNonConformance());
+        info.setNextInspectDate(model.getNextInspectionDate());
+        info.setSequenceCode(model.getEquipUnicode());
+        info.setInspectOrgCode(model.getUseUnitCreditCode());
+        info.setInspectReportNo(model.getResultNo());
+    }
+
     /**
      * 列表查询 示例
      */

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/InspectionDetectionInfoModel.java

 package com.yeejoin.amos.boot.module.ymt.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 /**
  * 安全追溯-检验检测信息表
@@ -44,4 +45,13 @@ public class InspectionDetectionInfoModel extends BaseDto {
     private String sequenceCode;
 
     private String superviseCode;
+
+    @ApiModelProperty(value = "监管码")
+    private String record;
+
+    @ApiModelProperty(value = "检验机构统一信用代码")
+    private String inspectOrgCode;
+
+    @ApiModelProperty(value = "检验报告编号")
+    private String inspectReportNo;
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/InspectionDetectionInfo.java

@@ -2,12 +2,12 @@ package com.yeejoin.amos.boot.module.ymt.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * 安全追溯-检验检测信息表
  *
@@ -94,5 +94,14 @@ public class InspectionDetectionInfo extends AbstractEquipBaseEntity {
 
 	@TableField(value ="\"SEQUENCE_CODE\"")
 	private String sequenceCode;
-
+	/**
+	 * 检验机构统一信用代码
+	 */
+	@TableField(value ="\"INSPECT_ORG_CODE\"")
+	private String inspectOrgCode;
+	/**
+	 * 检验报告编号
+	 */
+	@TableField(value ="\"INSPECT_REPORT_NO\"")
+	private String inspectReportNo;
 }