完善市场法规库清单详情

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java

@@ -173,4 +173,24 @@ public class MarketStandardController {
         return Result.OK(errorMessages);
     }
 
+    /**
+     * 发布
+     *
+     * @param map
+     * @return
+     */
+    @AutoLog(value = "外部标准库-市场法规清单-发布")
+    @ApiOperation(value = "外部标准库-市场法规清单-发布", notes = "外部标准库-市场法规清单-发布")
+    @ApiOperationSupport(order = 7)
+    @PostMapping(value = "/publish")
+    @RequiresPermissions("marketStandard:publish")
+    public Result<?> publish(@RequestBody Map<String, String> map) {
+        if (!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))) {
+            return Result.error("请选择数据!");
+        }
+        return Result.OK(map);
+    }
+
+
+
 }

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java

@@ -183,6 +183,12 @@ public class LawsMarketStandard implements Serializable {
     @ApiModelProperty(value = "附件")
     private String file;
 
+    /**
+     * 版本标识,用于绑定多个版本
+     */
+    @ApiModelProperty(value = "版本标识,用于绑定多个版本")
+    private String versionFlag;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java

@@ -2,11 +2,13 @@ package com.jero.modules.laws.marketStandard.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
+import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.laws.marketStandard.constans.MarketStandardConstants;
 import com.jero.modules.laws.marketStandard.entity.LawsMarketStandard;
@@ -35,10 +37,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -102,10 +101,19 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         manifest.setManifestStatus(MarketStandardConstants.MANIFEST_STATUS_NOT_PUBLISH);
         // 设置清单编号
         manifest.setManifestNo(this.generateManifestNo(manifest.getCountry()));
+        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) + manifest.getCustomColumnName() + "车型需满足标准法规清单");
         manifest.setManifestVersion("V1.0");
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         manifest.setAuthor(sysUser.getId());
         save(manifest);
+        LambdaUpdateWrapper<LawsMarketStandard> updateLawsMarketStandard = new LambdaUpdateWrapper<>();
+        updateLawsMarketStandard.eq(LawsMarketStandard::getId,manifest.getId());
+        updateLawsMarketStandard.set(LawsMarketStandard::getVersionFlag, UUID.randomUUID().toString().replace("-",""));
+        update(updateLawsMarketStandard);
         List<LawsMarketStandardDetail> lists = marketStandardDetailVO.getLists();
         lists.forEach(e -> e.setManifestId(manifest.getId()));
         lawsMarketStandardDetailService.saveBatch(lists);
@@ -145,6 +153,9 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         if(!Objects.equals(listCountry,listOldCountry)){
             manifest.setManifestNo(generateManifestNo(manifest.getCountry()));
         }
+        String country = sysBaseAPI.translateDict("market_state",manifest.getCountry());
+        // 国家/地区+自定义+固定字段，自定义字段：预留手填，当前默认不填；固定字段：车型需满足标准法规清单
+        manifest.setManifestName(country + manifest.getCustomColumnName() + "车型需满足标准法规清单");
         updateById(manifest);
         // 删除旧数据
         LambdaQueryWrapper<LawsMarketStandardDetail> wrapper = new LambdaQueryWrapper<>();