From fe3ce9efbdc8c82474848ee0d013899cd8cc3f81 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 8 Sep 2022 11:40:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E3=80=81=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=20=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E3=80=82=E4=BB=A5=E5=8F=8A=E8=8F=9C=E5=8D=95=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=A2=9E=E5=8A=A0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 7 +++++++ .../impl/LawsOpinionGatherEOServiceImpl.java | 8 ++++++++ ...LawsTechnologyEvaluationEOServiceImpl.java | 20 ++++++++++++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index a60f3ff85..c67f5a79d 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1101,3 +1101,10 @@ CREATE TABLE `laws_weilai`.`problem_knowledge_base_reply` ( `reply_content` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '回复内容', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库-评论回复表' ROW_FORMAT = Dynamic; + +-- 增加法规技术评估菜单权限数据 2022-09-08 +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 ('1567712620460294145', '1546316593837740034', '法规技术评估-发起流程', NULL, NULL, NULL, NULL, 2, 'regulatoryAndTechnicalAssessment:initiationProcess', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-08 11:13:10', NULL, NULL, 0, 0, '1', 0, 'Regulatory and technical assessment - Initiation Process'); +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 ('1567712238313062402', '1546316593837740034', '法规技术评估-批量删除', NULL, NULL, NULL, NULL, 2, 'regulatoryAndTechnicalAssessment::batchDelete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-08 11:11:39', NULL, NULL, 0, 0, '1', 0, 'Regulatory and technical assessment - batch Delete'); +INSERT INTO `laws_weilai`.`sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1567712001896923137', '1546316593837740034', '法规技术评估-删除', NULL, NULL, NULL, NULL, 2, 'regulatoryAndTechnicalAssessment:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-08 11:10:43', 'admin', '2022-09-08 11:12:55', 0, 0, '1', 0, 'Regulatory and technical assessment - delete'); +INSERT INTO `laws_weilai`.`sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1567711678239260673', '1539780399024934914', '法规意见-批量删除', NULL, NULL, NULL, NULL, 2, 'regulatoryComments:batchDelete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-08 11:09:25', NULL, NULL, 0, 0, '1', 0, 'Regulatory Comments - batch Delete'); +INSERT INTO `laws_weilai`.`sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('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'); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java index ef780296c..1eb348350 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java @@ -10,7 +10,9 @@ import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum; import com.jero.modules.lawsOpinionGather.mapper.LawsOpinionGatherEOMapper; +import com.jero.modules.lawsOpinionGather.service.ILawsOpinionAssessmentResultEOService; import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService; +import com.jero.modules.lawsOpinionGather.service.ILawsProcessHistoryEOService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.project.entity.ProjectLawsInventoryEO; @@ -60,6 +62,8 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl ids) { removeByIds(ids); + + QueryWrapper deleteWrapper = new QueryWrapper(); + deleteWrapper.lambda().in("laws_opinion_gather_id",ids); + this.lawsOpinionAssessmentResultEOService.remove(deleteWrapper); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index f1fdd8e75..078623c80 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -17,7 +17,7 @@ import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationEOMapper; -import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService; +import com.jero.modules.lawsTechnologyEvaluation.service.*; import com.jero.modules.project.enums.JumpLinkEnum; import com.jero.modules.project.enums.MsgTypeEnum; import com.jero.modules.project.enums.OperatorTypeEnum; @@ -82,6 +82,14 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl ids) { removeByIds(ids); + + QueryWrapper deleteWrapper = new QueryWrapper(); + deleteWrapper.lambda().in("laws_technology_evaluation_id",ids); + this.lawsTechnologyEvaluationFlowDetailEOService.remove(deleteWrapper); + + this.lawsTechnologyEvaluationItemResultEOService.remove(deleteWrapper); + + this.lawsTechnologyEvaluationResultEOService.remove(deleteWrapper); + + this.lawsTechnologyEvaluationComplianceResultEOService.remove(deleteWrapper); } /**