Merge remote-tracking branch 'origin/master'

src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperDevVo.java

@@ -20,8 +20,8 @@ public class ExperDevVo {
     private Long id;
     /**试验表id	*/
     private Long experId;
-    /**编号*/
+    /**客户自编号*/
-    @NotBlank(message = "编号不能为空", groups = {Query.class})
+    @NotBlank(message = "客户自编号不能为空", groups = {Query.class})
     @Length(max = 32, message = "编号字符长度不能超过32", groups = {Query.class})
     private String devCode;
     /**生产厂家*/

src/main/java/com/bonus/aqgqj/basis/entity/vo/TestVo.java

@@ -165,10 +165,12 @@ public class TestVo {
     /**
      * 审核状态
      */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private Integer auditStatus = 0;
     /**
      * 状态
      */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private Integer status = 0;
 
     /**
@@ -191,7 +193,6 @@ public class TestVo {
     /**
      * 试验主要设备
      */
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List<ConfigMainDevVo> mainDeviceVos;
 
     /**
@@ -202,7 +203,6 @@ public class TestVo {
     /**
      * 收样设备list
      */
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List<SampleDeviceVo> sampleDeviceVos;
     /**
      * 试验样品设备list

src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java

@@ -91,6 +91,9 @@ public class ExperimentalServiceImpl implements ExperimentalService {
     public ServerResponse getTestBasicInfo(ParamsDto dto) {
         TestVo vo = new TestVo();
         try {
+            if(dto.getId() == null || StringUtils.isEmpty(dto.getDevTypeCode())){
+                return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "参数完整");
+            }
             // 查询收样基本信息
             vo = mapper.getTestBasicInfo(dto);
             if (vo.getConfigId() == null) {
@@ -285,6 +288,13 @@ public class ExperimentalServiceImpl implements ExperimentalService {
             // 试验数据详情
             testVo = mapper.viewTestData(dto);
             //试验依据信息、试验设备、试验项、试验项目信息、试验样品设备
+            ConfigMainDevVo configMainDevVo = new ConfigMainDevVo();
+            configMainDevVo.setExperDevName(testVo.getExperDev());
+            configMainDevVo.setExperDevModule(testVo.getExperModule());
+            configMainDevVo.setExperDevCode(testVo.getExperCode());
+            configMainDevVo.setDevContractDate(testVo.getCheckTime());
+            List<ConfigMainDevVo> configMainDevVos = new ArrayList<>();
+            configMainDevVos.add(configMainDevVo);
             List<ExperBasisVo> experBasisVos = mapper.getConfigBasis(dto);
             List<ConfigDevVo> experConfigDevs = mapper.getExperConfigDevs(dto);
             List<ConfigItemsVo> configItemsVos = mapper.getExperItems(dto);
@@ -293,6 +303,7 @@ public class ExperimentalServiceImpl implements ExperimentalService {
                 configItemsVo.setItemList(configItemVos);
             }
             List<ExperDevVo> experDevVos = mapper.getExperDev(dto);
+            testVo.setMainDeviceVos(configMainDevVos);
             testVo.setBasisVos(experBasisVos);
             testVo.setDeviceVos(experConfigDevs);
             testVo.setConfigItemsVos(configItemsVos);

src/main/resources/mappers/basis/ExperimentalMapper.xml

@@ -332,7 +332,7 @@
                a.dev_module AS devModule,
                a.exper_local_code AS experLocalCode,
                a.exper_local AS experLocal,
-               ts.id
+               ts.id AS sampleId
         FROM tb_sample ts
         LEFT JOIN (
             SELECT tsd.dev_type_code,