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:14:29 +08:00
parent 34776092d0
commit 19075d5648
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
/**
@ -20,6 +21,10 @@ public class ExperDevVo {
private Long id;
/**试验表id */
private Long experId;
@NotNull(message = "收样设备id不能为空", groups = {Query.class})
private Long devId;
/**客户自编号*/
@NotBlank(message = "客户自编号不能为空", groups = {Query.class})
@Length(max = 32, message = "编号字符长度不能超过32", groups = {Query.class})
@ -53,6 +58,9 @@ public class ExperDevVo {
@Length(max = 256, message = "备注字符长度不能超过256", groups = {Query.class})
private String remarks;
/*是否合格*/
private String isHg;
public interface Query {
}

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

@ -275,11 +275,9 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
try {
JSONObject obj = JSONObject.parseObject(vo.getParamsData());
JSONArray yjList = obj.getJSONArray("yjList");
JSONArray devList = obj.getJSONArray("devList");
JSONArray mainDevList = obj.getJSONArray("mainDevList");
JSONArray itemsList = obj.getJSONArray("items");
List<ExperBasisVo> basisVos = yjList.toJavaList(ExperBasisVo.class);
List<ConfigDevVo> deviceVos = devList.toJavaList(ConfigDevVo.class);
List<ConfigMainDevVo> mainDeviceVos = mainDevList.toJavaList(ConfigMainDevVo.class);
List<ConfigItemsVo> configItemsVos = itemsList.toJavaList(ConfigItemsVo.class);
for (ConfigItemsVo configItemsVo : configItemsVos) {
@ -288,7 +286,6 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
configItemsVo.setItemList(configItemVos);
}
vo.setBasisVos(basisVos);
vo.setDeviceVos(deviceVos);
vo.setMainDeviceVos(mainDeviceVos);
vo.setConfigItemsVos(configItemsVos);
} catch (Exception e) {

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

@ -390,12 +390,10 @@ public class ExperimentalServiceImpl implements ExperimentalService {
try {
JSONObject obj = JSONObject.parseObject(vo.getParamsData());
JSONArray yjList = obj.getJSONArray("yjList");
JSONArray devList = obj.getJSONArray("devList");
JSONArray mainDevList = obj.getJSONArray("mainDevList");
JSONArray itemsList = obj.getJSONArray("items");
JSONArray experDevList = obj.getJSONArray("experDevList");
List<ExperBasisVo> basisVos = yjList.toJavaList(ExperBasisVo.class);
List<ConfigDevVo> deviceVos = devList.toJavaList(ConfigDevVo.class);
List<ConfigMainDevVo> mainDeviceVos = mainDevList.toJavaList(ConfigMainDevVo.class);
List<ConfigItemsVo> configItemsVos = itemsList.toJavaList(ConfigItemsVo.class);
List<ExperDevVo> experDevVos = experDevList.toJavaList(ExperDevVo.class);
@ -411,7 +409,6 @@ public class ExperimentalServiceImpl implements ExperimentalService {
vo.setCheckTime(mainDeviceVo.getDevContractDate());
}
vo.setBasisVos(basisVos);
vo.setDeviceVos(deviceVos);
vo.setMainDeviceVos(mainDeviceVos);
vo.setConfigItemsVos(configItemsVos);
vo.setExperDevVos(experDevVos);