fix:88277

2024-08-07 19:37:09 +08:00
parent c2afcd75a1
commit 198412e704
2 changed files with 32 additions and 15 deletions
@@ -207,9 +207,11 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
            if(!StringUtils.isBlank(m.toString())){
                return Result.error(m.toString());
            }
-            saveBatch(listLawsMarketStandardDetail);
            // 更新状态
            marketStandardService.updateStatus(manifestId);
+
+            saveBatch(listLawsMarketStandardDetail);
+
            return Result.OK(ResultCommon.OK);
        } catch (Exception e) {
            log.error(e.getMessage(),e);
@@ -401,9 +403,9 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
        if(l > 0){
            return Result.error(ResultCommon.STANDARD_NUMBER_ALREADY_EXISTS);
        }
-        save(marketStandardDetail);
        // 更细状态
        marketStandardService.updateStatus(marketStandardDetail.getManifestId());
+        save(marketStandardDetail);
        return Result.OK(ResultCommon.OK);
    }

@@ -446,6 +448,11 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
                    .collect(Collectors.toList());
            list = list.stream().filter(o->!listIds.contains(o.getStandardId())).collect(Collectors.toList());
        }
+        if(CollectionUtils.isEmpty(list)){
+            return Result.OK(ResultCommon.OK);
+        }
+        // 更细状态
+        marketStandardService.updateStatus(list.get(0).getManifestId());
        saveBatch(list);
        return Result.OK(ResultCommon.OK);
    }
@@ -487,6 +494,12 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
        String allCountry = lawsMarketStandard.getCountry() + "," + lawsMarketStandardOld.getCountry();
        List<String> listAllCountry = Arrays.stream(allCountry.split(",")).distinct().collect(Collectors.toList());
        setDataByCopy(newId, listOld,String.join(",",listAllCountry));
+
+        if(CollectionUtils.isEmpty(listOld)){
+            return Result.OK(ResultCommon.OK);
+        }
+        // 更细状态
+        marketStandardService.updateStatus(listOld.get(0).getManifestId());
        saveBatch(listOld);
        return Result.OK(ResultCommon.OK);
    }
@@ -528,6 +541,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
                && !Objects.equals(lawsMarketStandard.getAuthor(),sysUser.getId())){
            return Result.error(ResultCommon.NO_PERMISSION);
        }
+
        LambdaQueryWrapper<LawsMarketStandardDetail> queryLawsMarketStandardDetail = new LambdaQueryWrapper<>();
        queryLawsMarketStandardDetail.eq(LawsMarketStandardDetail::getStandardId,marketStandardDetail.getStandardId());
        queryLawsMarketStandardDetail.eq(LawsMarketStandardDetail::getManifestId,marketStandardDetail.getManifestId());
@@ -536,9 +550,10 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
        if(l > 0){
            return Result.error(ResultCommon.EXIST_STANDARD_NUMBER);
        }
-        updateById(marketStandardDetail);
        // 更细状态
        marketStandardService.updateStatus(marketStandardDetail.getManifestId());
+
+        updateById(marketStandardDetail);
        return Result.OK(ResultCommon.OK);
    }

@@ -550,9 +565,10 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
            throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
        }
        checkData(id,lawsMarketStandardDetail.getManifestId());
-        removeById(id);
        // 更细状态
        marketStandardService.updateStatus(lawsMarketStandardDetail.getManifestId());
+
+        removeById(id);
        return Result.OK(ResultCommon.SUCCESSFULLY_DELETED);
    }

@@ -271,17 +271,16 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
            update.set(LawsMarketStandard::getUpdateBy,sysUser.getUsername());
            update.eq(LawsMarketStandard::getId,manifest.getId());
            update(update);
-        }else{
-            manifest.setManifestNo(generateManifestNo(manifest.getManifestNo(),lawsMarketStandardOld.getManifestNo()));
-            Map<String, List<DictModel>> map = sysBaseAPI.translateManyDict("market_state",manifest.getCountry());
-            List<DictModel> listDict = map.get("market_state");
-            List<String> country = listDict.stream().map(DictModel::getText).collect(Collectors.toList());
-            // 国家/地区+自定义+固定字段，自定义字段：预留手填，当前默认不填；固定字段：车型需满足标准法规清单
-            manifest.setManifestName(String.join("",country) +
-                    (StringUtils.isEmpty(manifest.getCustomColumnName()) ? "" : manifest.getCustomColumnName())
-                    + "车型需满足标准法规清单");
-            updateById(manifest);
        }
+        manifest.setManifestNo(generateManifestNo(manifest.getManifestNo(),lawsMarketStandardOld.getManifestNo()));
+        Map<String, List<DictModel>> map = sysBaseAPI.translateManyDict("market_state",manifest.getCountry());
+        List<DictModel> listDict = map.get("market_state");
+        List<String> country = listDict.stream().map(DictModel::getText).collect(Collectors.toList());
+        // 国家/地区+自定义+固定字段，自定义字段：预留手填，当前默认不填；固定字段：车型需满足标准法规清单
+        manifest.setManifestName(String.join("",country) +
+                (StringUtils.isEmpty(manifest.getCustomColumnName()) ? "" : manifest.getCustomColumnName())
+                + "车型需满足标准法规清单");
+        updateById(manifest);
    }


@@ -400,7 +399,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
        if(!StringUtils.isBlank(marketStandardDetail.getManifestVersion())){
            LambdaQueryWrapper<LawsMarketStandard> queryLawsMarketStandard = new LambdaQueryWrapper<>();
            queryLawsMarketStandard.eq(LawsMarketStandard::getManifestVersion,marketStandardDetail.getManifestVersion());
-            queryLawsMarketStandard.eq(LawsMarketStandard::getManifestNo,manifest.getManifestNo());
+            queryLawsMarketStandard.eq(LawsMarketStandard::getVersionFlag,manifest.getVersionFlag());
            manifest = getOne(queryLawsMarketStandard,false);
            if(Objects.isNull(manifest)){
                throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
@@ -541,6 +540,8 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
            update.set(LawsMarketStandard::getUpdateBy,sysUser.getUsername());
            update.eq(LawsMarketStandard::getId,id);
            update(update);
+
+
        }
    }