diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index c825ea6b8..925808229 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1108,3 +1108,6 @@ 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 ('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'); + +-- 上报库删除按钮 +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 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-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java index 7307250e9..b5fbc9a63 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java @@ -101,6 +101,24 @@ public class ParamsReportEOController extends JeroController delete(@RequestParam(name="id",required=true) String id) { + boolean isSuccess = paramsReportEOService.deleteById(id); + if (isSuccess) { + return Result.OK("删除成功!"); + } else { + return Result.error("删除失败!"); + } + } @@ -147,20 +165,6 @@ public class ParamsReportEOController extends JeroController delete(@RequestParam(name="id",required=true) String id) { - paramsReportEOService.deleteById(id); - return Result.OK("删除成功!"); - } - /** * 批量删除 * 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-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java index dc3818c1d..e4b308c54 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java @@ -30,4 +30,11 @@ public interface IParamsReportConfigDataEOService extends IService queryListByConfigIdList(List configIdList); + + /** + * 批量删除清单的所有配置数据 + * @param paramsReportDetailIdList + * @return + */ + int deleteByParamsReportDetailIdList(List paramsReportDetailIdList); } 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-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java index 9f377b597..7dece4f71 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java @@ -59,4 +59,6 @@ public interface IParamsReportDetailEOService extends IService> configDataList, String paramsManifestId); + // 删除 + boolean deleteByIds(List ids); } 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-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java index 51f147836..6c2c6bcac 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java @@ -36,7 +36,7 @@ public interface IParamsReportEOService extends IService { * @param id * @return */ - void deleteById(String id); + boolean deleteById(String id); /** * 批量删除 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-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java index c69874c9c..a9e55f27a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java @@ -61,4 +61,6 @@ public interface IParamsReportExportHistoryEOService extends IService queryList(); IPage queryPage(IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO, String cut); + + void deleteByParamsManifestId(String paramsManifestId); } 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-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java index cce1ae4ed..5396e71ab 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java @@ -55,4 +55,11 @@ public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl paramsReportDetailIdList) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsReportConfigDataEO::getParamsCollectManifestId, paramsReportDetailIdList); + return baseMapper.delete(queryWrapper); + } + } 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-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 2e219d6ab..4879c80b5 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -1711,6 +1711,19 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl ids) { + // 关联删除配置数据 + paramsReportConfigDataEOService.deleteByParamsReportDetailIdList(ids); + return removeByIds(ids); + } + /** * 实体对象转成Map * @param obj 实体对象 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-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java index 76c937679..a3d285a7a 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-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java @@ -6,9 +6,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper; import com.jero.modules.cert.collect.vo.ParamsManifestVO; +import com.jero.modules.cert.report.entity.ParamsReportConfigEO; +import com.jero.modules.cert.report.entity.ParamsReportDetailEO; import com.jero.modules.cert.report.entity.ParamsReportEO; +import com.jero.modules.cert.report.mapper.ParamsReportConfigEOMapper; import com.jero.modules.cert.report.mapper.ParamsReportEOMapper; +import com.jero.modules.cert.report.service.IParamsReportDetailEOService; import com.jero.modules.cert.report.service.IParamsReportEOService; +import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,6 +37,15 @@ public class ParamsReportEOServiceImpl extends ServiceImpl configEOQueryWrapper = new LambdaQueryWrapper<>(); + configEOQueryWrapper.eq(ParamsReportConfigEO::getParamsManifestId, id); + paramsReportConfigEOMapper.delete(configEOQueryWrapper); + + // 关联删除收集的参数项(包含配置数据) + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsReportDetailEO::getParamsManifestId, id); + List paramsReportDetailEOList = paramsReportDetailEOService.list(queryWrapper); + if (CollectionUtil.isNotEmpty(paramsReportDetailEOList)) { + List paramsReportDetailIdList = paramsReportDetailEOList.stream().map(ParamsReportDetailEO::getId).collect(Collectors.toList()); + paramsReportDetailEOService.deleteByIds(paramsReportDetailIdList); + } + + // 关联删除导出历史 + paramsReportExportHistoryEOService.deleteByParamsManifestId(id); + + return removeById(id); } /** 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-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java index f4444d91a..a296e3492 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java @@ -1,7 +1,9 @@ package com.jero.modules.cert.report.service.impl; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO; import com.jero.modules.cert.report.enums.ExportTypeEnum; import com.jero.modules.cert.report.mapper.ParamsReportExportHistoryEOMapper; @@ -10,11 +12,10 @@ import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Date; -import java.util.Map; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.Date; +import java.util.List; +import java.util.Map; /** * @Description: 上报库导出历史 @@ -119,4 +120,11 @@ public class ParamsReportExportHistoryEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsReportExportHistoryEO::getParamsManifestId, paramsManifestId); + paramsReportExportHistoryEOMapper.delete(queryWrapper); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index 97d1f5f5d..838f0ec28 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -67,7 +67,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String projectLibraryId; /**编号*/ - @Excel(name = "编号", width = 20) + @Excel(name = "*编号", width = 20) @ApiModelProperty(value = "编号") private String serialNumber; @@ -150,7 +150,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String attestationType_dictText; /**认证级别*/ - @Excel(name = "认证级别", width = 20,dicCode ="attestation_rank") + @Excel(name = "*认证级别", width = 20,dicCode ="attestation_rank") @ApiModelProperty(value = "认证级别") //@Dict(dicCode ="attestation_rank") private String attestationRank; @@ -167,7 +167,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String wvtaId; /**责任领域*/ - @Excel(name = "责任领域", width = 20,dicCode ="duty_territory") + @Excel(name = "*责任领域", width = 20,dicCode ="duty_territory") @ApiModelProperty(value = "责任领域") //@Dict(dicCode ="duty_territory") private String dutyTerritory; @@ -207,7 +207,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String remark; /**设计符合性确认-交付物类型*/ - @Excel(name = "设计符合性确认-交付物类型", width = 20,dicCode ="deliverable_template") + @Excel(name = "交付物类型", width = 20,dicCode ="deliverable_template",groupName = "设计符合性确认") @ApiModelProperty(value = "设计符合性确认-交付物类型") //@Dict(dicCode ="deliverable_template") private String designDeliverableType; @@ -222,7 +222,7 @@ public class ProjectLawsInventoryEO implements Serializable { /**设计符合性确认-交付物模板名称*/ @TableField(exist = false) - @Excel(name = "设计符合性确认-交付物模板", width = 20) + @Excel(name = "交付物模板", width = 20,groupName = "设计符合性确认") private String designDeliverableTemplateName; /**设计符合性确认-发起人角色*/ @@ -238,7 +238,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String designInitiatorId; /**设计符合性确认-发起人名称*/ - @Excel(name = "设计符合性确认-发起人", width = 20) + @Excel(name = "发起人", width = 20,groupName = "设计符合性确认") @TableField(exist = false) private String designInitiatorName; @@ -255,12 +255,12 @@ public class ProjectLawsInventoryEO implements Serializable { private String designDutyId; /**设计符合性确认-责任人名称*/ - @Excel(name = "设计符合性确认-责任人", width = 20) + @Excel(name = "责任人", width = 20,groupName = "设计符合性确认") @TableField(exist = false) private String designDutyName; /**设计符合性确认-截止时间*/ - @Excel(name = "设计符合性确认-截止时间", width = 20, format = "yyyy-MM-dd") + @Excel(name = "截止时间", width = 20, format = "yyyy-MM-dd",groupName = "设计符合性确认") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "设计符合性确认-截止时间") @@ -270,11 +270,11 @@ public class ProjectLawsInventoryEO implements Serializable { private String designDueDateString; //交付物说明 - @Excel(name = "设计符合性确认-交付物说明", width = 20) + @Excel(name = "交付物说明", width = 20,groupName = "设计符合性确认") private String designRemark; /**prehomo确认-交付物类型*/ - @Excel(name = "prehomo确认-交付物类型", width = 20,dicCode ="deliverable_template") + @Excel(name = "交付物类型", width = 20,dicCode ="deliverable_template",groupName = "Pre-homo确认") @ApiModelProperty(value = "prehomo确认-1") ////@Dict(dicCode ="deliverable_template") private String prehomoDeliverableType; @@ -289,7 +289,7 @@ public class ProjectLawsInventoryEO implements Serializable { /**prehomo确认-交付物模板名称*/ @TableField(exist = false) - @Excel(name = "prehomo确认-交付物模板", width = 20) + @Excel(name = "交付物模板", width = 20,groupName = "Pre-homo确认") private String prehomoDeliverableTemplateName; /**prehomo确认-发起人角色*/ @@ -305,7 +305,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String prehomoInitiatorId; /**prehomo确认-发起人名称*/ - @Excel(name = "prehomo确认-发起人", width = 20) + @Excel(name = "发起人", width = 20,groupName = "Pre-homo确认") @TableField(exist = false) private String prehomoInitiatorName; @@ -322,12 +322,12 @@ public class ProjectLawsInventoryEO implements Serializable { private String prehomoDutyId; /**prehomo确认-责任人名称*/ - @Excel(name = "prehomo确认-责任人", width = 20) + @Excel(name = "责任人", width = 20,groupName = "Pre-homo确认") @TableField(exist = false) private String prehomoDutyName; /**prehomo确认-截止时间*/ - @Excel(name = "prehomo确认-截止时间", width = 20, format = "yyyy-MM-dd") + @Excel(name = "截止时间", width = 20, format = "yyyy-MM-dd",groupName = "Pre-homo确认") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "prehomo确认-截止时间") @@ -337,11 +337,11 @@ public class ProjectLawsInventoryEO implements Serializable { private String prehomoDueDateString; //prehomo确认-交付物说明 - @Excel(name = "prehomo确认-交付物说明", width = 20) + @Excel(name = "交付物说明", width = 20,groupName = "Pre-homo确认") private String prehomoRemark; /**验证符合性确认-交付物类型*/ - @Excel(name = "验证符合性确认-交付物类型", width = 20,dicCode ="deliverable_template") + @Excel(name = "交付物类型", width = 20,dicCode ="deliverable_template",groupName = "验证符合性确认") @ApiModelProperty(value = "验证符合性确认-交付物类型") //@Dict(dicCode ="deliverable_template") private String verifyDeliverableType; @@ -355,7 +355,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String verifyDeliverableTemplate; /**验证符合性确认-交付物模板名称*/ - @Excel(name = "验证符合性确认-交付物模板", width = 20) + @Excel(name = "交付物模板", width = 20,groupName = "验证符合性确认") @TableField(exist = false) private String verifyDeliverableTemplateName; @@ -372,7 +372,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String verifyInitiatorId; /**验证符合性确认-发起人名称*/ - @Excel(name = "验证符合性确认-发起人", width = 20) + @Excel(name = "发起人", width = 20,groupName = "验证符合性确认") @TableField(exist = false) private String verifyInitiatorName; @@ -389,12 +389,12 @@ public class ProjectLawsInventoryEO implements Serializable { private String verifyDutyId; /**验证符合性确认-责任人名称*/ - @Excel(name = "验证符合性确认-责任人", width = 20) + @Excel(name = "责任人", width = 20,groupName = "验证符合性确认") @TableField(exist = false) private String verifyDutyName; /**验证符合性确认-截止时间*/ - @Excel(name = "验证符合性确认-截止时间", width = 20, format = "yyyy-MM-dd") + @Excel(name = "截止时间", width = 20, format = "yyyy-MM-dd",groupName = "验证符合性确认") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "验证符合性确认-截止时间") @@ -404,7 +404,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String verifyDueDateString; //验证备注 - @Excel(name = "验证符合性确认-交付物说明", width = 20) + @Excel(name = "交付物说明", width = 20,groupName = "验证符合性确认") private String verifyRemark; @TableField(exist = false) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java index 3c4dfea55..c18d10358 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java @@ -188,7 +188,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String remark; /**设计符合性确认-交付物类型*/ - @Excel(name = "Design Compliance Check Deliverable Type", width = 50,dicCode ="deliverable_template") + @Excel(name = "Deliverable Type", width = 25,dicCode ="deliverable_template",groupName = "Design Compliance Check") @ApiModelProperty(value = "设计符合性确认-交付物类型") @Dict(dicCode ="deliverable_template") private String designDeliverableType; @@ -199,7 +199,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { /**设计符合性确认-交付物模板名称*/ @TableField(exist = false) - @Excel(name = "Design Compliance Check Deliverable Template", width = 50) + @Excel(name = "Deliverable Template", width = 25,groupName = "Design Compliance Check") private String designDeliverableTemplateName; /**设计符合性确认-发起人角色*/ @@ -212,7 +212,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String designInitiatorId; /**设计符合性确认-发起人名称*/ - @Excel(name = "Design Compliance Check Initiator", width = 50) + @Excel(name = "Initiator", width = 25,groupName = "Design Compliance Check") @TableField(exist = false) private String designInitiatorName; @@ -226,12 +226,12 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String designDutyId; /**设计符合性确认-责任人名称*/ - @Excel(name = "Design Compliance Check Assignee", width = 50) + @Excel(name = "Assignee", width = 25,groupName = "Design Compliance Check") @TableField(exist = false) private String designDutyName; /**设计符合性确认-截止时间*/ - @Excel(name = "Design Compliance Check Due Date", width = 50, format = "yyyy-MM-dd") + @Excel(name = "Due Date", width = 25, format = "yyyy-MM-dd",groupName = "Design Compliance Check") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "设计符合性确认-截止时间") @@ -240,11 +240,11 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String designDueDateString; //交付物说明 - @Excel(name = "Design Compliance Check Deliverable Description", width = 50) + @Excel(name = "Deliverable Description", width = 25,groupName = "Design Compliance Check") private String designRemark; /**prehomo确认-交付物类型*/ - @Excel(name = "Pre-homo Check Deliverable Type", width = 50,dicCode ="deliverable_template") + @Excel(name = "Deliverable Type", width = 25,dicCode ="deliverable_template",groupName = "Pre-homo Check") @ApiModelProperty(value = "prehomo确认-1") @Dict(dicCode ="deliverable_template") private String prehomoDeliverableType; @@ -255,7 +255,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { /**prehomo确认-交付物模板名称*/ @TableField(exist = false) - @Excel(name = "Pre-homo Check Deliverable Template", width = 50) + @Excel(name = "Deliverable Template", width = 25,groupName = "Pre-homo Check") private String prehomoDeliverableTemplateName; /**prehomo确认-发起人角色*/ @@ -268,7 +268,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String prehomoInitiatorId; /**prehomo确认-发起人名称*/ - @Excel(name = "Pre-homo Check Initiator", width = 50) + @Excel(name = "Initiator", width = 25,groupName = "Pre-homo Check") @TableField(exist = false) private String prehomoInitiatorName; @@ -282,12 +282,12 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String prehomoDutyId; /**prehomo确认-责任人名称*/ - @Excel(name = "Pre-homo Check Assignee", width = 50) + @Excel(name = "Assignee", width = 25,groupName = "Pre-homo Check") @TableField(exist = false) private String prehomoDutyName; /**prehomo确认-截止时间*/ - @Excel(name = "Pre-homo Check Due Date", width = 50, format = "yyyy-MM-dd") + @Excel(name = "Due Date", width = 25, format = "yyyy-MM-dd",groupName = "Pre-homo Check") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "prehomo确认-截止时间") @@ -296,11 +296,11 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String prehomoDueDateString; //prehomo确认-交付物说明 - @Excel(name = "Pre-homo Check Deliverable Description", width = 50) + @Excel(name = "Deliverable Description", width = 25,groupName = "Pre-homo Check") private String prehomoRemark; /**验证符合性确认-交付物类型*/ - @Excel(name = "Validation Compliance Check Deliverable Type", width = 50,dicCode ="deliverable_template") + @Excel(name = "Deliverable Type", width = 25,dicCode ="deliverable_template",groupName = "Validation Compliance Check") @ApiModelProperty(value = "验证符合性确认-交付物类型") @Dict(dicCode ="deliverable_template") private String verifyDeliverableType; @@ -310,7 +310,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String verifyDeliverableTemplate; /**验证符合性确认-交付物模板名称*/ - @Excel(name = "Validation Compliance Check Deliverable Template", width = 50) + @Excel(name = "Deliverable Template", width = 25,groupName = "Validation Compliance Check") @TableField(exist = false) private String verifyDeliverableTemplateName; @@ -324,7 +324,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String verifyInitiatorId; /**验证符合性确认-发起人名称*/ - @Excel(name = "Validation Compliance Check Initiator", width = 50) + @Excel(name = "Initiator", width = 25,groupName = "Validation Compliance Check") @TableField(exist = false) private String verifyInitiatorName; @@ -338,12 +338,12 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String verifyDutyId; /**验证符合性确认-责任人名称*/ - @Excel(name = "Validation Compliance Check Assignee", width = 50) + @Excel(name = "Assignee", width = 25,groupName = "Validation Compliance Check") @TableField(exist = false) private String verifyDutyName; /**验证符合性确认-截止时间*/ - @Excel(name = "Validation Compliance Check Due Date", width = 50, format = "yyyy-MM-dd") + @Excel(name = "Due Date", width = 25, format = "yyyy-MM-dd",groupName = "Validation Compliance Check") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "验证符合性确认-截止时间") @@ -352,7 +352,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String verifyDueDateString; //验证备注 - @Excel(name = "Validation Compliance Check Deliverable Description", width = 60) + @Excel(name = "Deliverable Description", width = 25,groupName = "Validation Compliance Check") private String verifyRemark; @TableField(exist = false) 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 d147b7b0e..0f3eaf88a 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 @@ -3990,7 +3990,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl int addMenu(SarFileSplitMenuEO sarFileSplitMenuEO); + /** + * 根据ID查询所有的子节点包括父节点 + * @param sarFileSplitMenuEO + * @return + */ + List queryAllChildrenById(SarFileSplitMenuEO sarFileSplitMenuEO); + void deleteMenu(String id); int insert(SarFileSplitMenuEO sarFileSplitMenuEO); 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 48c404d84..cf4dd3a35 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 @@ -45,6 +45,7 @@ import com.jero.modules.split.page.SarFileSplitMenuEOPage; import com.jero.modules.split.service.IFileSplitItemsEOService; import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.split.service.ISarFileSplitItemsValEOService; +import com.jero.modules.split.service.ISarFileSplitMenuEOService; import com.jero.modules.split.util.POIReadExcelToHtml; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysCategoryTreeVO; @@ -124,6 +125,8 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl menuIdList = sarFileSplitMenuEOMapper.queryAllChildrenByid(sarFileSplitMenuEO).stream() + List menuIdList = sarFileSplitMenuEOService.queryAllChildrenById(sarFileSplitMenuEO).stream() .map(SarFileSplitMenuEO::getId) .collect(Collectors.toList()); +// List menuIdList = sarFileSplitMenuEOMapper.queryAllChildrenByid(sarFileSplitMenuEO).stream() +// .map(SarFileSplitMenuEO::getId) +// .collect(Collectors.toList()); String menuIds = StringUtils.join(menuIdList,"','"); conditionSb.append(" and sar_file_split_items." + key + " in('" + menuIds + "')"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java index 660eb7c95..0385006f7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java @@ -1,6 +1,6 @@ package com.jero.modules.split.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.split.entity.SarFileSplitMenuEO; import com.jero.modules.split.mapper.SarFileSplitItemsValEOMapper; @@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.stream.Collectors; /** @@ -79,12 +80,41 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl queryAllChildrenById(SarFileSplitMenuEO sarMenuEO) { + SarFileSplitMenuEO sarFileSplitMenuEO = dao.selectByPrimaryKey(sarMenuEO.getId()); + SarFileSplitMenuEOPage page = new SarFileSplitMenuEOPage(); + page.setInfoId(sarFileSplitMenuEO.getInfoId()); + List listAll = dao.queryByList(page); // 查询所有目录 + + List result = new ArrayList<>(); + // 递归查询 指定父节点下的所有子节点,包括父节点 + if (CollectionUtil.isNotEmpty(listAll)) { + result.add(sarFileSplitMenuEO); // 加上父节点 + recursion(listAll, result, sarFileSplitMenuEO); + } + + return result; + } + + private void recursion(List listAll, List result, SarFileSplitMenuEO father) { + List childern = listAll.stream().filter(e-> father.getId().equals(e.getPId())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(childern)) { + result.addAll(childern); + for(SarFileSplitMenuEO menuEO : childern) { + recursion(listAll, result, menuEO); + } + + } + } + public void deleteMenu(String id){ List menuIds = new ArrayList<>(); SarFileSplitMenuEO sarMenuEO = new SarFileSplitMenuEO(); sarMenuEO.setId(id); // 查询当前节点及所有子节点 - List list = dao.queryAllChildrenByid(sarMenuEO); +// List list = dao.queryAllChildrenByid(sarMenuEO); + List list = queryAllChildrenById(sarMenuEO); + if (list != null && !list.isEmpty()) { for(SarFileSplitMenuEO menu : list){ menuIds.add(menu.getId()); diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1dd31f30b..66dd59a4c 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1286,4 +1286,10 @@ module.exports = { listConfirmationRejectionReason:'List confirmation rejection reason', taskConfirmationRejectionReason:'Task confirmation rejection reason', onlyCompletedDataCanBeDeleted:'Only completed data can be deleted', + reportedDelete:'You\'re about to permanently delete the parameter list', + reportDelete:',including its parameters and export history. Once you confirm and press Delete, it cannot be undone or recovered.', + confirmdelete:'Confirm the listing title you want to delete', + Deletetitle:'Delete the title', + toConfirmed: 'to confirm', + confirmtitle:'The title is incorrect. Please re-enter it', } \ 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 32376ecc0..960943483 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1387,5 +1387,11 @@ module.exports = { collectionLegislativeComments:'法规意见收集', regulatoryAndTechnicalAssessment:'法规技术评估', listConfirmationRejectionReason:'清单确认驳回原因', - taskConfirmationRejectionReason:'任务确认驳回原因' + taskConfirmationRejectionReason:'任务确认驳回原因', + reportedDelete:'您将永久删除清单', + reportDelete:',包括清单参数项及导出历史。一旦删除将无法撤销或恢复。', + confirmdelete:'请确认要删除的清单标题', + Deletetitle:'删除标题', + toConfirmed: '来确认', + confirmtitle:'标题不正确,请重新输入', } \ No newline at end of file diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue index 69b6313b3..513d2861f 100644 --- a/jero-web/src/components/TaskCutOffTime/index.vue +++ b/jero-web/src/components/TaskCutOffTime/index.vue @@ -1,4 +1,13 @@