diff --git a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFileAssistent.java b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFileAssistent.java index 2dbbdb9..4388d32 100644 --- a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFileAssistent.java +++ b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFileAssistent.java @@ -1,5 +1,6 @@ package org.springblade.file.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import lombok.Data; @@ -15,7 +16,6 @@ import java.io.Serializable; * @Date 2022/9/22 0022 17:51 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("t_quality_file_assistant") @ApiModel(value = "QualityFile对象的子类", description = "质量文件子类") public class QualityFileAssistent extends BaseEntity implements Serializable { @@ -23,11 +23,12 @@ public class QualityFileAssistent extends BaseEntity implements Serializable { private Long qualityFileId; - private String version; + private String name; - private String versionContent; + // 版本号 + private Integer version; - private String name; + private String versionContent; private Integer status; } diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/RepairApplication.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/RepairApplication.java index 158667a..e55eba9 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/RepairApplication.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/RepairApplication.java @@ -109,4 +109,7 @@ public class RepairApplication extends BaseEntity implements Serializable { @TableField(exist = false) private Date endTime; + // 报废原因及技术状况 + private String reasonForScrapping; + } \ No newline at end of file diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java b/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java index bec9bef..7f7fcf3 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java @@ -89,6 +89,7 @@ public class EquipVerificationController extends BladeController { @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入equipVerification") public R> page(EquipVerificationVO equipVerification, Query query) { + query.setDescs("update_time"); IPage pages = equipVerificationService.selectEquipVerificationPage(Condition.getPage(query), equipVerification); //获取分页中的具体数据 List records = pages.getRecords(); diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java index 7f13a20..84b8495 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java @@ -1,5 +1,6 @@ package org.springblade.file.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; @@ -7,11 +8,12 @@ import org.springblade.core.tool.api.R; import org.springblade.file.entity.QualityFileAssistent; import org.springblade.file.mapper.QualityStorageFileRelMapper; import org.springblade.file.service.IQualityFileAssistentService; +import org.springblade.file.service.IQualityFileService; import org.springblade.file.service.impl.QualityFileAssistentServiceImpl; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.Comparator; +import java.util.List; /** * 质量文件版本管理 @@ -28,12 +30,24 @@ public class QualityFileAssistentController extends BladeController { private final IQualityFileAssistentService qualityFileAssistentService; @PutMapping("/update") - public R update(QualityFileAssistent file){ - return R.data(qualityFileAssistentService.addOrUpdate(file)) ; + public R update(@RequestBody QualityFileAssistent file){ + boolean tmep = true; + if (file.getId() != null) { + tmep = qualityFileAssistentService.updateById(file); + } else { + // 查询库里版本最大值 +1 作为新版本号 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("quality_file_id", file.getQualityFileId()); + List list = qualityFileAssistentService.list(queryWrapper); + Integer version = list.stream().max(Comparator.comparing(QualityFileAssistent::getVersion)).get().getVersion(); + file.setVersion(version + 1); + tmep = qualityFileAssistentService.save(file); + } + return R.data(tmep) ; } @DeleteMapping("/delete") - public R delete(QualityFileAssistent file){ - return R.data(qualityFileAssistentService.deleteById(file.getId())); + public R delete(String id){ + return R.data(qualityFileAssistentService.removeById(id)); } } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java index 8504cc4..363b98f 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java @@ -142,11 +142,9 @@ public class QualityFileController extends BladeController { @GetMapping("/assistentList") @ApiOperation(value = "根据主文件id查询版本信息") - public R> assistentList(Long id){ - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(QualityFileAssistent::getQualityFileId, id).orderByAsc(QualityFileAssistent::getVersion); - List list = qualityFileAssistentService.list(wrapper); - - return R.data(list); + public R> assistentList(QualityFileAssistent qualityFileAssistent, Query query) { + qualityFileAssistent.setQualityFileId(qualityFileAssistent.getId()); + qualityFileAssistent.setId(null); + return R.data(qualityFileAssistentService.page(Condition.getPage(query), Condition.getQueryWrapper(qualityFileAssistent))); } } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/IQualityFileAssistentService.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/IQualityFileAssistentService.java index 394c171..706f992 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/service/IQualityFileAssistentService.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/IQualityFileAssistentService.java @@ -8,7 +8,5 @@ import org.springblade.core.mp.base.BaseService; * @Date 2022/9/22 0022 18:14 */ public interface IQualityFileAssistentService extends BaseService { - boolean addOrUpdate(QualityFileAssistent file); - boolean deleteById(Long id); } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileAssistentServiceImpl.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileAssistentServiceImpl.java index 26bbad3..20ac616 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileAssistentServiceImpl.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileAssistentServiceImpl.java @@ -22,34 +22,4 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class QualityFileAssistentServiceImpl extends BaseServiceImpl implements IQualityFileAssistentService { - private final IQualityStorageFileRelService qualityStorageFileRelService; - - @Override - public boolean addOrUpdate(QualityFileAssistent file) { - - if (file.getId() != null) { - this.updateById(file); - }else{ - this.save(file); - } - return true; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean deleteById(Long id) { - boolean b = this.removeById(id); - if(b){ - LambdaQueryWrapper ass = new LambdaQueryWrapper<>(); - ass.eq(QualityStorageFileRel::getQualityFileAssistantId , id); - boolean remove = qualityStorageFileRelService.remove(ass); - if(remove){ - return true; - }else{ - return false; - } - } - return b; - } - } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/StorageFileServiceImpl.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/StorageFileServiceImpl.java index b88c73c..d56a12f 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/StorageFileServiceImpl.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/StorageFileServiceImpl.java @@ -16,8 +16,10 @@ */ package org.springblade.file.service.impl; +import com.alibaba.nacos.common.utils.UuidUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.SneakyThrows; +import org.apache.commons.lang.math.RandomUtils; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.support.Condition; import org.springblade.core.tool.utils.CollectionUtil; @@ -98,15 +100,17 @@ public class StorageFileServiceImpl extends BaseServiceImpl realResultMap = new HashMap<>(); + realResultMap.put("data", resultMap); + realResultMap.put("yinCount", yinCount); + realResultMap.put("yangCount", yangCount); + // 新增或修改Result数据 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ExamineResult::getExamineId, examine.getId()); ExamineResult result = service.getOne(wrapper); if (result != null) { result.setOriginRecordData(JSON.toJSONString(allData)); - result.setOriginRecordResult(JSON.toJSONString(resultMap)); +// result.setOriginRecordResult(JSON.toJSONString(resultMap)); + result.setOriginRecordResult(JSON.toJSONString(realResultMap)); result.setExamineDataArr(JSON.toJSONString(allDatas)); service.updateById(result); } else { ExamineResult examineResult = new ExamineResult(); examineResult.setExamineId(Long.valueOf(examine.getId())); examineResult.setOriginRecordData(JSON.toJSONString(allData)); - examineResult.setOriginRecordResult(JSON.toJSONString(resultMap)); +// result.setOriginRecordResult(JSON.toJSONString(resultMap)); + result.setOriginRecordResult(JSON.toJSONString(realResultMap)); examineResult.setExamineDataArr(JSON.toJSONString(allDatas)); service.save(examineResult); } - Map realResultMap = new HashMap<>(); - realResultMap.put("data", resultMap); - realResultMap.put("yinCount", yinCount); - realResultMap.put("yangCount", yangCount); return R.data(realResultMap); } // 非兰所，11列也是样品 --------------------------------------------------------------------------------------- @@ -1228,6 +1231,11 @@ public class ExamineResultController extends BladeController { } } + Map realResultMap = new HashMap<>(); + realResultMap.put("data", resultMap); + realResultMap.put("yinCount", yinCount); + realResultMap.put("yangCount", yangCount); + // 判断应实验样品数量和实际样品数量是否相等 if (experieNum.length != allDatas.size()) { throw new Exception("分配样品数量与检测样品数量不一致!"); @@ -1238,21 +1246,19 @@ public class ExamineResultController extends BladeController { ExamineResult result = service.getOne(wrapper); if (result != null) { result.setOriginRecordData(JSON.toJSONString(allData)); - result.setOriginRecordResult(JSON.toJSONString(resultMap)); +// result.setOriginRecordResult(JSON.toJSONString(resultMap)); + result.setOriginRecordResult(JSON.toJSONString(realResultMap)); result.setExamineDataArr(JSON.toJSONString(allDatas)); service.updateById(result); } else { ExamineResult examineResult = new ExamineResult(); examineResult.setExamineId(Long.valueOf(examine.getId())); examineResult.setOriginRecordData(JSON.toJSONString(allData)); - examineResult.setOriginRecordResult(JSON.toJSONString(resultMap)); +// result.setOriginRecordResult(JSON.toJSONString(resultMap)); + result.setOriginRecordResult(JSON.toJSONString(realResultMap)); examineResult.setExamineDataArr(JSON.toJSONString(allDatas)); service.save(examineResult); } - Map realResultMap = new HashMap<>(); - realResultMap.put("data", resultMap); - realResultMap.put("yinCount", yinCount); - realResultMap.put("yangCount", yangCount); return R.data(realResultMap); } } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RepairApplicationController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RepairApplicationController.java index 6cdec14..2348b83 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RepairApplicationController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RepairApplicationController.java @@ -153,6 +153,7 @@ public class RepairApplicationController extends BladeController { scrapApplication.setCreateTime(new Date()); scrapApplication.setModel(application.getVersion()); scrapApplication.setStatus(0); + scrapApplication.setReasonAndState(repairApplication.getReasonForScrapping()); scrapApplicationService.save(scrapApplication); } } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java index 35fbd18..8202606 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java @@ -167,8 +167,8 @@ public class EntrustServiceImpl extends BaseServiceImpl @Value("${repairPrint}") private String repairPrint; - @Value("${imagePrint}") - private String imagePrint; +// @Value("${imagePrint}") +// private String imagePrint; @Override @Transactional(rollbackFor = Exception.class)