FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 78672

Browse Source 
企业标准---给标准设置了体系标准后删掉，在体系搜索统计中没有更新统计数据
This commit is contained in:
mzaxd
2023-11-25 23:55:02 +08:00
parent c2428daac4
commit ef7a1c2eb3
5 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/ISarBussStandMenuService.java
+4
View File
@@ -18,4 +18,8 @@ public interface ISarBussStandMenuService extends IService<SarBussStandMenu> {
List<SarBussStandMenu> selectAllMenuByStandId(SarBussStandMenu sarStandMenuEO);
int deleteByMenuId (SarBussStandMenu sarStandMenuEO);
void deleteStandSystemByStandId(String id);
void addStandSystemRelation(String standSystemId, String id);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java
+28
View File
@@ -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<SarBussStandMenuDao
@Autowired
private ISarMenuStandardService iSarMenuStandardService;
public int deleteByMenuId (SarBussStandMenu sarStandMenuEO){
String treeType = sarStandMenuEO.getTreeType();
List<String> menuIds = new ArrayList<>();
@@ -42,6 +48,28 @@ public class SarBussStandMenuServiceImpl extends ServiceImpl<SarBussStandMenuDao
return this.baseMapper.deleteByMenuId(sarStandMenuEO);
}
@Override
public void deleteStandSystemByStandId(String id) {
LambdaUpdateWrapper<SarBussStandMenu> 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<SarBussStandMenu> selectAllMenuByStandId(SarBussStandMenu sarStandMenuEO){
return this.baseMapper.selectAllMenuByStandId(sarStandMenuEO);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+12
View File
@@ -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<SarBussionessSt
@Autowired
private AttFileEOServiceImpl attFileEOService;
@Resource
private ISarBussStandMenuService sarBussStandMenuService;
/**
* 根据计划库制定状态查询企标编号
*
@@ -229,6 +235,12 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
//401问题2021-03-31暂时注释掉 liuhuiwen
// @RequiresPermissions("lawss:sarBussionessStand:updateSarBussionessStand")
public ResponseMessage<SarBussionessStand> updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO) throws Exception {
// 标准体系
String standSystemId = sarBussionessStandEO.getTxlbId();
sarBussStandMenuService.deleteStandSystemByStandId(sarBussionessStandEO.getId());
if (StrUtil.isNotBlank(standSystemId)) {
sarBussStandMenuService.addStandSystemRelation(standSystemId, sarBussionessStandEO.getId());
}
//校验编号和名称是否存在
QueryWrapper<SarBussionessStand> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(null!=sarBussionessStandEO.getStandCode(),"STAND_CODE",sarBussionessStandEO.getStandCode())
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+1
View File
@@ -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;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java
+11
View File
@@ -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<SarStandMenuDao, SarSta
@Autowired
private ITsResourceService sarMenuEOService;
@Autowired
private ISarMenuStandardService iSarMenuStandardService;
@Override
public int deleteByMenuId (SarStandMenu sarStandMenuEO){
List<String> menuIds = sarMenuEOService.getChildMenuList(sarStandMenuEO.getOldMenuId());
@@ -51,6 +57,11 @@ public class SarStandMenuServiceImpl extends ServiceImpl<SarStandMenuDao, SarSta
@Override
public void addStandSystemRelation(String standSystem, String id) {
// 校验standSystem是否有效
SarMenuStandard standMenu = iSarMenuStandardService.getById(standSystem);
if (standMenu == null) {
throw new AdcDaBaseException("无效的标准体系");
}
SarStandMenu sarStandMenu = new SarStandMenu();
// 生成不带横杠的UUID
sarStandMenu.setId(java.util.UUID.randomUUID().toString().replaceAll("-", ""));