项目库-法规清单-创建时初始化 任务清单表数据。
This commit is contained in:
+6
@@ -76,4 +76,10 @@ public interface IProjectTaskInventoryEOService extends IService<ProjectTaskInve
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Result<?> remindDispose(JSONObject jsonObject);
|
Result<?> remindDispose(JSONObject jsonObject);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据法规清单id,删除数据
|
||||||
|
* @param projectLawsInventoryIds
|
||||||
|
*/
|
||||||
|
void deleteByProjectLawsInventoryIds(List<String> projectLawsInventoryIds);
|
||||||
}
|
}
|
||||||
|
|||||||
+28
-10
@@ -22,10 +22,7 @@ import com.jero.modules.feishu.service.IFeishuService;
|
|||||||
import com.jero.modules.message.websocket.WebSocket;
|
import com.jero.modules.message.websocket.WebSocket;
|
||||||
import com.jero.modules.oss.entity.OSSFile;
|
import com.jero.modules.oss.entity.OSSFile;
|
||||||
import com.jero.modules.oss.service.IOSSFileService;
|
import com.jero.modules.oss.service.IOSSFileService;
|
||||||
import com.jero.modules.project.entity.ProjectLawsInventoryEO;
|
import com.jero.modules.project.entity.*;
|
||||||
import com.jero.modules.project.entity.ProjectLibraryBase;
|
|
||||||
import com.jero.modules.project.entity.ProjectNameInfoEO;
|
|
||||||
import com.jero.modules.project.entity.ProjectRelatedPersonnel;
|
|
||||||
import com.jero.modules.project.enums.InventoryAffirmStatusEnum;
|
import com.jero.modules.project.enums.InventoryAffirmStatusEnum;
|
||||||
import com.jero.modules.project.enums.MsgTypeEnum;
|
import com.jero.modules.project.enums.MsgTypeEnum;
|
||||||
import com.jero.modules.project.enums.OperatorResultEnum;
|
import com.jero.modules.project.enums.OperatorResultEnum;
|
||||||
@@ -33,11 +30,9 @@ import com.jero.modules.project.enums.OperatorTypeEnum;
|
|||||||
import com.jero.modules.project.enums.ProjectRoleEnum;
|
import com.jero.modules.project.enums.ProjectRoleEnum;
|
||||||
import com.jero.modules.project.enums.RequestSourceEnum;
|
import com.jero.modules.project.enums.RequestSourceEnum;
|
||||||
import com.jero.modules.project.enums.TaskAffirmStatusEnum;
|
import com.jero.modules.project.enums.TaskAffirmStatusEnum;
|
||||||
import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
|
import com.jero.modules.project.mapper.*;
|
||||||
import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
|
|
||||||
import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
|
|
||||||
import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
|
|
||||||
import com.jero.modules.project.service.IProjectLawsInventoryEOService;
|
import com.jero.modules.project.service.IProjectLawsInventoryEOService;
|
||||||
|
import com.jero.modules.project.service.IProjectTaskInventoryEOService;
|
||||||
import com.jero.modules.system.entity.SysAnnouncement;
|
import com.jero.modules.system.entity.SysAnnouncement;
|
||||||
import com.jero.modules.system.entity.SysUser;
|
import com.jero.modules.system.entity.SysUser;
|
||||||
import com.jero.modules.system.mapper.SysUserMapper;
|
import com.jero.modules.system.mapper.SysUserMapper;
|
||||||
@@ -116,6 +111,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
|
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IProjectTaskInventoryEOService projectTaskInventoryEOService;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private IDummyInventoryInfoEOService dummyInventoryInfoEOService;
|
private IDummyInventoryInfoEOService dummyInventoryInfoEOService;
|
||||||
@Value(value = "${jero.path.upload}")
|
@Value(value = "${jero.path.upload}")
|
||||||
@@ -129,6 +128,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void add(ProjectLawsInventoryEO projectLawsInventoryEO) {
|
public void add(ProjectLawsInventoryEO projectLawsInventoryEO) {
|
||||||
|
List<ProjectTaskInventoryEO> projectTaskInventoryEOList = new ArrayList<>();
|
||||||
//法规清单所有的数据
|
//法规清单所有的数据
|
||||||
LambdaQueryWrapper<ProjectLawsInventoryEO> wrapperTemp = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<ProjectLawsInventoryEO> wrapperTemp = new LambdaQueryWrapper<>();
|
||||||
wrapperTemp.in(ProjectLawsInventoryEO::getProjectLibraryId,projectLawsInventoryEO.getProjectLibraryId());
|
wrapperTemp.in(ProjectLawsInventoryEO::getProjectLibraryId,projectLawsInventoryEO.getProjectLibraryId());
|
||||||
@@ -181,6 +181,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
}
|
}
|
||||||
if(projectLawsInventoryEOS.size() != 0){
|
if(projectLawsInventoryEOS.size() != 0){
|
||||||
this.saveBatch(projectLawsInventoryEOS);
|
this.saveBatch(projectLawsInventoryEOS);
|
||||||
|
projectLawsInventoryEOS.forEach(lawsInventory -> {
|
||||||
|
ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
|
||||||
|
String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
|
||||||
|
projectTaskInventoryEO.setId(projectTaskInventoryId);
|
||||||
|
projectTaskInventoryEO.setProjectLawsInventoryId(lawsInventory.getId());
|
||||||
|
projectTaskInventoryEOList.add(projectTaskInventoryEO);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -217,20 +224,29 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
}
|
}
|
||||||
|
|
||||||
List<ProjectLawsInventoryEO> list = new ArrayList<>();
|
List<ProjectLawsInventoryEO> list = new ArrayList<>();
|
||||||
|
|
||||||
for (BussDocumentLibraryEO bussDocumentLibraryEO : bussDocumentLibraryEOList) {
|
for (BussDocumentLibraryEO bussDocumentLibraryEO : bussDocumentLibraryEOList) {
|
||||||
ProjectLawsInventoryEO projectLawsInventoryTemp = new ProjectLawsInventoryEO();
|
ProjectLawsInventoryEO projectLawsInventoryTemp = new ProjectLawsInventoryEO();
|
||||||
BeanUtils.copyProperties(bussDocumentLibraryEO, projectLawsInventoryTemp);
|
BeanUtils.copyProperties(bussDocumentLibraryEO, projectLawsInventoryTemp);
|
||||||
String id = UUID.randomUUID().toString().replace("-", "");
|
String projectLawsInventoryId = UUID.randomUUID().toString().replace("-", "");
|
||||||
projectLawsInventoryTemp.setId(id);
|
projectLawsInventoryTemp.setId(projectLawsInventoryId);
|
||||||
projectLawsInventoryTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId());
|
projectLawsInventoryTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId());
|
||||||
projectLawsInventoryTemp.setCreateTime(new Date());
|
projectLawsInventoryTemp.setCreateTime(new Date());
|
||||||
projectLawsInventoryTemp.setUpdateTime(new Date());
|
projectLawsInventoryTemp.setUpdateTime(new Date());
|
||||||
projectLawsInventoryTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
|
projectLawsInventoryTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
|
||||||
projectLawsInventoryTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
|
projectLawsInventoryTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
|
||||||
list.add(projectLawsInventoryTemp);
|
list.add(projectLawsInventoryTemp);
|
||||||
|
|
||||||
|
ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
|
||||||
|
String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
|
||||||
|
projectTaskInventoryEO.setId(projectTaskInventoryId);
|
||||||
|
projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventoryId);
|
||||||
|
projectTaskInventoryEOList.add(projectTaskInventoryEO);
|
||||||
}
|
}
|
||||||
super.saveBatch(list);
|
super.saveBatch(list);
|
||||||
}
|
}
|
||||||
|
//项目任务清单数据初始化。
|
||||||
|
this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -270,6 +286,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
removeById(id);
|
removeById(id);
|
||||||
|
this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(Arrays.asList(id.split(",")));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -290,6 +307,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
removeByIds(ids);
|
removeByIds(ids);
|
||||||
|
this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+7
@@ -276,6 +276,13 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
|
|||||||
return new Result<>().success("提醒办理成功!");
|
return new Result<>().success("提醒办理成功!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deleteByProjectLawsInventoryIds(List<String> projectLawsInventoryIds) {
|
||||||
|
QueryWrapper<ProjectTaskInventoryEO> deleteWrapper = new QueryWrapper<>();
|
||||||
|
deleteWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,projectLawsInventoryIds);
|
||||||
|
this.baseMapper.delete(deleteWrapper);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建任务清单列表数据
|
* 创建任务清单列表数据
|
||||||
* @param projectTaskInventoryEOList
|
* @param projectTaskInventoryEOList
|
||||||
|
|||||||
Reference in New Issue
Block a user