合并分支 'dev_third_stage' 到 'master'

Dev third stage

查看合并请求 laws-nio/laws-weilai!176

jero-boot/db/蔚来标准sql/dev_third_record.sql

@@ -1110,4 +1110,8 @@ INSERT INTO `laws_weilai`.`sys_permission` (`id`, `parent_id`, `name`, `url`, `c
 INSERT INTO `laws_weilai`.`sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1567711460491968513', '1539780399024934914', '法规意见-删除', NULL, NULL, NULL, NULL, 2, 'regulatoryComments:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-08 11:08:34', NULL, NULL, 0, 0, '1', 0, 'Regulatory Comments - delete');
 
 -- 上报库删除按钮 2022-09-14已同步生产环境
-INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1569609701240446977', '1539429224550457346', '删除', NULL, NULL, NULL, NULL, 2, 'params:report:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-13 16:51:29', NULL, NULL, 0, 0, '1', 0, 'Delete');
+INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1569609701240446977', '1539429224550457346', '删除', NULL, NULL, NULL, NULL, 2, 'params:report:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-13 16:51:29', NULL, NULL, 0, 0, '1', 0, 'Delete');
+
+-- 上报库 添加项目目标市场 2022-09-19
+ALTER TABLE `laws_weilai`.`params_report`
+    ADD COLUMN `target_market` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '目标市场' AFTER `title`;

jero-boot/jero-boot-module-certification/pom.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.jero.boot</groupId>
-        <artifactId>jero-boot</artifactId>
-        <version>2.4.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>jero-boot-module-certification</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.jero.boot</groupId>
-            <artifactId>jero-boot-modules</artifactId>
-            <version>${jero.version}</version>
-        </dependency>
-    </dependencies>
-</project>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestUserTypeLogEOController.java

@@ -1,22 +1,13 @@
 package com.jero.modules.cert.collect.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import com.jero.common.api.vo.Result;
-import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO;
 import com.jero.modules.cert.collect.service.IParamsCollectManifestUserTypeLogEOService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.jero.common.aspect.annotation.AutoLog;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java

@@ -1,17 +1,13 @@
 package com.jero.modules.cert.collect.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.io.Serializable;
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java

@@ -1,11 +1,8 @@
 package com.jero.modules.cert.collect.enums;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.jero.modules.project.entity.ConditionAssessmentEO;
-import com.jero.modules.split.enums.StandFileClassifyEnum;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java

@@ -1,7 +1,6 @@
 package com.jero.modules.cert.collect.enums;
 
 import com.jero.common.constant.enums.CutEnum;
-import com.jero.modules.cert.report.enums.ExportTemplateStateEnum;
 
 import java.util.HashMap;
 import java.util.Map;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestUserTypeLogEOMapper.java

@@ -1,8 +1,5 @@
 package com.jero.modules.cert.collect.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigHistoryEOMapper.java

@@ -1,8 +1,5 @@
 package com.jero.modules.cert.collect.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
 import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml

@@ -100,6 +100,7 @@
             pm.id as id,
             pm.version as version,
             pm.title as title,
+            plb.target_market as target_market,
             concat(pni.project_name,'-',pyni.year_name) as project_name
         from params_manifest pm
         left join project_library_base as plb on plb.id = pm.project_id

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java

@@ -51,6 +51,13 @@ public interface IParamsManifestEOService extends IService<ParamsManifestEO> {
 	 */
     boolean deleteByIds(List<String> ids, String cut);
 
+	/**
+	 * 删除项目下的所有收集清单
+	 * @param projectId
+	 * @return
+	 */
+    boolean deleteByProjectId(String projectId);
+
 	/**
 	 * 通过id查询
 	 *

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java

@@ -282,6 +282,47 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
         return removeByIds(ids);
     }
 
+	/**
+	 * 删除项目下的所有收集清单
+	 *
+	 * @param projectId
+	 * @return
+	 */
+	@Override
+    public boolean deleteByProjectId(String projectId) {
+		// 查询项目下的所有清单
+		LambdaQueryWrapper<ParamsManifestEO> manifestEOQueryWrapper = new LambdaQueryWrapper<>();
+		manifestEOQueryWrapper.eq(ParamsManifestEO :: getProjectId, projectId);
+		List<ParamsManifestEO> paramsManifestEOList = list(manifestEOQueryWrapper);
+		List<String> ids = new ArrayList<>();
+		if (CollectionUtil.isNotEmpty(paramsManifestEOList)) {
+			ids = paramsManifestEOList.stream().map(ParamsManifestEO::getId).collect(Collectors.toList());
+
+			// 关联删除配置
+			LambdaQueryWrapper<ParamsConfigEO> configEOQueryWrapper = new LambdaQueryWrapper<>();
+			configEOQueryWrapper.in(ParamsConfigEO::getParamsManifestId, ids);
+			paramsConfigEOMapper.delete(configEOQueryWrapper);
+
+			// 关联删除收集的参数项（包含配置数据）
+			LambdaQueryWrapper<ParamsCollectManifestEO> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.in(ParamsCollectManifestEO::getParamsManifestId, ids);
+			List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper);
+			if (CollectionUtil.isNotEmpty(paramsCollectManifestEOList)) {
+				List<String> paramsCollectManifestIdList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getId).collect(Collectors.toList());
+				paramsCollectManifestEOService.deleteByIds(paramsCollectManifestIdList);
+
+			}
+
+			// 删除对应的历史版本数据
+			paramsManifestHistoryEOService.deleteAllHistoryVersion(ids);
+
+			// 添加上报库的项目名称和清单标题
+			paramsReportEOService.setProjectNameAndTitle(ids);
+
+		}
+		return removeByIds(ids);
+    }
+
 	/**
 	 * 通过id查询
 	 *

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java

@@ -1,6 +1,5 @@
 package com.jero.modules.cert.collect.vo;
 
-import io.swagger.models.auth.In;
 import lombok.Data;
 
 /**
@@ -15,6 +14,7 @@ public class ParamsManifestVO {
     private String title;
     private Integer version;
     private String projectName;
+    private String targetMarket;
     private String projectId;
     private String state;
     private String paramsTemplateName;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java

@@ -69,6 +69,10 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
 
 		IPage page = new Page(pageNo, pageSize);
 		IPage pageList = paramsReportEOService.pageInfo(page, paramsReportEO);
+		List<ParamsReportEO> rows = pageList.getRecords();
+		for (ParamsReportEO row : rows) {
+			row.setPageName(row.getProjectName() + "-" + row.getTargetMarket() + "-" + row.getTitle());
+		}
 		return Result.OK(pageList);
 	}
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java

@@ -1,10 +1,8 @@
 package com.jero.modules.cert.report.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestBaseEO;
-import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java

@@ -1,6 +1,7 @@
 package com.jero.modules.cert.report.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -75,4 +76,10 @@ public class ParamsReportEO implements Serializable {
     @ApiModelProperty(value = "清单标题")
     private String title;
 
+    @ApiModelProperty(value = "目标市场")
+    private String targetMarket;
+
+    @TableField(exist = false)
+    private String pageName; // 项目名称-国家-清单名称
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java

@@ -2,7 +2,6 @@ package com.jero.modules.cert.report.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
 import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
 import org.apache.ibatis.annotations.Param;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java

@@ -1,7 +1,5 @@
 package com.jero.modules.cert.report.mapper;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml

@@ -15,6 +15,7 @@
         <result column="params_template_publish_version" property="paramsTemplatePublishVersion" />
         <result column="project_name" property="projectName" />
         <result column="title" property="title" />
+        <result column="target_market" property="targetMarket" />
     </resultMap>
 
     <sql id="BaseColumnList">
@@ -27,6 +28,7 @@
         pr.update_by as update_by,
         pr.update_time as update_time,
         if (pm.title is not null, pm.title, pr.title) as title,
+        if (plb.target_market is not null, plb.target_market, pr.target_market) as target_market,
         if (pni.project_name is not null, concat(pni.project_name,'-', pyni.year_name), pr.project_name) as project_name
     </sql>