jiezhoufg/yc_fdjyfluru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zjh 2025-12-25 18:43:21 +08:00
commit 80325ef2ea
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java
View File

@ -446,7 +446,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
if (ObjectUtils.isNotEmpty(paramDetailPojoStream)) { if (ObjectUtils.isNotEmpty(paramDetailPojoStream)) {
TodoTaskPojo todoTaskPojo = sw.buildFromDatasource("xdap_app_223770822127386625") TodoTaskPojo todoTaskPojo = sw.buildFromDatasource("xdap_app_223770822127386625")
.eq("owner_id", currentUserId) .eq("owner_id", currentUserId)
.eq("model_id", engineParamDetailPojo.getId()) .eq("model_id", engineParamDetailPojo.getEngineModelId())
.eq("data_type", "数据维护") .eq("data_type", "数据维护")
.doQueryFirst(TodoTaskPojo.class); .doQueryFirst(TodoTaskPojo.class);
//修改待办和发起的任务状态 //修改待办和发起的任务状态
@ -565,7 +565,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
todoTaskPojos.add(todoTaskPojo); todoTaskPojos.add(todoTaskPojo);
InitiatedTaskPojo initiatedTaskPojo = new InitiatedTaskPojo(); InitiatedTaskPojo initiatedTaskPojo = new InitiatedTaskPojo();
BeanUtils.copyProperties(todoTaskPojo, initiatedTaskPojo); BeanUtils.copyProperties(todoTaskPojo, initiatedTaskPojo);
initiatedTaskPojo.setLastUpdatedBy(JSON.toJSONString(Arrays.asList(filledBy))); initiatedTaskPojo.setLastUpdatedBy(filledBy);
taskPojos.add(initiatedTaskPojo); taskPojos.add(initiatedTaskPojo);
} }
batchInsertTodoTask(todoTaskPojos); batchInsertTodoTask(todoTaskPojos);

2
src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java
View File

@ -243,7 +243,7 @@ public class TodoTaskServiceImpl implements TodoTaskService {
todoTaskPojos.add(todoTaskPojo); todoTaskPojos.add(todoTaskPojo);
InitiatedTaskPojo initiatedTaskPojo = new InitiatedTaskPojo(); InitiatedTaskPojo initiatedTaskPojo = new InitiatedTaskPojo();
BeanUtils.copyProperties(todoTaskPojo, initiatedTaskPojo); BeanUtils.copyProperties(todoTaskPojo, initiatedTaskPojo);
initiatedTaskPojo.setLastUpdatedBy(JSON.toJSONString(Arrays.asList(engineParamDetailDTO.getResPersonId()))); initiatedTaskPojo.setLastUpdatedBy(engineParamDetailDTO.getResPersonId());
taskPojos.add(initiatedTaskPojo); taskPojos.add(initiatedTaskPojo);
} }
batchInsertTodoTask(todoTaskPojos); batchInsertTodoTask(todoTaskPojos);