fit:集体审议-补充资料

assistMg/src/main/java/com/hotent/project/manager/CostNoticeManager.java

@@ -29,7 +29,7 @@ public interface CostNoticeManager extends BaseManager<CostNotice> {
 
 	IPage<CostNotice> pageList(CostProjectNoticePageReq req);
 
-	void sendNotice(String projectId, String number, String title, String content, String enterpriseId, String noticeSource, String sendTarget);
+	void sendNotice(String projectId,String taskId, String number, String title, String content, String enterpriseId, String noticeSource, String sendTarget);
 
 
 	/**

assistMg/src/main/java/com/hotent/project/manager/impl/CostNoticeManagerImpl.java

@@ -56,8 +56,8 @@ public class CostNoticeManagerImpl extends BaseManagerImpl<CostNoticeDao, CostNo
 		if(ObjectUtil.isNotEmpty(req.getProjectId())){
 			qw.eq(CostNotice::getProjectId, req.getProjectId());
 		}
-		if(ObjectUtil.isNotEmpty(req.getProjectId())){
-			qw.eq(CostNotice::getProjectId, req.getProjectId());
+		if(ObjectUtil.isNotEmpty(req.getTaskId())){
+			qw.eq(CostNotice::getTaskId, req.getTaskId());
 		}
 		if(ObjectUtil.isNotEmpty(req.getEnterpriseId())){
 			qw.eq(CostNotice::getEnterpriseId, req.getEnterpriseId());
@@ -69,11 +69,12 @@ public class CostNoticeManagerImpl extends BaseManagerImpl<CostNoticeDao, CostNo
 	}
 
 	@Override
-	public void sendNotice(String projectId, String number, String title, String content, String enterpriseId, String noticeSource, String sendTarget) {
+	public void sendNotice(String projectId,String taskId, String number, String title, String content, String enterpriseId, String noticeSource, String sendTarget) {
 		CostNotice costNotice = new CostNotice();
 		costNotice.setNoticeTitle(title);
 		costNotice.setNoticeType(number);
 		costNotice.setProjectId(projectId);
+		costNotice.setTaskId(taskId);
 		costNotice.setStatus(BaseConstant.NORMAL_STATUS);
 		costNotice.setNoticeContent(content);
 		costNotice.setEnterpriseId(enterpriseId);

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectApprovalManagerImpl.java

@@ -359,11 +359,11 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
         if (ObjectUtil.isNotEmpty(req.getSendType())) {
             if (req.getSendType().contains(",")) {
                 //站内通知
-                this.costNoticeManager.sendNotice(req.getProjectId(), "1", costProjectApproval.getProjectName(), req.getContent(), costProjectApproval.getAuditedUnitId().split(",")[0],"","");
+                this.costNoticeManager.sendNotice(req.getProjectId(),null, "1", costProjectApproval.getProjectName(), req.getContent(), costProjectApproval.getAuditedUnitId().split(",")[0],"","");
                 //短信发送
             } else if (req.getSendType().equals("1")) {
                 //站内通知
-                this.costNoticeManager.sendNotice(req.getProjectId(), "1", costProjectApproval.getProjectName(), req.getContent(),costProjectApproval.getAuditedUnitId().split(",")[0],"","");
+                this.costNoticeManager.sendNotice(req.getProjectId(),null, "1", costProjectApproval.getProjectName(), req.getContent(),costProjectApproval.getAuditedUnitId().split(",")[0],"","");
             } else if (req.getSendType().equals("2")) {
                 //短信发送
             } else {
@@ -626,15 +626,15 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
 //                            .eq(CostProjectTaskProccess::getTaskId, userTask.getId())
 //            );
 
-
-            // 设置子任务对象
-            record.setUserTask(userTask);
-            // 设置主状态为子任务状态
-            record.setStatus(userTask.getStatus());
-            record.setStatusName(TaskStatusConstant.getStatusNameByCode(userTask.getStatus()));
-            record.setCurrentNode(userTask.getCurrentNode());
-            record.setCurrentNodeName(NodeConstant.getNodeValueByKey(userTask.getCurrentNode())+ "-"+ TaskStatusConstant.getStatusNameByCode(userTask.getStatus()));
-
+            if(userTask!=null) {
+                // 设置子任务对象
+                record.setUserTask(userTask);
+                // 设置主状态为子任务状态
+                record.setStatus(userTask.getStatus());
+                record.setStatusName(TaskStatusConstant.getStatusNameByCode(userTask.getStatus()));
+                record.setCurrentNode(userTask.getCurrentNode());
+                record.setCurrentNodeName(NodeConstant.getNodeValueByKey(userTask.getCurrentNode()) + "-" + TaskStatusConstant.getStatusNameByCode(userTask.getStatus()));
+            }
         }
         return result;
     }

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectTaskManagerImpl.java

@@ -384,7 +384,7 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
         String enterpriseId = task.getAuditedUnitId() == null ? "" : task.getAuditedUnitId();
         String noticeSource = "系统";
         String sendTarget = task.getCreateBy() == null ? "" : task.getCreateBy();
-        costNoticeManager.sendNotice(task.getProjectId(), "1", title, content, enterpriseId, noticeSource, sendTarget);
+        costNoticeManager.sendNotice(task.getProjectId(),task.getId(), "1", title, content, enterpriseId, noticeSource, sendTarget);
 
         return title;
     }
@@ -402,7 +402,7 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
                 String enterpriseId = task.getAuditedUnitId() == null ? "" : task.getAuditedUnitId();
                 String noticeSource = "系统";
                 String sendTarget = task.getCreateBy() == null ? "" : task.getCreateBy();
-                costNoticeManager.sendNotice(task.getProjectId(), "1", title, req.getContent(), enterpriseId, noticeSource, sendTarget);
+                costNoticeManager.sendNotice(task.getProjectId(),task.getId(),  "1", title, req.getContent(), enterpriseId, noticeSource, sendTarget);
 
                 // 更新任务的当前节点和状态
                 task.setStatus(TaskStatusConstant.NOT_PASSED.getStatusCode());
@@ -428,7 +428,7 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
         String enterpriseId = task.getAuditedUnitId() == null ? "" : task.getAuditedUnitId();
         String noticeSource = "系统";
         String sendTarget = task.getCreateBy() == null ? "" : task.getCreateBy();
-        costNoticeManager.sendNotice(task.getProjectId(), "1", title, req.getContent(), enterpriseId, noticeSource, sendTarget);
+        costNoticeManager.sendNotice(task.getProjectId(),task.getId(),  "1", title, req.getContent(), enterpriseId, noticeSource, sendTarget);
 
         return title;
     }
@@ -463,7 +463,7 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
                         // 通知内容组装（针对子任务对应的单位）
                         String childEnterpriseId = childTask.getAuditedUnitId() == null ? "" : childTask.getAuditedUnitId();
                         String childSendTarget = childTask.getCreateBy() == null ? "" : childTask.getCreateBy();
-                        costNoticeManager.sendNotice(task.getProjectId(), "1", title, req.getContent(), childEnterpriseId, noticeSource, childSendTarget);
+                        costNoticeManager.sendNotice(task.getProjectId(),task.getId(),  "1", title, req.getContent(), childEnterpriseId, noticeSource, childSendTarget);
                         // 收集单位名称
                         if (StringUtil.isNotEmpty(childTask.getAuditedUnitName())) {
                             unitNames.add(childTask.getAuditedUnitName());
@@ -478,7 +478,7 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
                 costProjectTaskManager.updateById(task);
                 String enterpriseId = task.getAuditedUnitId() == null ? "" : task.getAuditedUnitId();
                 String sendTarget = task.getCreateBy() == null ? "" : task.getCreateBy();
-                costNoticeManager.sendNotice(task.getProjectId(), "1", title, req.getContent(), enterpriseId, noticeSource, sendTarget);
+                costNoticeManager.sendNotice(task.getProjectId(),task.getId(),  "1", title, req.getContent(), enterpriseId, noticeSource, sendTarget);
                 return title;
         }
     }
@@ -537,7 +537,7 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
         String enterpriseId = task.getAuditedUnitId() == null ? "" : task.getAuditedUnitId();
         String noticeSource = "系统";
         String sendTarget = task.getCreateBy() == null ? "" : task.getCreateBy();
-        costNoticeManager.sendNotice(task.getProjectId(), "1", title, req.getContent(), enterpriseId, noticeSource, sendTarget);
+        costNoticeManager.sendNotice(task.getProjectId(),task.getId(),  "1", title, req.getContent(), enterpriseId, noticeSource, sendTarget);
 
         return title;
     }
@@ -567,6 +567,7 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
         String nextNodeKey = NodeConstant.getNextNode(nTask.getCurrentNode()).getNodeKey();
         nTask.setStatus(TaskStatusConstant.AUDITING.getStatusCode());
         nTask.setCurrentNode(nextNodeKey);
+        nTask.setIsGd("0");
         costProjectTaskManager.updateById(nTask);
         for (CostProjectTask child : children) {
             child.setCurrentNode(nextNodeKey);
@@ -577,7 +578,7 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
         String enterpriseId = task.getAuditedUnitId() == null ? "" : task.getAuditedUnitId();
         String noticeSource = "系统";
         String sendTarget = task.getCreateBy() == null ? "" : task.getCreateBy();
-        costNoticeManager.sendNotice(task.getProjectId(), "1", title, req.getContent(), enterpriseId, noticeSource, sendTarget);
+        costNoticeManager.sendNotice(task.getProjectId(), task.getId(), "1", title, req.getContent(), enterpriseId, noticeSource, sendTarget);
 
         return title;
     }

assistMg/src/main/java/com/hotent/project/model/CostNotice.java

@@ -97,6 +97,16 @@ public class CostNotice extends BaseModel<CostNotice> {
     @JsonProperty("sendTarget")
     private String sendTarget;
 
+    private String taskId;
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
     // Getter & Setter
     public String getNoticeSource() { return noticeSource; }
     public void setNoticeSource(String noticeSource) { this.noticeSource = noticeSource; }

assistMg/src/main/java/com/hotent/project/req/CostProjectNoticePageReq.java

@@ -30,6 +30,8 @@ public class CostProjectNoticePageReq extends PageReq {
 
     private String  enterpriseId;
 
+    private String taskId;
+