试验管理修改
This commit is contained in:
parent
c88af677e0
commit
9170844462
|
|
@ -63,20 +63,11 @@ public class ExperimentalServiceImpl implements ExperimentalService {
|
|||
for (ExperimentalDetailVo detailVo : list) {
|
||||
// 样品试验结果、样品数量、送样总数
|
||||
List<ExperimentalDetailVo.Sample> sampleList = new ArrayList<>();
|
||||
if(detailVo.getExperId()!=null){
|
||||
List<Map<String,String>> mapList = mapper.getExperDevItemsNum(detailVo.getExperId());
|
||||
if (detailVo.getExperId() != null) {
|
||||
List<Map<String, String>> mapList = mapper.getExperDevItemsNum(detailVo.getExperId());
|
||||
JSONArray jsonArray = new JSONArray();
|
||||
jsonArray.addAll(mapList);
|
||||
sampleList = jsonArray.toJavaList(ExperimentalDetailVo.Sample.class);
|
||||
for (ExperimentalDetailVo.Sample sample : sampleList) {
|
||||
if(sample.getTestResult().contains(Constants.ERROR_RESULT) ||
|
||||
sample.getTestResult().contains(Constants.ERROR_RESULT2)
|
||||
){
|
||||
sample.setTestResult(Constants.ERROR_RESULT);
|
||||
}else{
|
||||
sample.setTestResult(Constants.SUCCESS_RESULT);
|
||||
}
|
||||
}
|
||||
}
|
||||
detailVo.setSampleList(sampleList);
|
||||
detailVo.setSampleQuantity(sampleList.size());
|
||||
|
|
@ -92,7 +83,7 @@ public class ExperimentalServiceImpl implements ExperimentalService {
|
|||
public ServerResponse getTestBasicInfo(ParamsDto dto) {
|
||||
TestVo vo = new TestVo();
|
||||
try {
|
||||
if(dto.getId() == null || StringUtils.isEmpty(dto.getDevTypeCode())){
|
||||
if (dto.getId() == null || StringUtils.isEmpty(dto.getDevTypeCode())) {
|
||||
return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "参数完整");
|
||||
}
|
||||
// 查询收样基本信息
|
||||
|
|
@ -123,7 +114,7 @@ public class ExperimentalServiceImpl implements ExperimentalService {
|
|||
@Transactional(rollbackFor = Exception.class)
|
||||
public ServerResponse addTestData(TestVo vo) {
|
||||
try {
|
||||
if(!SystemUtils.isExperimentalTeam()){
|
||||
if (!SystemUtils.isExperimentalTeam()) {
|
||||
return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "非试验班组，无法添加试验数据");
|
||||
}
|
||||
// 整体数据校验数据
|
||||
|
|
@ -153,15 +144,8 @@ public class ExperimentalServiceImpl implements ExperimentalService {
|
|||
mapper.addConfigBasis(vo.getBasisVos(), vo.getId());
|
||||
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());
|
||||
experDevVo.setIsHg(setHgData(experDevVo.getDevData()));
|
||||
mapper.addExperDev(experDevVo, vo.getId());
|
||||
if (i == 0) {
|
||||
for (ConfigItemsVo configItemsVo : vo.getConfigItemsVos()) {
|
||||
// 添加试验项数据
|
||||
|
|
@ -183,7 +167,7 @@ public class ExperimentalServiceImpl implements ExperimentalService {
|
|||
}
|
||||
// 获取收样中的试验项是否全部填写
|
||||
List<Integer> resultList = mapper.isAllExper(vo.getSampleId());
|
||||
if(Objects.equals(resultList.get(0),resultList.get(1))){
|
||||
if (Objects.equals(resultList.get(0), resultList.get(1))) {
|
||||
// 更新收样表中的状态为待提交
|
||||
mapper.editSampleStatus(vo.getId());
|
||||
}
|
||||
|
|
@ -199,15 +183,15 @@ public class ExperimentalServiceImpl implements ExperimentalService {
|
|||
@Transactional(rollbackFor = Exception.class)
|
||||
public ServerResponse editTestData(TestVo vo) {
|
||||
try {
|
||||
if(vo.getId() == null){
|
||||
if (vo.getId() == null) {
|
||||
return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "参数不完整");
|
||||
}
|
||||
if(!SystemUtils.isExperimentalTeam()){
|
||||
if (!SystemUtils.isExperimentalTeam()) {
|
||||
return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "非试验班组，无法修改试验数据");
|
||||
}
|
||||
// 处于审核流程中的数据无法进行修改
|
||||
int isCheck = mapper.isCheck(vo.getId());
|
||||
if(isCheck > 0){
|
||||
if (isCheck > 0) {
|
||||
return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "处于审核流程中的数据或者试验完成的数据无法进行修改");
|
||||
}
|
||||
// 整体数据校验数据
|
||||
|
|
@ -240,13 +224,13 @@ public class ExperimentalServiceImpl implements ExperimentalService {
|
|||
mapper.delExperDevItem(experDevItemsIds);
|
||||
// 修改试验信息数据
|
||||
mapper.updateExper(vo);
|
||||
// 添加试验设备数据
|
||||
mapper.addExperConfigDev(vo.getDeviceVos(), vo.getId());
|
||||
// 添加试验依据信息数据
|
||||
mapper.addConfigBasis(vo.getBasisVos(), vo.getId());
|
||||
for (int i = 0; i < vo.getExperDevVos().size(); i++) {
|
||||
ExperDevVo experDevVo = vo.getExperDevVos().get(i);
|
||||
experDevVo.setIsHg(setHgData(experDevVo.getDevData()));
|
||||
// 添加试验样品数据
|
||||
mapper.addExperDev(vo.getExperDevVos().get(i), vo.getId());
|
||||
mapper.addExperDev(experDevVo, vo.getId());
|
||||
List<ExperDevItemsVo> experDevItemsVos = setExperDevItemsList(vo.getExperDevVos().get(i), vo);
|
||||
for (ExperDevItemsVo experDevItemsVo : experDevItemsVos) {
|
||||
// 添加设备试验项信息
|
||||
|
|
@ -291,8 +275,8 @@ public class ExperimentalServiceImpl implements ExperimentalService {
|
|||
public ServerResponse viewTestData(ParamsDto dto) {
|
||||
TestVo testVo = new TestVo();
|
||||
try {
|
||||
if(dto.getId() == null){
|
||||
return ServerResponse.createByErrorMsg(HttpStatus.ERROR,"请求参数不完整");
|
||||
if (dto.getId() == null) {
|
||||
return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "请求参数不完整");
|
||||
}
|
||||
// 试验数据详情
|
||||
testVo = mapper.viewTestData(dto);
|
||||
|
|
@ -327,17 +311,17 @@ public class ExperimentalServiceImpl implements ExperimentalService {
|
|||
public ServerResponse commitCheckTestData(ParamsDto dto) {
|
||||
try {
|
||||
// 判断是否提交空数据
|
||||
if(dto.getIds() == null || dto.getIds().length == 0){
|
||||
return ServerResponse.createByErrorMsg(HttpStatus.ERROR,"未提交审查数据");
|
||||
if (dto.getIds() == null || dto.getIds().length == 0) {
|
||||
return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "未提交审查数据");
|
||||
}
|
||||
if(!SystemUtils.isExperimentalTeam()){
|
||||
if (!SystemUtils.isExperimentalTeam()) {
|
||||
return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "非试验班组，无法提交审查数据");
|
||||
}
|
||||
// 判断提交数据中是否存在流程数据或者存在待试验项
|
||||
List<Long> list = Arrays.asList(dto.getIds());
|
||||
int result = mapper.isNotEditData(list);
|
||||
if(result > 0){
|
||||
return ServerResponse.createByErrorMsg(HttpStatus.ERROR,"提交数据中存在待试验项或处于审核流程或已试验结束");
|
||||
if (result > 0) {
|
||||
return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "提交数据中存在待试验项或处于审核流程或已试验结束");
|
||||
}
|
||||
// 更新收样表中的状态为待审阅
|
||||
mapper.updateSampleStatus(list);
|
||||
|
|
@ -564,4 +548,21 @@ public class ExperimentalServiceImpl implements ExperimentalService {
|
|||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置试验设备数据是否合格
|
||||
* @param value
|
||||
* @return String
|
||||
* @author cwchen
|
||||
* @date 2024/7/23 15:25
|
||||
*/
|
||||
public String setHgData(String value) {
|
||||
if (value.contains(Constants.ERROR_RESULT) ||
|
||||
value.contains(Constants.ERROR_RESULT2)
|
||||
) {
|
||||
return "1";
|
||||
} else {
|
||||
return "0";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -120,6 +120,8 @@
|
|||
<if test="params.devData != null and params.devData != ''">dev_data,</if>
|
||||
<if test="params.amount != null and params.amount != ''">amount,</if>
|
||||
<if test="params.remarks != null and params.remarks != ''">remarks,</if>
|
||||
<if test="params.devId != null">dev_id,</if>
|
||||
<if test="params.isHg != null and params.isHg != ''">is_hg,</if>
|
||||
id
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
|
|
@ -132,6 +134,8 @@
|
|||
<if test="params.devData != null and params.devData != ''">#{params.devData},</if>
|
||||
<if test="params.amount != null and params.amount != ''">#{params.amount},</if>
|
||||
<if test="params.remarks != null and params.remarks != ''">#{params.remarks},</if>
|
||||
<if test="params.devId != null">#{params.devId},</if>
|
||||
<if test="params.isHg != null and params.isHg != ''">#{params.isHg},</if>
|
||||
null
|
||||
</trim>
|
||||
</insert>
|
||||
|
|
@ -466,7 +470,9 @@
|
|||
<!--查询试验设备数量-->
|
||||
<select id="getExperDevItemsNum" resultType="java.util.Map">
|
||||
SELECT dev_code AS devCode,
|
||||
dev_data AS testResult
|
||||
case is_hg WHEN '1' THEN '不合格'
|
||||
WHEN '0' THEN '合格'
|
||||
ELSE '不合格' END AS testResult
|
||||
FROM tb_exper_dev
|
||||
WHERE exper_id = #{experId}
|
||||
</select>
|
||||
|
|
|
|||
Loading…
Reference in New Issue