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

Merge branch 'develop_master' into develop_migration

Browse Source
This commit is contained in:
super_liu
2021-08-27 16:18:54 +08:00
parent 531137fa86 003315dde8
commit 7155dea894
23 changed files with 311 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+7 -4
View File
@@ -5,6 +5,7 @@ import com.adc.da.scheduled.dao.SarStandardItemDao;
import com.adc.da.scheduled.dao.SarStandardWarningDao;
import com.adc.da.scheduled.entity.DataDTO;
import com.adc.da.scheduled.entity.WarningEO;
import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO;
import com.adc.da.util.UUIDUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,8 +56,7 @@ public class ScheduledJob {
@Autowired
private SarStandardInfoDao sarStandardInfoDao;
@Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行
@Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行
// @Scheduled(cron="*/5 * * * * ?")
@Async
public void schedulingTasks() {
@@ -109,7 +109,8 @@ public class ScheduledJob {
warningEO.setId(UUIDUtils.randomUUID20())
.setPower("1")
.setMark("3")
.setPutTime(warningEO.getXCXSSRQ());
.setPutTime(warningEO.getXCXSSRQ())
.setStandCode(warningEO.getStandSort()+" "+warningEO.getStandNum()+"-"+warningEO.getStandYear());
}
warningList.addAll(standInfoXCXSSRQ);
@@ -120,12 +121,14 @@ public class ScheduledJob {
warningEO.setId(UUIDUtils.randomUUID20())
.setPower("1")
.setMark("4")
.setPutTime(warningEO.getZCCSSRQ());
.setPutTime(warningEO.getZCCSSRQ())
.setStandCode(warningEO.getStandSort()+" "+warningEO.getStandNum()+"-"+warningEO.getStandYear());
}
warningList.addAll(standInfoZCCSSRQ);
//持久化至预警表 忽略标准id和标志位都一样的数据
if (warningList.size()!=0){
//此表的STAND_CODE和MARK字段需建立唯一性约束
int count = sarStandardWarningDao.ignoreInsert(warningList);
System.out.println("已预警 " + count + " 条标准或条款!!");
}
adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java
+5
View File
@@ -19,4 +19,9 @@ public class WarningEO extends EarlyWarningEO {
private Date ZCCSSRQ;
private String standNum;
private String standSort;
private String standYear;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
+2 -1
View File
@@ -50,7 +50,8 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
list.like(StringUtils.isNotEmpty(category),"category",category)
.like(StringUtils.isNotEmpty(cname),"cname",cname)
.ge(start!=null,"start_time",start)
.le(end!=null,"end_time",end);
.le(end!=null,"end_time",end)
.orderByDesc("start_time");
Page<SarPublicIdea> page = new Page<>(p,size);
IPage<SarPublicIdea> userIPage = sarPublicIdeaDao.selectPage(page, list);
System.out.println("总条数"+userIPage.getTotal());
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java
+3
View File
@@ -193,5 +193,8 @@ public class SarStandItems extends BaseEntity {
@TableField("read_content")
private String readContent;
@ApiModelProperty(value = "编辑关联标识")
@TableField("edit_flag")
private String editFlag;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java
+5
View File
@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* <p>
* Mapper 接口
@@ -20,5 +22,8 @@ import org.apache.ibatis.annotations.Mapper;
public interface SarStandUnqualifiedDao extends BaseMapper<SarStandUnqualified> {
IPage<SarStandUnqualified> getAllDatasByPage(Page page,@Param("sar") SarStandUnqualifiedPage sarStandUnqualified);
List<SarStandUnqualified> getSarStandUnqualifiedPage(@Param("start")Integer start, @Param("end")Integer end, @Param("sar") SarStandUnqualifiedPage sarStandUnqualified);
Integer getSarStandUnqualifiedCount(@Param("sar") SarStandUnqualifiedPage sarStandUnqualified);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java
+4
View File
@@ -166,5 +166,9 @@ public class SarStandUnqualified extends BaseEntity {
@TableField(exist=false)
private String dutyEngineerName;
@ApiModelProperty(value = "国内OR海外")
@TableField(exist=false)
private String standType;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
+28 -26
View File
@@ -47,7 +47,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
@Override
public IPage<SarStandUnqualified> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
wrapper1.select("STAND_NUMBER","STAND_SORT","STAND_YEAR");
wrapper1.select("STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_TYPE");
wrapper1.last("INNER JOIN sar_stand_unqualified r ON r.STAND_ID = sar_standards_info.ID WHERE sar_standards_info.ID='"+sarStandUnqualifiedPage.getStandId()+"'");
Page<SarStandardsInfo> page1 = new Page<>();
IPage<SarStandardsInfo> userIPage1 = sarStandardsInfoDao.selectPage(page1,wrapper1);
@@ -66,33 +66,35 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
}
}
QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
if(sarStandUnqualifiedPage.getStandId()!=null){
sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId());
}
//仅查询未关闭的
sarStandUnqualifiedQueryWrapper.eq("close_state",1);
//根据 项目名称 进行查询
if(sarStandUnqualifiedPage.getProductName()!=null){
sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName());
}
//根据 责任部门 进行查询
if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){
sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit());
}
//根据 标准号/标准名称 进行查询
if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){
// sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()).or().like("stand_name",sarStandUnqualifiedPage.getStandName());
sarStandUnqualifiedQueryWrapper.last(" and (stand_serial_number LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%'\n" +
"\t\tOR stand_name LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%')");
}
// QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
// if(sarStandUnqualifiedPage.getStandId()!=null){
// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId());
// }
// //仅查询未关闭的
// sarStandUnqualifiedQueryWrapper.eq("close_state",1);
// //根据 项目名称 进行查询
// if(sarStandUnqualifiedPage.getProductName()!=null){
// sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName());
// }
// //根据 责任部门 进行查询
// if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){
// sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit());
// }
// //根据 标准号/标准名称 进行查询
// if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){
//// sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()).or().like("stand_name",sarStandUnqualifiedPage.getStandName());
// sarStandUnqualifiedQueryWrapper.last(" and (stand_serial_number LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%'\n" +
// "\t\tOR stand_name LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%')");
// }
Page<SarStandUnqualified> standUnqualifiedPage=new Page<>();
//判断前端是否提供页码和每页条数
if(sarStandUnqualifiedPage.getCurrent()!=null
&& sarStandUnqualifiedPage.getSize()!=null){
standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize());
}
return sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper);
List<SarStandUnqualified> sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getCurrent()*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage);
Integer total=sarStandUnqualifiedDao.getSarStandUnqualifiedCount(sarStandUnqualifiedPage);
standUnqualifiedPage.setRecords(sarStandUnqualifieds);
standUnqualifiedPage.setTotal(total);
standUnqualifiedPage.setCurrent(sarStandUnqualifiedPage.getCurrent());
standUnqualifiedPage.setSize(sarStandUnqualifiedPage.getSize());
return standUnqualifiedPage;
}
/**
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java
+6
View File
@@ -24,6 +24,9 @@ public class EarlyWarningEO extends BaseEntity {
@TableId("ID")
private String id;
@TableField("STAND_ID")
private String standId;
@TableField("STAND_TYPE")
private String standType;
@@ -45,6 +48,9 @@ public class EarlyWarningEO extends BaseEntity {
@TableField("ITEMS_ID")
private String itemsId;
@TableField("ITEMS_NUM")
private String itemsNum;
@TableField("ITEMS_NAME")
private String itemsName;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+1 -1
View File
@@ -2174,7 +2174,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
String txt = extractor.getText();
content.append(txt);
}
} else {
} else {
PDDocument document = PDDocument.load(new File(readFilePath));
document.getClass();
if (!document.isEncrypted()) {
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java
+2 -2
View File
@@ -133,9 +133,9 @@ public class SarFileSplitItemsEOController extends BaseController<SarFileSplitIt
@ApiOperation(value = "|SarFileSplitItemsEO|批量删除")
@PostMapping("/batchDeleteItems")
public ResponseMessage batchDeleteItems(String ids) throws Exception {
public ResponseMessage batchDeleteItems(String ids,String editFlag) throws Exception {
if (StringUtils.isNotEmpty(ids)) {
int result = sarFileSplitItemsEOService.batchDeleteItems(ids);
int result = sarFileSplitItemsEOService.batchDeleteItems(ids,editFlag);
if (result > 0) {
return Result.success("0","删除成功",null);
} else {
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java
+5
View File
@@ -4,6 +4,7 @@ import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
import com.adc.da.slrs.standardSplit.dto.FileSplitItemsExportDto;
import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO;
import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEOPage;
import com.adc.da.slrs.standardSplit.entity.SarStandItemsEO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -32,6 +33,8 @@ public interface SarFileSplitItemsEODao extends BaseMapper<SarFileSplitItemsEO>
int deleteByItemsIdList(@Param("idList") List<String> idList);
int deleteByItemsIdList1(@Param("idList") List<String> idList);
List<SarFileSplitItemsEO> queryItemsByMenuId(@Param("menuId") String menuId);
List<SarFileSplitItemsEO> queryByItemsIds(@Param("idList") List<String> idList);
@@ -52,6 +55,8 @@ public interface SarFileSplitItemsEODao extends BaseMapper<SarFileSplitItemsEO>
int updateByPrimaryKeySelective(SarFileSplitItemsEO page);
int updateByPrimaryKeySelective1(SarFileSplitItemsEO page);
int deleteByPrimaryKey(String id);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java
+13
View File
@@ -2,6 +2,7 @@ package com.adc.da.slrs.standardSplit.entity;
import com.adc.da.base.entity.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
import java.util.List;
@@ -12,6 +13,7 @@ import java.util.List;
* <b>日期：</b> 2020-01-03 <br>
* <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
*/
@Data
public class SarFileSplitItemsEO extends BaseEntity {
private String id;
@@ -64,6 +66,9 @@ public class SarFileSplitItemsEO extends BaseEntity {
private String responsibleUnit;//责任部门
private String responsibleUnitShow;
private String editFlag;
private String workFlowShow;
/**
* java字段名转换为原始数据库列名。<b>如果不存在则返回null</b><br>
* <p>字段列表：</p>
@@ -520,4 +525,12 @@ public class SarFileSplitItemsEO extends BaseEntity {
public void setResponsibleUnitShow(String responsibleUnitShow) {
this.responsibleUnitShow = responsibleUnitShow;
}
public String getEditFlag() {
return editFlag;
}
public void setEditFlag(String editFlag) {
this.editFlag = editFlag;
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEOPage.java
+9
View File
@@ -61,10 +61,19 @@ public class SarFileSplitItemsEOPage extends BasePage {
private String sMenuId;
private List<String> idList;
private List<String> menuIdList;
private String edirFlag;
private int tableIndex = 1;
private int imgIndex = 1;
public String getEdirFlag() {
return edirFlag;
}
public void setEdirFlag(String edirFlag) {
this.edirFlag = edirFlag;
}
public String getId() {
return this.id;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsEO.java
+9
View File
@@ -58,6 +58,7 @@ public class SarStandItemsEO extends BaseEntity {
private SarCompStatusInfoEO pgForm;
private String menuId;
private String editFlag;
/**
* java字段名转换为原始数据库列名。<b>如果不存在则返回null</b><br>
* <p>字段列表：</p>
@@ -483,4 +484,12 @@ public class SarStandItemsEO extends BaseEntity {
public void setMenuId(String menuId) {
this.menuId = menuId;
}
public String getEditFlag() {
return editFlag;
}
public void setEditFlag(String editFlag) {
this.editFlag = editFlag;
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java
+1 -1
View File
@@ -28,7 +28,7 @@ public interface SarFileSplitItemsEOService {
int deleteByPrimaryKey(String id);
int batchDeleteItems(String ids);
int batchDeleteItems(String ids,String editFlag);
boolean judgeContaintChilds(String ids);
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
+23 -1
View File
@@ -330,6 +330,25 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
return -1;
}
if(treeList.size()>0 && messageList.size() > 0){
//判断流程是否需要显示！！
List<SarFileSplitItemsEO> middle = new ArrayList<>();
middle=messageList;
for (SarFileSplitItemsEO mis:messageList) {
mis.setWorkFlowShow("1");
if (mis.getItemsNum().equals("1") || mis.getItemsNum().startsWith("1.") || mis.getItemsNum().equals("2") || mis.getItemsNum().startsWith("2.") || mis.getItemsNum().equals("3") || mis.getItemsNum().startsWith("3.")){
mis.setWorkFlowShow("0");
}
else {
for (SarFileSplitItemsEO itemsEO : middle) {
if (itemsEO.getItemsNum().length() > mis.getItemsNum().length() && itemsEO.getItemsNum().contains(mis.getItemsNum())) {
if (itemsEO.getItemsNum().startsWith(mis.getItemsNum())) {
mis.setWorkFlowShow("0");
break;
}
}
}
}
}
sarFileSplitMenuEODao.insertForeach(treeList);
sarFileSplitItemsEODao.insertForeach(messageList);
sarFileSplitItemsValEODao.insertForeach(itemValList);
@@ -345,7 +364,9 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
.setStandId(sarFileSplitInfoEO.getStandId())
.setItemsNum(item.getItemsNum())
.setItemsName(item.getItemsName())
.setTermsConditions(item.getItermsConditions());
.setTermsConditions(item.getItermsConditions())
.setEditFlag(item.getEditFlag());
standList.add(standItems1);
});
sarFileSplitItemsEODao.insertStandSplitForeach(standList);
@@ -370,6 +391,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
sarFileSplitItemsEO.setCreationUser(LoginUserUtil.getUserId());
sarFileSplitItemsEO.setModifyTime(new Date());
sarFileSplitItemsEO.setModifyUser(LoginUserUtil.getUserId());
sarFileSplitItemsEO.setEditFlag(UUIDUtils.randomUUID(32));
return sarFileSplitItemsEO;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java
+28 -3
View File
@@ -74,23 +74,36 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
@Override
public Map<String, Object> getByPage(SarFileSplitItemsEOPage page) {
//ValidFlag为0的意思是有效，设置这个文件分解清单的有效性为有效
page.setValidFlag("0");
//把SAR_FILE_SPLIT_MENU表里的数据按照display_seq的从小到大的正序进行排列
page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc");
//如果SAR_FILE_SPLIT_ITEMS表里的拆分目录ID即MenuId不为空
if (com.adc.da.util.utils.StringUtils.isNotEmpty(page.getMenuId())) {
//把根据条件查询SAR_FILE_SPLIT_MENU表查出来的数据放到sarFileSplitMenuEOList里
List<SarFileSplitMenuEO> sarFileSplitMenuEOList = sarFileSplitMenuEOService.queryByList(new SarFileSplitMenuEOPage());
//把这个sarFileSplitMenuEOList转换成树的形式
Tree tree = new Tree<>(sarFileSplitMenuEOList);
//treeNode就是树的子节点中的SAR_FILE_SPLIT_ITEMS表中的menuId
TreeNode treeNode = tree.getTreeNode(page.getMenuId());
List<String> menuIds = new ArrayList<>();
//然后把刚刚的treeNode的nodeId放到menuIds数组里
menuIds.add(treeNode.getNodeId());
for (TreeNode node : treeNode.getAllChildren()) {
//把所有的treeNode的nodeId放到menuIds数组里
menuIds.add(node.getNodeId());
}
//把它放到MenuIdList里
page.setMenuIdList(menuIds);
}
//数出SAR_FILE_SPLIT_ITEMS这个表里MENU_ID不为空或id不为空的记录一共有几条（基本上就是数出这个表一共有几条数据）
int count = dao.queryByCount(page);
//把page里的值当做条件一顿左联查询了SAR_FILE_SPLIT_ITEMS这个表
List<SarFileSplitItemsEO> rows = dao.queryByPage(page);
//如果查询出来的结果不为空
if (rows != null && !rows.isEmpty()) {
//遍历rows
for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) {
//查询svpps
String svppsShow = sysInfoEOService.getSvppsNamesByIds(sarFileSplitItemsEO.getSvpps());
@@ -137,6 +150,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
String itemConditions = "";
String userId = UserUtils.getUserId();
int resultCount = 0;
int resultCount1 = 0;
//修改特殊参数要求信息
updateParamsContent(sarFileSplitItemsEO);
//修改条款要求内容
@@ -200,13 +214,18 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
}
sarFileSplitItemsEO.setItermsConditions(itemConditions);
resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO);
resultCount1 = dao.updateByPrimaryKeySelective1(sarFileSplitItemsEO);
} else {
sarFileSplitItemsEO.setItermsConditions("");
resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO);
resultCount1 = dao.updateByPrimaryKeySelective1(sarFileSplitItemsEO);
// 删除val表全部信息
sarFileSplitItemsValEODao.deleteByitemId(sarFileSplitItemsEO.getId());
}
return resultCount;
Map resultCountMap = new HashMap();
resultCountMap.put("拆分",resultCount);
resultCountMap.put("标准分解单",resultCount1);
return resultCountMap.size();
}
/**
@@ -240,9 +259,11 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
}
@Override
public int batchDeleteItems(String ids) {
public int batchDeleteItems(String ids,String editFlag) {
String[] itemIds = ids.split(",");
String[] itemIds1 = editFlag.split(",");
List<String> idList = Arrays.asList(itemIds);
List<String> idList1 = Arrays.asList(itemIds1);
// 查到对应menu
List<SarFileSplitItemsEO> getMenuList = dao.queryByItemsIds(idList);
List<SarFileSplitItemsEO> getAllItemList = new ArrayList<>();
@@ -280,6 +301,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
//删除file表数据
// sarFileSplitItemsFileEODao.deleteByItemIds(allItemIdList);
result = dao.deleteByItemsIdList(allItemIdList);
dao.deleteByItemsIdList1(idList1);
}else if(!idList.isEmpty()){//菜单被删掉了，数据当时被保留下来的
allItemIdList.clear();
allItemIdList.addAll(idList);
@@ -290,9 +312,12 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
//删除特殊参数要求params表数据
sarFileSplitItemsParamsEODao.deleteByItemIds(allItemIdList);
result = dao.deleteByItemsIdList(allItemIdList);
dao.deleteByItemsIdList1(idList1);
}
}
return result;
Map resultMap = new HashMap();
resultMap.put("拆分单删除",result);
return resultMap.size();
}
@Override