Merge branch 'gaoying' into 'dev'

Gaoying

See merge request !165

quality-review/src/main/java/com/ruoyi/domain/vo/SampleTaskVo.java

 package com.ruoyi.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -12,7 +15,14 @@ import java.util.List;
 @NoArgsConstructor
 @Data
 public class SampleTaskVo {
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long taskId;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long SampleId;
+
     private String taskNo;
 }

quality-review/src/main/resources/mapper/SampleManagementMapper.xml

@@ -172,8 +172,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sampleName"    column="sample_name"    />
         <result property="enterpriseId"    column="enterprise_id"    />
     </resultMap>
-    <select id="findByIdList" resultMap="SampleListResponse">
-        select id,identification_code,sample_number,sample_name,enterprise_id from t_sample
+    <select id="findByIdList" resultMap="SampleManagementResult">
+        select id,identification_code,sample_number,sample_name,enterprise_id,trademark,sample_photos,number_of_samples,delivery_date,sample_sender,manufacturing_enterprise,manufacture_date  from t_sample
         WHERE id IN
         <foreach collection="relationList" item="relation" open="(" separator="," close=")">
             #{relation.sampleId}