From cd8645bab9aac809a30de7145905bfe5b6b2b4a5 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sat, 25 Nov 2023 21:20:00 +0800 Subject: [PATCH 1/8] fix: 78639 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 体系搜索--弹窗中缺少体系结构查询字段 --- .../entity/StandSystemDTO.java | 13 ++++++++++ .../SarStandMenu/SarStandMenuMapper.xml | 26 ++++++++++++++----- .../SarBussionessStandMapper.xml | 23 ++++++++++++---- 3 files changed, 50 insertions(+), 12 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java index 7e6f6b19..dec2730b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java @@ -30,6 +30,12 @@ public class StandSystemDTO { @ApiModelProperty(value = "体系结构") private String standSystem; + @ApiModelProperty(value = "体系结构ID(树状结构选取)") + private String standSystemId; + + @ApiModelProperty(value = "体系结构IDList(树状结构选取)") + private List standSystemIdList; + @ApiModelProperty(value = "标准Id") private String standId; @@ -156,4 +162,11 @@ public class StandSystemDTO { this.endReleaseDateString = sdf.format(endReleaseDate); } } + + public void setStandSystemIdList(String standSystemId) { + this.standSystemId = standSystemId; + if (standSystemId != null) { + this.standSystemIdList = java.util.Arrays.asList(standSystemId.split(",")); + } + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index fe134425..bf223dfb 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -220,14 +220,19 @@ AND gb.STAND_NAME LIKE CONCAT('%',#{param.standName},'%') - - - AND gb.ISSUE_TIME BETWEEN #{param.startReleaseDateString} AND #{param.endReleaseDateString} + + + AND gb.ISSUE_TIME >= #{param.startReleaseDateString} - - - AND gb.PUT_TIME BETWEEN #{param.startImplementDate} AND #{param.endImplementDate} + + AND gb.ISSUE_TIME <= CONCAT(#{param.endReleaseDateString}, ' 23:59:59') + + + + AND gb.PUT_TIME >= #{param.startImplementDate} + + + AND gb.PUT_TIME <= CONCAT(#{param.endImplementDate}, ' 23:59:59') @@ -249,6 +254,13 @@ AND gb.STAND_TYPE = #{dataSource} + + + AND gb.ID IN + + #{item} + + AND gb.ID IN diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 793f870e..ebd6d7cf 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1328,12 +1328,18 @@ AND es.STAND_NAME LIKE CONCAT('%',#{param.standName},'%') - - AND es.ISSUE_TIME BETWEEN #{param.startReleaseDate} AND #{param.endReleaseDate} + + AND es.ISSUE_TIME >= #{param.startImplementDate} - - - AND es.PUT_TIME BETWEEN #{param.startImplementDate} AND #{param.endImplementDate} + + AND es.ISSUE_TIME <= CONCAT(#{param.endReleaseDate}, ' 23:59:59') + + + + AND es.PUT_TIME >= #{param.startImplementDate} + + + AND es.PUT_TIME <= CONCAT(#{param.endImplementDate}, ' 23:59:59') @@ -1351,6 +1357,13 @@ AND 'ENTERPRISE' = #{param.dataSource} + + + AND es.ID IN + + #{item} + + AND es.ID IN From acc790d8a6295897e6760f1eccce0464c8502b6d Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sat, 25 Nov 2023 22:08:53 +0800 Subject: [PATCH 2/8] fix: 78640 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 体系搜索--弹窗中发布日期的查询范围为当天时，查询结果不对 --- .../mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml | 2 +- .../mapper/sarBussionessStand/SarBussionessStandMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index bf223dfb..8ac1f67e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -200,7 +200,7 @@ LEFT JOIN `sar_stand_menu` AS m ON gb.ID = m.STAND_ID AND LENGTH(m.MENU_ID) > 30 LEFT JOIN sar_menu_standard sms on m.MENU_ID = sms.ID WHERE gb.VALID_FLAG = '0' - AND sms.id in (select id from sar_menu_standard where valid_flag = 0) + AND sms.id in (select id from sar_menu_standard where valid_flag = 0 ) AND gb.STAND_TYPE = #{dataSource} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index ebd6d7cf..abfac3da 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1329,10 +1329,10 @@ - AND es.ISSUE_TIME >= #{param.startImplementDate} + AND es.ISSUE_TIME >= #{param.startReleaseDateString} - AND es.ISSUE_TIME <= CONCAT(#{param.endReleaseDate}, ' 23:59:59') + AND es.ISSUE_TIME <= CONCAT(#{param.endReleaseDateString}, ' 23:59:59') From e7a7085cae88e2614661002bb783ae2321bc0f62 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sat, 25 Nov 2023 22:44:31 +0800 Subject: [PATCH 3/8] fix: 78646 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 企业/国内/海外标准---标准体系字段选择的数据在配置管理中删除了，标准的该字段的数据没有置空显示 --- .../java/com/adc/da/scheduled/dao/SarStandardInfoDao.java | 1 + .../slrs/sarBussionessStand/dao/SarBussionessStandDao.java | 2 ++ .../da/slrs/sarMenuStandard/entity/SarMenuStandardNew.java | 2 ++ .../service/impl/SarMenuStandardNewServiceNewImpl.java | 7 ++++++- .../mapper/sarBussionessStand/SarBussionessStandMapper.xml | 5 +++++ .../mybatis/mapper/sarStandWarning/SarStandardInfo.xml | 6 ++++++ 6 files changed, 22 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java index 5fcefabf..b25a4db6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java @@ -15,4 +15,5 @@ public interface SarStandardInfoDao{ public int updateStandardInfo(@Param("id")String id, @Param("textStatus") String textStatus); + int deleteStandSystem(@Param("menuName") String menuName); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 0dc6cea4..84bc1350 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -141,5 +141,7 @@ public interface SarBussionessStandDao extends BaseMapper { String selectMaxStandSn(String standSort); List getESSystemData(@Param("param") StandSystemDTO standSystemDTO); + + void deleteStandSystem(String menuName); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/SarMenuStandardNew.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/SarMenuStandardNew.java index 452e55ae..9a067161 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/SarMenuStandardNew.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/SarMenuStandardNew.java @@ -7,6 +7,7 @@ import com.adc.da.sys.utils.treetool.annotation.TreeNodeParentId; 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 io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -30,6 +31,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @ApiModel(value="SarMenuStandard对象", description="") +@TableName("sar_menu_standard") public class SarMenuStandardNew extends BaseEntity { public interface update{ } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 3d554ccd..283d9975 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -22,6 +22,7 @@ import com.adc.da.slrs.sarRole.dao.TsRoleDao; import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao; import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.tsDictionaryType.entity.TsDicType; import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService; import com.adc.da.sys.sarMenuStandard.dao.SarMenuStandardDao; @@ -391,6 +392,8 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl menuUpdateWrapper = new LambdaUpdateWrapper<>(); menuUpdateWrapper.eq(SarMenuStandard::getId, menuId); @@ -406,7 +409,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl + + update sar_buss_stand_attr_info + set TXLBBUSS = null + where TXLBBUSS like #{menuName} + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandMenu/SarBussStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandMenu/SarBussStandMenuMapper.xml index 39abea45..9852e679 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandMenu/SarBussStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandMenu/SarBussStandMenuMapper.xml @@ -218,7 +218,6 @@ AND sm.VALID_FLAG = 0 AND sm.TREE_TYPE is null AND sms.id in (select id from sar_menu_standard where valid_flag = 0) - group by stand.ID diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 7dfd1a7e..5df8ba31 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1375,6 +1375,5 @@ #{item} - group by es.ID From ef7a1c2eb36f35d320d620ee45f22e0fadaed945 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sat, 25 Nov 2023 23:55:02 +0800 Subject: [PATCH 5/8] fix: 78672 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 企业标准---给标准设置了体系标准后删掉，在体系搜索统计中没有更新统计数据 --- .../service/ISarBussStandMenuService.java | 4 +++ .../impl/SarBussStandMenuServiceImpl.java | 28 +++++++++++++++++++ .../SarBussionessStandController.java | 12 ++++++++ .../impl/SarBussionessStandServiceImpl.java | 1 + .../service/impl/SarStandMenuServiceImpl.java | 11 ++++++++ 5 files changed, 56 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/ISarBussStandMenuService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/ISarBussStandMenuService.java index 85587e22..001e0e99 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/ISarBussStandMenuService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/ISarBussStandMenuService.java @@ -18,4 +18,8 @@ public interface ISarBussStandMenuService extends IService { List selectAllMenuByStandId(SarBussStandMenu sarStandMenuEO); int deleteByMenuId (SarBussStandMenu sarStandMenuEO); + + void deleteStandSystemByStandId(String id); + + void addStandSystemRelation(String standSystemId, String id); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java index ba1309d8..713f8f63 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java @@ -1,15 +1,20 @@ package com.adc.da.slrs.sarBussStandMenu.service.impl; +import com.adc.da.exception.AdcDaBaseException; import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu; import com.adc.da.slrs.sarBussStandMenu.dao.SarBussStandMenuDao; import com.adc.da.slrs.sarBussStandMenu.service.ISarBussStandMenuService; import com.adc.da.slrs.sarResource.service.ITsResourceService; +import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; +import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -30,6 +35,7 @@ public class SarBussStandMenuServiceImpl extends ServiceImpl menuIds = new ArrayList<>(); @@ -42,6 +48,28 @@ public class SarBussStandMenuServiceImpl extends ServiceImpl sarStandMenuWrapper = new LambdaUpdateWrapper<>(); + sarStandMenuWrapper.eq(SarBussStandMenu::getBussStandId, id); + remove(sarStandMenuWrapper); + } + + @Override + public void addStandSystemRelation(String standSystem, String id) { + // 校验standSystem是否有效 + SarMenuStandard standMenu = iSarMenuStandardService.getById(standSystem); + if (standMenu == null) { + throw new AdcDaBaseException("无效的标准体系"); + } + SarBussStandMenu sarBussStandMenu = new SarBussStandMenu(); + // 生成不带横杠的UUID + sarBussStandMenu.setId(java.util.UUID.randomUUID().toString().replaceAll("-", "")); + sarBussStandMenu.setBussStandId(id).setMenuId(standSystem).setValidFlag(0); + save(sarBussStandMenu); + } + @Override public List selectAllMenuByStandId(SarBussStandMenu sarStandMenuEO){ return this.baseMapper.selectAllMenuByStandId(sarStandMenuEO); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index cd45358c..d70fa400 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarBussionessStand.controller; +import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.ZipUtil; import com.adc.da.Log.BusinessType; import com.adc.da.Log.EpcLog; @@ -11,6 +12,7 @@ import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanInfo; import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; +import com.adc.da.slrs.sarBussStandMenu.service.ISarBussStandMenuService; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService; @@ -52,6 +54,7 @@ import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; @@ -105,6 +108,9 @@ public class SarBussionessStandController extends BaseController updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO) throws Exception { + // 标准体系 + String standSystemId = sarBussionessStandEO.getTxlbId(); + sarBussStandMenuService.deleteStandSystemByStandId(sarBussionessStandEO.getId()); + if (StrUtil.isNotBlank(standSystemId)) { + sarBussStandMenuService.addStandSystemRelation(standSystemId, sarBussionessStandEO.getId()); + } //校验编号和名称是否存在 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(null!=sarBussionessStandEO.getStandCode(),"STAND_CODE",sarBussionessStandEO.getStandCode()) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 250c4a57..4533ad40 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -49,6 +49,7 @@ import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; +import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java index c8893e01..ddbabb3b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java @@ -1,10 +1,13 @@ package com.adc.da.slrs.sarStandMenu.service.impl; +import com.adc.da.exception.AdcDaBaseException; import com.adc.da.slrs.sarMenu.service.ISarMenuService; import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao; import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService; +import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; +import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -30,6 +33,9 @@ public class SarStandMenuServiceImpl extends ServiceImpl menuIds = sarMenuEOService.getChildMenuList(sarStandMenuEO.getOldMenuId()); @@ -51,6 +57,11 @@ public class SarStandMenuServiceImpl extends ServiceImpl Date: Sun, 26 Nov 2023 10:40:00 +0800 Subject: [PATCH 6/8] fix: 78645 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 体系搜索--弹窗中列表中的数据的默认排序未按需求文档中描述的进行排序 --- .../impl/SarMenuStandardNewServiceNewImpl.java | 5 ++++- .../sys/sarMenuStandard/entity/SarMenuStandard.java | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 283d9975..52f025a0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -51,6 +51,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; /** @@ -251,7 +252,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl gbStateDictList = dicItemService.selectAllDicTypeNameByDicCode("STANDSTATE"); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java index a6393c0b..356328b5 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java @@ -19,6 +19,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; /** *

@@ -218,4 +219,15 @@ public class SarMenuStandard extends BaseEntity { setSystemSort(child, currentSort); } } + + // 新增的深度优先遍历方法 + public static void setSystemSortDFS(SarMenuStandard node, AtomicInteger currentNumber) { + if (node == null) { + return; + } + node.setSystemSort(currentNumber.getAndIncrement()); + for (SarMenuStandard child : node.getChildren()) { + setSystemSortDFS(child, currentNumber); + } + } } From 804f48be13c7248f28a62ebb352cf161dcf46356 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sun, 26 Nov 2023 11:58:19 +0800 Subject: [PATCH 7/8] fix: 78648 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 企业标准---点击左侧技术体系结构中的节点，右侧列表数据展示的不对 --- .../service/impl/SarMenuStandardNewServiceNewImpl.java | 8 ++++++++ .../adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java | 4 ++++ .../mapper/tsRoleMeunData/TsRoleMenuDataMapper.xml | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 52f025a0..e46d8788 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -25,6 +25,8 @@ import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.tsDictionaryType.entity.TsDicType; import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService; +import com.adc.da.slrs.tsRoleMeunData.dao.TsRoleMenuDataDao; +import com.adc.da.slrs.tsRoleMeunData.service.ITsRoleMenuDataService; import com.adc.da.sys.sarMenuStandard.dao.SarMenuStandardDao; import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; import com.adc.da.sys.sarMenuStandard.entity.StandMenuRelation; @@ -89,6 +91,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl map = new HashMap<>(); map.put("resourceId", sarMenuStandard.getId()); map.put("roleId", roleId); + map.put("menuId", sarMenuStandard.getId()); resourceDao.insertTsRoleResource(map); + // 添加权限 + roleMenuDataDao.insertResourceMenuData(map); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java index b7ee9949..46616443 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; + /** *

* Mapper 接口 @@ -17,4 +19,6 @@ public interface TsRoleMenuDataDao extends BaseMapper { @Insert("insert into ts_role_menu_data (role_id,menu_id) values (#{roleId},#{id})") void save(@Param("roleId") String roleId,@Param("id") String id); + + void insertResourceMenuData(HashMap map); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/tsRoleMeunData/TsRoleMenuDataMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/tsRoleMeunData/TsRoleMenuDataMapper.xml index dacec7b5..c448940f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/tsRoleMeunData/TsRoleMenuDataMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/tsRoleMeunData/TsRoleMenuDataMapper.xml @@ -2,4 +2,8 @@ + + INSERT INTO ts_role_menu_data + VALUES(#{roleId},#{menuId} ) + From 94352fdfaa09b3506cbf682d19415e51b274a5a5 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sun, 26 Nov 2023 12:40:19 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix:=20=E4=BD=93=E7=B3=BB=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index b2622e2a..62eeccad 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -180,7 +180,10 @@ CONCAT(gb.STAND_SORT, ' ', gb.STAND_NUMBER) AS standNo, gb.STAND_NAME AS standName, gb.STAND_STATE AS standState, - gb.ISSUE_TIME AS releaseDate, + CASE + WHEN gb.ISSUE_TIME = '' THEN NULL + ELSE gb.ISSUE_TIME + END AS releaseDate, gb.PUT_TIME AS implementDate, gb.REPLACE_STAND_NUM AS replaceStandardNo, gba.QCDW AS dept,