1、利元亨现场问题修改3
2、补充删除报工接口
This commit is contained in:
@@ -42,4 +42,11 @@ public class SimulationWorkController {
|
||||
return simulationWorkService.queryWork(req);
|
||||
}
|
||||
|
||||
@SysLog("删除报工")
|
||||
@PostMapping("/deleteWork")
|
||||
@Operation(summary = "删除报工", description = "删除报工")
|
||||
public SdmResponse deleteWork(@RequestBody SpdmWorkReq req) {
|
||||
return simulationWorkService.deleteWork(req);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -39,4 +39,6 @@ public class SpdmWorkReq {
|
||||
|
||||
private String taskId;
|
||||
|
||||
private List<String> delIdList;
|
||||
|
||||
}
|
||||
|
||||
@@ -23,4 +23,6 @@ public interface ISimulationWorkService extends IService<SimulationWork> {
|
||||
|
||||
SdmResponse queryWork(SpdmWorkListReq req);
|
||||
|
||||
SdmResponse deleteWork(SpdmWorkReq req);
|
||||
|
||||
}
|
||||
|
||||
@@ -34,6 +34,7 @@ import com.sdm.outbridge.thirdDao.LyricVProjectStationExcepTionToDMMapper;
|
||||
import com.sdm.project.common.ApprovalStatusEnum;
|
||||
import com.sdm.project.common.DemandTypeEnum;
|
||||
import com.sdm.project.common.MemberTypeEnum;
|
||||
import com.sdm.project.common.NodeMemberTypeEnum;
|
||||
import com.sdm.project.common.generator.UniqueFileNameGenerator;
|
||||
import com.sdm.project.dao.SimulationDemandMapper;
|
||||
import com.sdm.project.dao.SimulationNodeMapper;
|
||||
@@ -2354,6 +2355,7 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
||||
if (!syncTodoInfoProjectLock.tryLock()) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
String curDateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
|
||||
ThreadLocalContext.setTenantId(tenantId);
|
||||
ThreadLocalContext.setUserId(userId);
|
||||
ThreadLocalContext.setJobNumber(jobNumber);
|
||||
@@ -2374,12 +2376,25 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
||||
log.info("lyricVProjectToDMList为空");
|
||||
return new ArrayList<>();
|
||||
}
|
||||
List<SpdmNodeRelateMemberReq> allNodeManagerList = new ArrayList<>();
|
||||
for (LyricVProjectToDM lyricVProjectToDM : lyricVProjectToDMList) {
|
||||
SpdmProjectNodeEditReq spdmProjectNodeEditReq = buildProjectForTodoInfo(lyricVProjectToDM, tenantId, userId);
|
||||
if (spdmProjectNodeEditReq != null) {
|
||||
spdmProjectNodeEditReqList.add(spdmProjectNodeEditReq);
|
||||
for (Long epFixManagerUserId : epFixManagerUserIdList) {
|
||||
SpdmNodeRelateMemberReq simulationNodeMember = new SpdmNodeRelateMemberReq();
|
||||
simulationNodeMember.setNodeId(spdmProjectNodeEditReq.getUuid());
|
||||
simulationNodeMember.setUserId(epFixManagerUserId);
|
||||
simulationNodeMember.setCreator(userId);
|
||||
simulationNodeMember.setCreateTime(curDateStr);
|
||||
simulationNodeMember.setType(NodeMemberTypeEnum.MANAGER.getCode());
|
||||
allNodeManagerList.add(simulationNodeMember);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (CollectionUtils.isNotEmpty(allNodeManagerList)) {
|
||||
nodeMapper.addNodeMemberBatch(allNodeManagerList);
|
||||
}
|
||||
}catch (Exception e) {
|
||||
log.error("handleNoRelatedProjectTodo 未知 error: {}", e.getMessage());
|
||||
return new ArrayList<>();
|
||||
|
||||
@@ -352,4 +352,14 @@ public class SimulationWorkServiceImpl extends ServiceImpl<SimulationWorkMapper,
|
||||
return PageUtils.getJsonObjectSdmResponse(workList, page);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SdmResponse deleteWork(SpdmWorkReq req) {
|
||||
List<String> delIdList = req.getDelIdList();
|
||||
if (CollectionUtils.isEmpty(delIdList)) {
|
||||
return SdmResponse.failed("待删除的id不能为空");
|
||||
}
|
||||
this.removeBatchByIds(delIdList);
|
||||
return SdmResponse.success();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user