Procházet zdrojové kódy

修改计划提示

yusm před 2 týdny
rodič
revize
6ce65486fe

+ 2 - 1
fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/controller/TaskController.java

@@ -240,6 +240,7 @@ public class TaskController {
             task.setCreaterName(user.getName());
             task.setCreatorColor(user.getColor());
             task.setCompanyId(user.getCompanyId());
+            task.setTaskDesc("");
             //无需审核,直接通过
             if (!taskType.getNeedAudit()){
                 task.setTaskStatus(STATUS_DOING);
@@ -698,7 +699,7 @@ public class TaskController {
                 }
                 if (stringJoiner.length()>0){
                     log.info("stringJoiner==>"+stringJoiner.toString());
-                    String msg1="计划:"+task.getName()+",审核人有以下改动:";
+                    String msg1="计划:"+task.getName()+(initTaskStatus==3?",一级审核人有以下改动:":",二级审核人有以下改动:");
                     Information information = new Information();
                     information.setType(11);
                     information.setMsg(msg1+stringJoiner.toString());

+ 2 - 2
fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/service/impl/TaskServiceImpl.java

@@ -1777,7 +1777,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
 
                 String infoMsg = project.getProjectName() + "项目的FTE计划审批任务" +
                         (executorNames.isEmpty() ? "" : ",执行人有:" + executorNames) +
-                        ",工作计划被驳回";
+                        ",工作计划被一级审核人驳回";
                 information.setMsg(infoMsg);
                 information.setType(11);
                 information.setJumpType(2);
@@ -1807,7 +1807,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
 
                 String infoMsg = project.getProjectName() + "项目的FTE计划审批任务" +
                         (executorNames.isEmpty() ? "" : ",执行人有:" + executorNames) +
-                        ",工作计划被驳回";
+                        ",工作计划被二级审核人驳回";
                 information.setMsg(infoMsg);
                 information.setType(11);
                 information.setJumpType(2);