Merge branch 'dev-wgk' of www/als into master

als-modules/agile-assurance/src/main/java/org/eco/als/controller/ModelController.java

@@ -14,7 +14,6 @@ import org.eco.als.service.IModelService;
 import org.eco.common.core.core.domain.CommonResult;
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.common.core.core.page.PageResult;
-import org.eco.common.core.exception.BusinessException;
 import org.eco.common.excel.core.ExcelResult;
 import org.eco.common.excel.utils.ExcelUtil;
 import org.eco.common.log.annotation.Log;
@@ -98,13 +97,14 @@ public class ModelController extends BaseController {
     public CommonResult<Void> add(@Validated @RequestBody ModelBo modelBo) {
         if (StrUtil.containsAny(modelBo.getType(), "4", "5", "6")) {
             if (StrUtil.isBlank(modelBo.getPartId())) {
-                return  CommonResult.fail("部件不能为空.");
+                return CommonResult.fail("部件不能为空.");
             }
             ModelBo modelBo1 = new ModelBo();
             modelBo1.setPartId(modelBo.getPartId());
+            modelBo1.setType(modelBo.getType());
             List<ModelVo> modelVos = modelService.selectList(modelBo1);
             if (CollUtil.isNotEmpty(modelVos)) {
-                return  CommonResult.fail("模型算法添加重复，请重新输入部件");
+                return CommonResult.fail("模型算法添加重复，请重新输入部件");
             }
         }
         boolean inserted = modelService.insert(modelBo);
@@ -124,13 +124,16 @@ public class ModelController extends BaseController {
     public CommonResult<Void> edit(@Validated @RequestBody ModelBo modelBo) {
         if (StrUtil.containsAny(modelBo.getType(), "4", "5", "6")) {
             if (StrUtil.isBlank(modelBo.getPartId())) {
-                return  CommonResult.fail("部件不能为空.");
+                return CommonResult.fail("部件不能为空.");
             }
             ModelBo modelBo1 = new ModelBo();
             modelBo1.setPartId(modelBo.getPartId());
+            modelBo1.setType(modelBo.getType());
             List<ModelVo> modelVos = modelService.selectList(modelBo1);
             if (CollUtil.isNotEmpty(modelVos)) {
-                return  CommonResult.fail("模型算法添加重复，请重新输入部件");
+                if (modelVos.stream().noneMatch(modelVo -> modelBo.getId().equals(modelVo.getId()))) {
+                    return CommonResult.fail("模型算法添加重复，请重新输入部件");
+                }
             }
         }
         boolean updated = modelService.update(modelBo);

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/ModelServiceImpl.java

@@ -61,6 +61,7 @@ public class ModelServiceImpl extends BaseServiceImpl<ModelMapper, Model> implem
             (modelBo.getType()));
         queryWrapper.and(MODEL.PART_ID.eq
             (modelBo.getPartId()));
+        queryWrapper.orderBy(MODEL.UPDATE_TIME.desc());
         return queryWrapper;
     }