|
|
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
+import com.mysql.cj.x.protobuf.MysqlxDatatypes;
|
|
|
import com.platform.common.bean.AbstractPageResultBean;
|
|
|
import com.platform.common.cache.ConfigCache;
|
|
|
import com.platform.common.constant.RedisKeyConstants;
|
|
|
@@ -20,6 +21,7 @@ import com.platform.dao.mapper.fill.*;
|
|
|
import com.platform.dao.mapper.upms.SysUserMapper;
|
|
|
import com.platform.dao.util.MessageTemplateUtil;
|
|
|
import com.platform.dao.vo.SysRoleVO;
|
|
|
+import com.platform.dao.vo.query.fill.FillGatherTaskDetailVO;
|
|
|
import com.platform.dao.vo.query.fill.FillGatherTaskVO;
|
|
|
import com.platform.dao.vo.query.fill.FillInfoVO;
|
|
|
import com.platform.service.base.impl.BaseServiceImpl;
|
|
|
@@ -74,6 +76,16 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
|
|
|
task.setWaitNum(task1.getTotalNum()-dto.getDetailIds().size());
|
|
|
deleteDetails(dto.getDetailIds());
|
|
|
}else if (dto.getIsAdd()==1){
|
|
|
+ List<FillGatherTaskDetailVO> detailVOS = fillGatherTaskDetailMapper.selectVOByTaskId(task1.getId());
|
|
|
+ StringBuffer sb = new StringBuffer();
|
|
|
+ for (FillGatherTaskDetailVO vo:detailVOS){
|
|
|
+ sb.append(vo.getSbId());
|
|
|
+ }
|
|
|
+ for (String sbId:dto.getSbIds()){
|
|
|
+ if (sb.toString().contains(sbId)) {
|
|
|
+ throw new DeniedException("设备id为"+sbId+"的设备已添加在巡检任务中，不可重复添加！");
|
|
|
+ }
|
|
|
+ }
|
|
|
task.setTotalNum(task1.getTotalNum()+dto.getSbIds().size());
|
|
|
task.setWaitNum(task1.getTotalNum()+dto.getSbIds().size());
|
|
|
//新增明细,调用saveDetail方法
|
