haozq
/
ah_sz_gqj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

试验标准管理修改

This commit is contained in:
cwchen 2024-07-23 15:20:00 +08:00
parent 19075d5648
commit c88af677e0
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.bonus.aqgqj.basis.service.impl; package com.bonus.aqgqj.basis.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.bonus.aqgqj.advice.ValidatorsUtils; import com.bonus.aqgqj.advice.ValidatorsUtils;
@ -8,13 +7,10 @@ import com.bonus.aqgqj.basis.dao.ExperimentStandardMapper;
import com.bonus.aqgqj.basis.entity.dto.ParamsDto; import com.bonus.aqgqj.basis.entity.dto.ParamsDto;
import com.bonus.aqgqj.basis.entity.vo.*; import com.bonus.aqgqj.basis.entity.vo.*;
import com.bonus.aqgqj.basis.service.ExperimentStandardService; import com.bonus.aqgqj.basis.service.ExperimentStandardService;
import com.bonus.aqgqj.system.vo.LoginUser;
import com.bonus.aqgqj.utils.ServerResponse; import com.bonus.aqgqj.utils.ServerResponse;
import com.bonus.aqgqj.utils.UserUtil;
import com.bonus.aqgqj.webResult.Constants; import com.bonus.aqgqj.webResult.Constants;
import com.bonus.aqgqj.webResult.HttpStatus; import com.bonus.aqgqj.webResult.HttpStatus;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.catalina.security.SecurityUtil;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -160,7 +156,6 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
} }
// 添加试验依据 // 添加试验依据
mapper.addBasiss(experConfigVo.getBasisVos()); mapper.addBasiss(experConfigVo.getBasisVos());
mapper.addDev(experConfigVo.getDeviceVos());
// 添加试验主要设备 // 添加试验主要设备
for (ConfigMainDevVo mainDeviceVo : experConfigVo.getMainDeviceVos()) { for (ConfigMainDevVo mainDeviceVo : experConfigVo.getMainDeviceVos()) {
mainDeviceVo.setConfigId(experConfigVo.getId()); mainDeviceVo.setConfigId(experConfigVo.getId());

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

@ -152,7 +152,15 @@ public class ExperimentalServiceImpl implements ExperimentalService {
// 添加试验依据信息数据 // 添加试验依据信息数据
mapper.addConfigBasis(vo.getBasisVos(), vo.getId()); mapper.addConfigBasis(vo.getBasisVos(), vo.getId());
for (int i = 0; i < vo.getExperDevVos().size(); i++) { for (int i = 0; i < vo.getExperDevVos().size(); i++) {
ExperDevVo experDevVo = vo.getExperDevVos().get(i);
// 添加试验样品数据 // 添加试验样品数据
/*if(experDevVo.getDevData().contains(Constants.ERROR_RESULT) ||
experDevVo.getDevData().contains(Constants.ERROR_RESULT2)
){
sample.setTestResult(Constants.ERROR_RESULT);
}else{
sample.setTestResult(Constants.SUCCESS_RESULT);
}*/
mapper.addExperDev(vo.getExperDevVos().get(i), vo.getId()); mapper.addExperDev(vo.getExperDevVos().get(i), vo.getId());
if (i == 0) { if (i == 0) {
for (ConfigItemsVo configItemsVo : vo.getConfigItemsVos()) { for (ConfigItemsVo configItemsVo : vo.getConfigItemsVos()) {