diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index b3f1e7ad9..ccac487e7 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/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'); \ No newline at end of file +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`; \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/pom.xml b/jero-boot/jero-boot-module-certification/pom.xml deleted file mode 100644 index 67ea7212d..000000000 --- a/jero-boot/jero-boot-module-certification/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - com.jero.boot - jero-boot - 2.4.2 - - 4.0.0 - - jero-boot-module-certification - - - - com.jero.boot - jero-boot-modules - ${jero.version} - - - diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestUserTypeLogEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestUserTypeLogEOController.java similarity index 85% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestUserTypeLogEOController.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestUserTypeLogEOController.java index 884aa0fb7..af2693408 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestUserTypeLogEOController.java +++ b/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; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigDataEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigDataEOController.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigDataEOController.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigDataEOController.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ProjectDetailsStatisticsCollectManifestController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ProjectDetailsStatisticsCollectManifestController.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ProjectDetailsStatisticsCollectManifestController.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ProjectDetailsStatisticsCollectManifestController.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java similarity index 86% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java index 5e48be132..6b38ec36e 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java +++ b/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; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java similarity index 92% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java index b84bf7069..223acf2b3 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java +++ b/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; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestUserTypeLogEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestUserTypeLogEO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestUserTypeLogEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestUserTypeLogEO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataHistoryEO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataHistoryEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataHistoryEO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigEO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigEO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigHistoryEO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigHistoryEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigHistoryEO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java similarity index 94% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java index cad81c249..dd9af84ba 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java +++ b/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; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStatisticsStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStatisticsStateEnum.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStatisticsStateEnum.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStatisticsStateEnum.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestUserTypeEnum.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ConfigDataTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ConfigDataTypeEnum.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ConfigDataTypeEnum.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ConfigDataTypeEnum.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ConfigLockEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ConfigLockEnum.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ConfigLockEnum.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ConfigLockEnum.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java similarity index 96% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java index e62add4e9..5567d804e 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java +++ b/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; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestHistoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestHistoryEOMapper.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestHistoryEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestHistoryEOMapper.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestUserTypeLogEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestUserTypeLogEOMapper.java similarity index 86% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestUserTypeLogEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestUserTypeLogEOMapper.java index 578169942..62a0c257d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestUserTypeLogEOMapper.java +++ b/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; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataEOMapper.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataEOMapper.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataHistoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataHistoryEOMapper.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataHistoryEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataHistoryEOMapper.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigEOMapper.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigEOMapper.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigHistoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigHistoryEOMapper.java similarity index 84% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigHistoryEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigHistoryEOMapper.java index 67adecaee..899896d78 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigHistoryEOMapper.java +++ b/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; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestHistoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestHistoryEOMapper.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestHistoryEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestHistoryEOMapper.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestUserTypeLogEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestUserTypeLogEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestUserTypeLogEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestUserTypeLogEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataHistoryEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataHistoryEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataHistoryEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigHistoryEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigHistoryEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigHistoryEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml similarity index 99% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml index c44aae67c..592058433 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml +++ b/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 diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestUserTypeLogEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestUserTypeLogEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestUserTypeLogEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestUserTypeLogEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigHistoryEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigHistoryEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigHistoryEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java similarity index 94% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java index cbfd3c68c..97f7fce4d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java +++ b/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 { */ boolean deleteByIds(List ids, String cut); + /** + * 删除项目下的所有收集清单 + * @param projectId + * @return + */ + boolean deleteByProjectId(String projectId); + /** * 通过id查询 * diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigHistoryEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigHistoryEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigHistoryEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java similarity index 95% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index c9a7c110a..7ebdaab76 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/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 manifestEOQueryWrapper = new LambdaQueryWrapper<>(); + manifestEOQueryWrapper.eq(ParamsManifestEO :: getProjectId, projectId); + List paramsManifestEOList = list(manifestEOQueryWrapper); + List ids = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(paramsManifestEOList)) { + ids = paramsManifestEOList.stream().map(ParamsManifestEO::getId).collect(Collectors.toList()); + + // 关联删除配置 + LambdaQueryWrapper configEOQueryWrapper = new LambdaQueryWrapper<>(); + configEOQueryWrapper.in(ParamsConfigEO::getParamsManifestId, ids); + paramsConfigEOMapper.delete(configEOQueryWrapper); + + // 关联删除收集的参数项（包含配置数据） + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsCollectManifestEO::getParamsManifestId, ids); + List paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper); + if (CollectionUtil.isNotEmpty(paramsCollectManifestEOList)) { + List paramsCollectManifestIdList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getId).collect(Collectors.toList()); + paramsCollectManifestEOService.deleteByIds(paramsCollectManifestIdList); + + } + + // 删除对应的历史版本数据 + paramsManifestHistoryEOService.deleteAllHistoryVersion(ids); + + // 添加上报库的项目名称和清单标题 + paramsReportEOService.setProjectNameAndTitle(ids); + + } + return removeByIds(ids); + } + /** * 通过id查询 * diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigVO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigVO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigVO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestHistoryVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestHistoryVO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestHistoryVO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestHistoryVO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java similarity index 94% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java index cec703acd..584936f61 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java +++ b/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; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java similarity index 97% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java index b5fbc9a63..80fc4a3df 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java +++ b/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 rows = pageList.getRecords(); + for (ParamsReportEO row : rows) { + row.setPageName(row.getProjectName() + "-" + row.getTargetMarket() + "-" + row.getTitle()); + } return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ReportCertCategoryParamsInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ReportCertCategoryParamsInfoEOController.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ReportCertCategoryParamsInfoEOController.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ReportCertCategoryParamsInfoEOController.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigDataEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigDataEO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigDataEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigDataEO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java similarity index 91% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java index 8c5168c7f..cba41a0d0 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java +++ b/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; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java similarity index 90% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java index 357bf81ba..49612c6d5 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java +++ b/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; // 项目名称-国家-清单名称 + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsExportTemplateEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsExportTemplateEOMapper.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsExportTemplateEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsExportTemplateEOMapper.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigEOMapper.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigEOMapper.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java similarity index 93% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java index 53781f175..9953f73a4 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java +++ b/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; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportEOMapper.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportEOMapper.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java similarity index 96% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java index 0cf024066..6f27b2f37 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java +++ b/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; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ReportCertCategoryParamsInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ReportCertCategoryParamsInfoEOMapper.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ReportCertCategoryParamsInfoEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ReportCertCategoryParamsInfoEOMapper.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsExportTemplateEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsExportTemplateEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsExportTemplateEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsExportTemplateEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml similarity index 94% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml index 3314b963f..164200a28 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml @@ -15,6 +15,7 @@ + @@ -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 diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsExportTemplateEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsExportTemplateEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsExportTemplateEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsExportTemplateEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IReportCertCategoryParamsInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IReportCertCategoryParamsInfoEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IReportCertCategoryParamsInfoEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IReportCertCategoryParamsInfoEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java similarity index 90% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java index a3d285a7a..fd73ae440 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java @@ -167,28 +167,27 @@ public class ParamsReportEOServiceImpl extends ServiceImpl paramsManifestEOList = paramsManifestEOMapper.listInfoAll(oldParamsManifestIdList); List paramsManifestIdList = paramsManifestEOList.stream().map(ParamsManifestVO::getId).collect(Collectors.toList()); - List paramsManifestVersionList = paramsManifestEOList.stream().map(ParamsManifestVO::getVersion).collect(Collectors.toList()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(ParamsReportEO::getOldParamsManifestId, paramsManifestIdList) - .in(ParamsReportEO::getVersion, paramsManifestVersionList); + queryWrapper.in(ParamsReportEO::getOldParamsManifestId, paramsManifestIdList); List paramsReportEOList = list(queryWrapper); paramsManifestEOList.forEach(paramsManifestVO -> { List paramsReportEOS = paramsReportEOList.stream() - .filter(e-> paramsManifestVO.getId().equals(e.getOldParamsManifestId()) && paramsManifestVO.getVersion().equals(e.getVersion())) + .filter(e-> paramsManifestVO.getId().equals(e.getOldParamsManifestId())) .collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(paramsReportEOS)) { - ParamsReportEO paramsReportEO = paramsReportEOS.get(0); + for (ParamsReportEO paramsReportEO : paramsReportEOS) { + ParamsReportEO updateEO = new ParamsReportEO(); + updateEO.setId(paramsReportEO.getId()); + updateEO.setTitle(paramsManifestVO.getTitle()); + updateEO.setProjectName(paramsManifestVO.getProjectName()); + updateEO.setTargetMarket(paramsManifestVO.getTargetMarket()); - ParamsReportEO updateEO = new ParamsReportEO(); - updateEO.setId(paramsReportEO.getId()); - updateEO.setTitle(paramsManifestVO.getTitle()); - updateEO.setProjectName(paramsManifestVO.getProjectName()); - - updateEOList.add(updateEO); + updateEOList.add(updateEO); + } } }); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ReportCertCategoryParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ReportCertCategoryParamsInfoEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ReportCertCategoryParamsInfoEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ReportCertCategoryParamsInfoEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/util/Docx4jUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/util/Docx4jUtil.java similarity index 69% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/util/Docx4jUtil.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/util/Docx4jUtil.java index e034dc69b..4370e10f6 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/util/Docx4jUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/util/Docx4jUtil.java @@ -1,7 +1,10 @@ package com.jero.modules.cert.report.util; +import com.jero.modules.project.util.WordUtil; +import org.docx4j.Docx4J; import org.docx4j.XmlUtils; import org.docx4j.dml.wordprocessingDrawing.Inline; +import org.docx4j.jaxb.Context; import org.docx4j.openpackaging.exceptions.Docx4JException; import org.docx4j.openpackaging.packages.WordprocessingMLPackage; import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPartAbstractImage; @@ -9,15 +12,163 @@ import org.docx4j.wml.*; import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBException; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; +import java.io.*; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; public class Docx4jUtil { + public static void main(String[] args) { + +// try { +// String file1 = "C:\\Users\\lyw\\Desktop\\测试文件\\新建文件夹\\7-1.jpg"; +// String file2 = "C:\\Users\\lyw\\Desktop\\测试文件\\7-1.jpg"; +// +// boolean result = compareFileContent(file1, file2); +// +// System.out.println(result); +//// FileInputStream fileInputStream = new FileInputStream("D:\\text\\文档6.doc"); +//// WordExtractor ex = new WordExtractor(fileInputStream); +//// String str = ex.getText(); +//// System.out.println(str); +// } catch (Exception e){ +// +// System.out.println("error"); +// } + +// Map params = new HashMap(); +// params.put("NIO/07200101", "java开发"); +// params.put("NIO-07200102", "焦糖橙#子"); +// params.put("NIO.07200103", "男1"); +// params.put("NIO07-20 01/04.00", "8888@csdn.com1"); +// // 替换占位符内容 +// try { +// +// List> picList = new ArrayList<>(); +// Map picMap1 = new HashMap<>(); +// picMap1.put("key", "NIO 07200103"); +// picMap1.put("text", ""); +// picMap1.put("bytes", WordUtils.inputStream2ByteArray(new FileInputStream("D:\\text\\png1.png"), true)); +// +// Map picMap2 = new HashMap<>(); +// picMap2.put("key", "NIO07-20 01/04"); +// picMap2.put("text", "wok#wwokwo"); +// picMap2.put("bytes", WordUtils.inputStream2ByteArray(new FileInputStream("D:\\text\\jpg2.jpg"), true)); +// +// picList.add(picMap1); +// picList.add(picMap2); +// +// String str = picList.stream().filter(e->e.get("text").equals("lalala")).map(e -> (String)e.get("key")).collect(Collectors.joining(",")); +// System.out.println(str); +//// File file = new File("D:\\text\\080301自定义模板.xlsx"); +//// SpreadsheetMLPackage pkg = SpreadsheetMLPackage.load(file); +//// Workbook workbook = WorkbookFactory.create(file); +//// ExcelUtil.replacePictureBatchPOI(workbook, pkg, picList, (HashMap)params); +//// ExcelUtil.variableReplace(pkg, (HashMap) params); +//// OutputStream wordFileOS = new FileOutputStream("D:\\text\\mytest2.xlsx"); +//// pkg.save(wordFileOS); +// +// File file = new File("D:\\text\\080301自定义模板.docx"); +// WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(new FileInputStream(file)); +// WordUtil.replacePictureBatch(wordMLPackage, picList); +//// WordUtil.replaceVariable(wordMLPackage, params); +// OutputStream wordFileOS = new FileOutputStream("D:\\text\\mytest2.docx"); +// Docx4J.save(wordMLPackage, wordFileOS); +// +//// byte[] wordContent = Docx4jUtil.of("D:\\text\\myword.docx") +//// .addParams(params) +////// .addImg("jpeg1", WordUtils.inputStream2ByteArray(new FileInputStream("D:\\text\\jpg2.jpg"), true)) +//// .get(); +//// ByteArrayInputStream wordis = new ByteArrayInputStream(wordContent); +//// OutputStream wordFileOS = new FileOutputStream("D:\\text\\mytest2.docx"); +//// int len1 = 0; +//// while ((len1 = wordis.read()) != -1) { +//// wordFileOS.write(len1); +//// } +// wordFileOS.flush(); +// wordFileOS.close(); +// +// System.out.println("<-----生成结束----->"); +// } catch (Docx4JException e) { +// e.printStackTrace(); +// } catch (FileNotFoundException e) { +// e.printStackTrace(); +// } catch (IOException e) { +// e.printStackTrace(); +// } catch (Exception e) { +// e.printStackTrace(); +// } + + try { + String path = "C:\\Users\\lyw\\Desktop\\测试文件\\ComplianceReportTemplate (1).docx"; +// String path1 = "C:\\Users\\lyw\\Desktop\\测试文件\\新建文档.docx"; + String path1 = "C:\\Users\\lyw\\Desktop\\测试文件\\自定义导出模板加表格.docx"; + String outpath = "C:\\Users\\lyw\\Desktop\\测试文件\\ComplianceReportTemplate (导出).docx"; + WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(new FileInputStream(path1)); +// WordUtil.replaceTable(path, 1, 2, dataList, outpath); +// WordUtil.replaceTable(wordMLPackage, dataList, outpath); +// WordUtil.getTableContent(wordMLPackage); + + Map param = new HashMap(); + param.put("NIO 00001", "焦糖橙#子"); + param.put("NIO-00002", "alalalla"); + param.put("123456", "bbbbb"); + param.put("NIO-00023", "VVVV"); + + param.put("NIO-001", "焦糖橙#子"); + param.put("NIO-002", "alalalla"); + param.put("NIO-003", "bbbbb"); + param.put("NIO-004", "VVVV"); + param.put("NIO 07200101", "wakabakawakabaka"); + + List> picList = new ArrayList<>(); + Map picMap1 = new HashMap<>(); + picMap1.put("key", "NIO-005"); + picMap1.put("text", "XXXXX"); + picMap1.put("bytes", inputStream2ByteArray(new FileInputStream("D:\\text\\png1.png"), true)); + + Map picMap2 = new HashMap<>(); + picMap2.put("key", "NIO-007"); + picMap2.put("text", "wok#wwokwo"); + picMap2.put("bytes", inputStream2ByteArray(new FileInputStream("D:\\text\\jpg2.jpg"), true)); + + picList.add(picMap1); + picList.add(picMap2); + + WordUtil.replacePictureBatch(wordMLPackage, picList); + WordUtil.replaceVariableWithOutClear(wordMLPackage, param); + OutputStream wordFileOS = new FileOutputStream("D:\\text\\mytest2.docx"); + Docx4J.save(wordMLPackage, wordFileOS); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 将输入流中的数据写入字节数组 + * @param in + * @return + */ + public static byte[] inputStream2ByteArray(InputStream in, boolean isClose) { + byte[] byteArray = null; + try { + int total = in.available(); + byteArray = new byte[total]; + in.read(byteArray); + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (isClose) { + try { + in.close(); + } catch (Exception e2) { + e2.getStackTrace(); + } + } + } + return byteArray; + } + public static Builder Builder; public static Builder of(String path) throws FileNotFoundException, Docx4JException { @@ -87,7 +238,7 @@ public class Docx4jUtil { throws Docx4JException, JAXBException { List tables = getAllElementFromObject(template.getMainDocumentPart(), Tbl.class); - Tbl tempTable = getTemplateTable(tables, tablePlaceholder); // + Tbl tempTable = getTemplateTable(tables, tablePlaceholder); if (tempTable != null && list != null && !list.isEmpty()) { List trs = getAllElementFromObject(tempTable, Tr.class); int rows = trs.size(); @@ -249,6 +400,8 @@ public class Docx4jUtil { if (!params.isEmpty()) { while (texts.hasNext()) { Text text = texts.next(); + R r= (R) text.getParent(); + P p = (P) r.getParent(); String temp = text.getValue(); for (Map.Entry param : params.entrySet()) { if (temp.equals("${" + param.getKey() + "}")) { @@ -303,6 +456,29 @@ public class Docx4jUtil { return inline; } + public static P newImageInline(WordprocessingMLPackage wordMLPackage, byte[] bytes, + String filenameHint, String altText, int id1, int id2 , String text) throws Exception { + + BinaryPartAbstractImage imagePart = BinaryPartAbstractImage.createImagePart(wordMLPackage, bytes); + Inline inline = imagePart.createImageInline(filenameHint, altText, id1, id2, false); + + // Now add the inline in w:p/w:r/w:drawing + ObjectFactory factory = Context.getWmlObjectFactory(); + P p = factory.createP(); + R run = factory.createR(); + if(text != null){ + Text txt = factory.createText(); + txt.setValue(text); + run.getContent().add(txt); + } + p.getContent().add(run); + Drawing drawing = factory.createDrawing(); + run.getContent().add(drawing); + drawing.getAnchorOrInline().add(inline); + + return p; + } + /** * 创建一个对象工厂并用它创建一个段落和一个可运行块R. 然后将可运行块添加到段落中. 接下来创建一个图画并将其添加到可运行块R中. 最后我们将内联 * 对象添加到图画中并返回段落对象. @@ -342,6 +518,7 @@ public class Docx4jUtil { } } return result; + } // 发现docx文档中的节点 @@ -455,7 +632,7 @@ public class Docx4jUtil { */ private static boolean isPlaceholder(String str) { if (str != null && !str.isEmpty()) { - Pattern pattern = Pattern.compile("([$]\\{\\w+\\})"); + Pattern pattern = Pattern.compile("([$]\\{[A-Za-z0-9./ -]+\\})"); Matcher m = pattern.matcher(str); return m.find(); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/CertCategoryParamsInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/CertCategoryParamsInfoEOController.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/CertCategoryParamsInfoEOController.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/CertCategoryParamsInfoEOController.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java similarity index 99% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java index bad589083..ab39e0243 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java @@ -10,7 +10,6 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.cert.template.entity.ParamsInfoEO; -import com.jero.modules.cert.template.enums.ControlTypeEnum; import com.jero.modules.cert.template.service.IParamsInfoEOService; import com.jero.modules.cert.template.service.IParamsInfoPublishEOService; import com.jero.modules.cert.template.vo.ParamsInfoVO; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoPublishEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoPublishEO.java similarity index 77% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoPublishEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoPublishEO.java index b3cf1ecff..1af5f32ce 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoPublishEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoPublishEO.java @@ -1,16 +1,11 @@ package com.jero.modules.cert.template.entity; -import com.baomidou.mybatisplus.annotation.IdType; -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; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoPublishEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoPublishEO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoPublishEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoPublishEO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoEOMapper.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoEOMapper.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoPublishEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoPublishEOMapper.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoPublishEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoPublishEOMapper.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoPublishEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoPublishEOMapper.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoPublishEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoPublishEOMapper.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsTemplateEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/ParamsTemplateEOMapper.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsTemplateEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/ParamsTemplateEOMapper.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoPublishEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoPublishEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoPublishEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoPublishEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsTemplateEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsTemplateEOMapper.xml similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsTemplateEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsTemplateEOMapper.xml diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoPublishEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoPublishEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoPublishEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoPublishEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/utils/CommonExcelExportStyler.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/utils/CommonExcelExportStyler.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/utils/CommonExcelExportStyler.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/utils/CommonExcelExportStyler.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnExport.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnExport.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnExport.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnExport.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoVO.java similarity index 100% rename from jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoVO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoVO.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 3a560b016..58d92b7c3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -6164,7 +6164,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = bussDocumentLibraryEOList.stream() + .filter(e -> e.getSerialNumber().equals(projectLawsInventoryEO.getSerialNumber())).collect(Collectors.toList()); + projectLawsInventoryEO.setStandId(collect.get(0).getId()); } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 688d9e05b..783666259 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -7,27 +7,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.cert.collect.service.IParamsManifestEOService; import com.jero.modules.enums.DictCodeEnum; -import com.jero.modules.project.entity.ConditionAssessmentEO; -import com.jero.modules.project.entity.ProjectLawsInventoryEO; -import com.jero.modules.project.entity.ProjectLawsInventoryLogEO; -import com.jero.modules.project.entity.ProjectLibraryBase; -import com.jero.modules.project.entity.ProjectLibraryRoleRelEO; -import com.jero.modules.project.entity.ProjectRelatedPersonnel; -import com.jero.modules.project.entity.ProjectTaskInventoryEO; -import com.jero.modules.project.entity.ProjectTaskPlanning; -import com.jero.modules.project.enums.CertificationProgressEnum; -import com.jero.modules.project.enums.CurrentProjectStatusEnum; -import com.jero.modules.project.enums.DesignComplianceStatusEnum; -import com.jero.modules.project.enums.InventoryAffirmStatusEnum; -import com.jero.modules.project.enums.OperatorTypeEnum; -import com.jero.modules.project.enums.ProjectRoleEnum; -import com.jero.modules.project.enums.TaskAffirmStatusEnum; -import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; -import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; -import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; -import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper; -import com.jero.modules.project.mapper.ProjectTaskInventoryEOMapper; +import com.jero.modules.project.entity.*; +import com.jero.modules.project.enums.*; +import com.jero.modules.project.mapper.*; import com.jero.modules.project.service.IConditionAssessmentEOService; import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.IProjectLibraryRoleRelEOService; @@ -52,12 +36,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.text.ParseException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -111,6 +90,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl logEOQueryWrapper = new QueryWrapper<>(); logEOQueryWrapper.in("project_library_id",id); projectLawsInventoryLogEOService.remove(logEOQueryWrapper); + } /* diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index cf4dd3a35..3ce420998 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -63,10 +63,12 @@ import org.apache.http.entity.ContentType; import org.apache.poi.common.usermodel.HyperlinkType; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.hssf.util.HSSFColor; -import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.xssf.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFCellStyle; +import org.apache.poi.xssf.usermodel.XSSFRichTextString; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.shiro.SecurityUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; @@ -2625,6 +2627,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl> addForm = list; StringBuilder sb = new StringBuilder(); + StringBuilder sbOfType = new StringBuilder(); List pullMoreList = new LinkedList<>();//多选字段 List pullSingleList = new LinkedList<>();//单选字段 List fileList = new LinkedList<>();//文件字段 @@ -2729,6 +2739,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpljero-boot-modules ${jero.version} - - com.jero.boot - jero-boot-module-certification - ${jero.version} - org.springframework.cloud diff --git a/jero-boot/pom.xml b/jero-boot/pom.xml index 4b22d505b..062559c32 100644 --- a/jero-boot/pom.xml +++ b/jero-boot/pom.xml @@ -55,7 +55,6 @@ jero-boot-single-startup jero-boot-modules jero-boot-center - jero-boot-module-certification diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 7eafd047e..eff55c5ba 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1298,4 +1298,5 @@ module.exports = { personChargeReceivesTheTask:'Person in charge receives the task', theResponsiblePersonTaskForTheSecondTime:'The responsible person receives the task for the second time', processNodesAreInconsistentPleaseSelectConsistentData:'Process nodes are inconsistent; Please select consistent data', + exportFileName:'Export file name', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 251fe8bd5..d4b640677 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1400,4 +1400,5 @@ module.exports = { personChargeReceivesTheTask:'责任人接收任务', theResponsiblePersonTaskForTheSecondTime:'责任人二次接收任务', processNodesAreInconsistentPleaseSelectConsistentData:'流程节点不一致；请选择一致的数据', + exportFileName:'导出文件名称', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 43db4bdfb..b36a85902 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -195,6 +195,7 @@ import { quillEditor } from 'vue-quill-editor' import Vue from 'vue' import { ACCESS_TOKEN } from '@/store/mutation-types' + import axios from 'axios' const toolbarOptions = [ ['bold', 'italic', 'underline', 'strike'], // toggled buttons @@ -226,17 +227,16 @@ data() { return { formInline: {}, + loading: false, headers: '', uploadAction: window._CONFIG['domianURL'] + '/sys/common/upload', - loading: false, - problemTypeList: [], editorOption: { // 富文本框配置 placeholder: '', theme: 'snow', // or 'bubble' modules: { clipboard: { // 粘贴版，处理粘贴时候带图片 - matchers: [[Node.ELEMENT_NODE, this.handleCustomMatcher]], + matchers: [[Node.ELEMENT_NODE, this.handleCustomMatcher]] }, toolbar: { container: toolbarOptions, // 工具栏 @@ -252,6 +252,7 @@ } } }, + problemTypeList: [], rules: { showPermissions: [ { @@ -307,6 +308,7 @@ }, isDisplay: false, disabled: false, + content: '

I am Example

', projectNameList: [ { value: 'Open', @@ -316,21 +318,63 @@ value: 'Privacy', name: this.$t('Privacy') } - ], - content: '

I am Example

' + ] } }, - created() { - const token = Vue.ls.get(ACCESS_TOKEN) - this.headers = { 'X-Access-Token': token } - }, computed: { editor() { return this.$refs.myQuillEditor.quill } }, + created() { + const token = Vue.ls.get(ACCESS_TOKEN) + this.headers = { 'X-Access-Token': token } + }, mounted() { this.getBase() + let quill = this.$refs.myQuillEditor.quill + this.$forceUpdate() + quill.root.addEventListener( + 'paste', + (evt) => { + if ( + evt.clipboardData && + evt.clipboardData.files && + evt.clipboardData.files.length + ) { + evt.preventDefault(); + [].forEach.call(evt.clipboardData.files, (file) => { + if (!file.type.match(/^image\/(gif|jpe?g|a?png|bmp)/i)) { + return + } + const formData = new FormData() + formData.append('file', file) + axios({ + url: this.uploadAction, + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data', + 'X-Access-Token': Vue.ls.get(ACCESS_TOKEN) + } + }) + .then((res) => { + if (res.data.success) { + let quill = this.$refs.myQuillEditor.quill + let length = quill.getSelection().index + let fileName = res.data.result.fileName + let index1 = fileName.lastIndexOf('.') + let index2 = fileName.length + let fileSuffix = fileName.substring(index1, index2) + quill.insertEmbed(length, 'image', window._CONFIG['domianPreviewURL'] + '/sys/common/download/' + res.data.result.id + fileSuffix) + quill.setSelection(length + 1) + } + }) + }) + } + }, + false + ) if (this.$route.query.id) { this.queryById() document.title = this.$t('problemKnowledgeBase') + this.$t('edit') @@ -339,21 +383,21 @@ } }, methods: { - quilleditorBlur() { - this.$refs.ruleForm.validateField('content') - }, handleCustomMatcher(node, Delta) { let ops = [] Delta.ops.forEach(op => { if (op.insert && typeof op.insert === 'string') {// 如果粘贴了图片，这里会是一个对象，如果是字符串则可以添加 ops.push({ - insert: op.insert, + insert: op.insert }) } }) Delta.ops = ops return Delta }, + quilleditorBlur() { + this.$refs.ruleForm.validateField('content') + }, getBase() { getAction('/problemKnowledgeBase/problemKnowledgeBaseClassifyEO/list', {}).then((res) => { if (res.success) { @@ -400,55 +444,41 @@ }, backClick() { this.$router.go(-1) - } - , + }, showPermissionsChange(event, name) { if (event == 'Open') { this.isDisplay = false } else { this.isDisplay = true } - } - , + }, onEditorBlur(quill) { console.log('editor blur!', quill) - } - , + }, onEditorFocus(quill) { console.log('editor focus!', quill) - } - , + }, onEditorReady(quill) { console.log('editor ready!', quill) - } - , + }, + PersonnelSelectionChange(value, id) { + this.formInline[value] = id + this.formInline = { ...this.formInline } + }, onEditorChange({ quill, html, text }) { console.log(html) console.log(quill) console.log(text) this.formInline.content = html - } - , - PersonnelSelectionChange(value, id) { - this.formInline[value] = id - this.formInline = { ...this.formInline } - } - , + }, handleInput(value) { this.$nextTick(() => { this.formInline = { ...this.formInline } this.$refs.ruleForm.validateField([value]) }) - } - , + }, bringInDocumentInformationClick() { this.$refs.listAddModelRef.addModel(this.formInline) - } - , - listAddModelForm(id, number) { - this.formInline.standNumber = number - this.formInline.bussDocumentLibraryId = id - this.formInline = { ...this.formInline } }, handleChange(info) { let { file } = info @@ -461,13 +491,18 @@ let index1 = fileName.lastIndexOf('.') let index2 = fileName.length let fileSuffix = fileName.substring(index1, index2) - quill.insertEmbed(length, 'image', window._CONFIG['domianPreviewURL']+'/sys/common/download/'+file.response.result.id+fileSuffix) + quill.insertEmbed(length, 'image', window._CONFIG['domianPreviewURL'] + '/sys/common/download/' + file.response.result.id + fileSuffix) quill.setSelection(length + 1) this.quillUpdateImg = false } else if (status === 'uploading') { } }, + listAddModelForm(id, number) { + this.formInline.standNumber = number + this.formInline.bussDocumentLibraryId = id + this.formInline = { ...this.formInline } + }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true @@ -479,8 +514,7 @@ this.$refs.uploadFile.perentHandleFunc() } }) - } - , + }, /** 上传文件的回调 */ uploadSuccess(data) { let attIdList = [] @@ -492,8 +526,7 @@ /** 赋值给当前对应的表单文件 */ this.formInline[this.uploadName] = attIdList.join(',') this.formInline = { ...this.formInline } - } - , + }, submit() { this.$refs.ruleForm.validate(valid => { if (valid) { diff --git a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue index 18cd007ee..c0a2474a3 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue @@ -65,6 +65,22 @@ + + + +
+
+ * + {{$t('exportFileName')}} +
+ + + +
+ + + @@ -121,6 +137,14 @@ export default { description:[ { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' }, ], + exportName:[ + { + max: 70, + message: this.$t('exportFileName') + this.$t('cannotExceed') + 70 + this.$t('Characters'), + trigger: 'blur' + }, + { required: true, message: this.$t('PleaseEnter')+this.$t('exportFileName'), trigger: 'blur' }, + ], exportTemplateId: [ { required: true, message: this.$t('PleaseSelect')+this.$t('CustomTemplateName'), trigger: 'change' }, ], @@ -243,12 +267,12 @@ export default { // query.certCategoryName = this.contentListStart // } query.paramsManifestId = this.$route.query.id - let long = localStorage.getItem('language') - if (long && long === 'zh-cn') { - query.exportName = '自定义导出' - } else if (long && long === 'en-us') { - query.exportName = 'Custom' - } + // let long = localStorage.getItem('language') + // if (long && long === 'zh-cn') { + // query.exportName = '自定义导出' + // } else if (long && long === 'en-us') { + // query.exportName = 'Custom' + // } this.confirmLoading = true downloadFile('report/detail/exportCustom', query.exportName+'.zip', query) this.confirmLoading = false diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 320bc0c8f..5f2b8165b 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -5,7 +5,7 @@
- {{ $t('ParameterViewPage') }} + {{this.$route.query.pageName ? this.$route.query.pageName : $t('ParameterViewPage')}}
@@ -19,9 +19,9 @@ {{$t('NcertificationCategory')}} + :placeholder="$t('PleaseSelect')+$t('NcertificationCategory')" + :type="'select'" + :triggerChange="false" :dictCode="'cert_category'"/> @@ -104,39 +104,39 @@ @value='value' @listReset='listReset' @LoginUserType='LoginUserType'/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{this.$t('pleaseWaitWhileRunning')}} @@ -144,444 +144,454 @@ \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/examineInformation.vue b/jero-web/src/views/processCenter/components/examineInformation.vue index 2f97ec816..e640eec56 100644 --- a/jero-web/src/views/processCenter/components/examineInformation.vue +++ b/jero-web/src/views/processCenter/components/examineInformation.vue @@ -54,7 +54,7 @@
{{$t('feedbackMessage')}}
- + @@ -151,6 +151,7 @@ }, mounted() { this.formInline.approvalOpinion = '' + this.formInline = {...this.formInline} }, methods: { clickButtonToUpload(item) { diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue index 1ea338cea..108dcf2d3 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue @@ -57,7 +57,7 @@
{{$t('feedbackMessage')}}
- +