update
This commit is contained in:
wangzhijiang
+11
@@ -152,6 +152,10 @@ public class ProjectTaskInventoryEO implements Serializable {
|
||||
@TableField(exist = false)
|
||||
private String designTaskDefinitionKey;
|
||||
|
||||
/**设计符合性 任务明细id**/
|
||||
@TableField(exist = false)
|
||||
private String designTaskDetailId;
|
||||
|
||||
/**设计符合性 截止时间**/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@@ -170,6 +174,9 @@ public class ProjectTaskInventoryEO implements Serializable {
|
||||
/**验证符合性 待办任务节点定义key**/
|
||||
@TableField(exist = false)
|
||||
private String verifyTaskDefinitionKey;
|
||||
/**验证符合性 待办任务明细id**/
|
||||
@TableField(exist = false)
|
||||
private String verifyTaskDetailId;
|
||||
|
||||
/**验证符合性 截止时间**/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@@ -190,6 +197,10 @@ public class ProjectTaskInventoryEO implements Serializable {
|
||||
@TableField(exist = false)
|
||||
private String prehomoTaskDefinitionKey;
|
||||
|
||||
/**prehomo确认 任务明细id**/
|
||||
@TableField(exist = false)
|
||||
private String prehomoTaskDetailId;
|
||||
|
||||
/**prehomo确认 截止时间**/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
|
||||
+23
-3
@@ -328,16 +328,19 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
|
||||
String designTaskId = "";
|
||||
String designTaskStatus = "";
|
||||
String designTaskDefinitionKey = "";
|
||||
String designTaskDetailId = "";
|
||||
|
||||
String prehomoPid = "";
|
||||
String prehomoTaskId = "";
|
||||
String prehomoTaskStatus = "";
|
||||
String prehomoTaskDefinitionKey = "";
|
||||
String prehomoTaskDetailId = "";
|
||||
|
||||
String verifyPid = "";
|
||||
String verifyTaskId = "";
|
||||
String verifyTaskStatus = "";
|
||||
String verifyTaskDefinitionKey = "";
|
||||
String verifyTaskDetailId = "";
|
||||
|
||||
for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOList) {
|
||||
if(StringUtils.equals(projectTaskInventoryEO.getProjectLawsInventoryId(),projectTaskInventoryDetailEO.getProjectTaskInventoryId())){
|
||||
@@ -354,6 +357,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
|
||||
designTaskId = projectTaskInventoryDetailEO.getTaskId();
|
||||
designTaskStatus = projectTaskInventoryDetailEO.getStatus();
|
||||
designTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
|
||||
designTaskDetailId = projectTaskInventoryDetailEO.getId();
|
||||
}else {
|
||||
if(StringUtils.isEmpty(designTaskId)){
|
||||
designTaskId = projectTaskInventoryDetailEO.getTaskId();
|
||||
@@ -362,7 +366,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
|
||||
designTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
|
||||
}
|
||||
if(StringUtils.isEmpty(designTaskDefinitionKey)){
|
||||
designTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
|
||||
designTaskDefinitionKey = "";
|
||||
}
|
||||
if(StringUtils.isEmpty(designTaskDetailId)){
|
||||
designTaskDetailId = projectTaskInventoryDetailEO.getId();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -370,12 +377,14 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
|
||||
projectTaskInventoryEO.setDesignTaskId(designTaskId);
|
||||
projectTaskInventoryEO.setDesignTaskStatus(designTaskStatus);
|
||||
projectTaskInventoryEO.setDesignTaskDefinitionKey(designTaskDefinitionKey);
|
||||
projectTaskInventoryEO.setDesignTaskDetailId(designTaskDetailId);
|
||||
}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue())){
|
||||
prehomoPid = actiProcInstId;
|
||||
if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
|
||||
prehomoTaskId = projectTaskInventoryDetailEO.getTaskId();
|
||||
prehomoTaskStatus = projectTaskInventoryDetailEO.getStatus();
|
||||
prehomoTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
|
||||
prehomoTaskDetailId = projectTaskInventoryDetailEO.getId();
|
||||
}else {
|
||||
if(StringUtils.isEmpty(prehomoTaskId)){
|
||||
prehomoTaskId = projectTaskInventoryDetailEO.getTaskId();
|
||||
@@ -384,7 +393,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
|
||||
prehomoTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
|
||||
}
|
||||
if(StringUtils.isEmpty(prehomoTaskDefinitionKey)){
|
||||
prehomoTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
|
||||
prehomoTaskDefinitionKey = "";
|
||||
}
|
||||
if(StringUtils.isEmpty(prehomoTaskDetailId)){
|
||||
prehomoTaskDetailId = projectTaskInventoryDetailEO.getId();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -392,6 +404,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
|
||||
projectTaskInventoryEO.setPrehomoTaskId(prehomoTaskId);
|
||||
projectTaskInventoryEO.setPrehomoTaskStatus(prehomoTaskStatus);
|
||||
projectTaskInventoryEO.setPrehomoTaskDefinitionKey(prehomoTaskDefinitionKey);
|
||||
projectTaskInventoryEO.setPrehomoTaskDetailId(prehomoTaskDetailId);
|
||||
}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue())){
|
||||
verifyPid = actiProcInstId;
|
||||
if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
|
||||
@@ -406,7 +419,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
|
||||
verifyTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue();
|
||||
}
|
||||
if(StringUtils.isEmpty(verifyTaskDefinitionKey)){
|
||||
verifyTaskDefinitionKey = projectTaskInventoryDetailEO.getTaskDefinitionKey();
|
||||
verifyTaskDefinitionKey = "";
|
||||
}
|
||||
if(StringUtils.isEmpty(verifyTaskDetailId)){
|
||||
verifyTaskDetailId = projectTaskInventoryDetailEO.getId();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -414,6 +430,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
|
||||
projectTaskInventoryEO.setVerifyTaskId(verifyTaskId);
|
||||
projectTaskInventoryEO.setVerifyTaskStatus(verifyTaskStatus);
|
||||
projectTaskInventoryEO.setVerifyTaskDefinitionKey(verifyTaskDefinitionKey);
|
||||
projectTaskInventoryEO.setVerifyTaskDetailId(verifyTaskDetailId);
|
||||
}
|
||||
}else {
|
||||
if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
|
||||
@@ -423,16 +440,19 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
|
||||
projectTaskInventoryEO.setDesignTaskId(projectTaskInventoryDetailEO.getTaskId());
|
||||
projectTaskInventoryEO.setDesignTaskStatus(projectTaskInventoryDetailEO.getStatus());
|
||||
projectTaskInventoryEO.setDesignTaskDefinitionKey(projectTaskInventoryDetailEO.getTaskDefinitionKey());
|
||||
projectTaskInventoryEO.setDesignTaskDetailId(projectTaskInventoryDetailEO.getId());
|
||||
}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue())){
|
||||
projectTaskInventoryEO.setPrehomoPId(actiProcInstId);
|
||||
projectTaskInventoryEO.setPrehomoTaskId(projectTaskInventoryDetailEO.getTaskId());
|
||||
projectTaskInventoryEO.setPrehomoTaskStatus(projectTaskInventoryDetailEO.getStatus());
|
||||
projectTaskInventoryEO.setPrehomoTaskDefinitionKey(projectTaskInventoryDetailEO.getTaskDefinitionKey());
|
||||
projectTaskInventoryEO.setPrehomoTaskDetailId(projectTaskInventoryDetailEO.getId());
|
||||
}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue())){
|
||||
projectTaskInventoryEO.setVerifyPId(actiProcInstId);
|
||||
projectTaskInventoryEO.setVerifyTaskId(projectTaskInventoryDetailEO.getTaskId());
|
||||
projectTaskInventoryEO.setVerifyTaskStatus(projectTaskInventoryDetailEO.getStatus());
|
||||
projectTaskInventoryEO.setVerifyTaskDefinitionKey(projectTaskInventoryDetailEO.getTaskDefinitionKey());
|
||||
projectTaskInventoryEO.setVerifyTaskDetailId(projectTaskInventoryDetailEO.getId());
|
||||
}
|
||||
projectTaskInventoryEO.setShowFlag(TaskStatusEnum.SHOW_FLAG.getValue());
|
||||
}
|
||||
|
||||
+2
-2
@@ -48,8 +48,8 @@ public class SendMessageUtils {
|
||||
|
||||
private static WebSocket webSocket;
|
||||
@Autowired
|
||||
public void setWebSocket(IFeishuService iFeishuService){
|
||||
SendMessageUtils.iFeishuService = iFeishuService;
|
||||
public void setWebSocket(WebSocket webSocket){
|
||||
SendMessageUtils.webSocket = webSocket;
|
||||
}
|
||||
|
||||
public static void sendMessage(String msgContent, List<String> userIdList, String projectLibraryId) {
|
||||
|
||||
Reference in New Issue
Block a user