Merge branch 'sprint/S3' into release/S3

demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/chatFile/infra/entity/ChatFileEntity.java

@@ -64,7 +64,7 @@ public class ChatFileEntity extends BaseMgrEntity<ChatFileEntity> {
     private String completeExplain;
 
     @SerializedName(value = "is_join")
-    private Integer isJoin;
+    private Boolean isJoin;
 
     @SerializedName(value = "tab_status")
     private Integer tabStatus;

demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/chatFile/service/chatFile/ChatFileUpdateEAIService.java

@@ -10,10 +10,7 @@ import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @auther: zhenggl
@@ -37,8 +34,10 @@ public class ChatFileUpdateEAIService extends AbsEAIService {
         EAIRequest eaiRequest = EAIRequest.build(messageBody);
         ChatFileEntity chatFileInfo = eaiRequest.getObject("chat_file_info", new TypeReference<ChatFileEntity>(){});
 
+        if (Objects.isNull(chatFileInfo.getCompleteDate())){
+            chatFileInfo.setCompleteDate(new Date());
+        }
 
-        chatFileInfo.setCompleteDate(new Date());
 
 
         chatFileRepository.updateBatch(chatFileInfo);

doc/sql/app-20230703-ddl.sql

@@ -27,3 +27,5 @@ CREATE TABLE `cim_chat_file` (
 
 alter table cim_chat_file Add column question_no varchar(32) null default '' COMMENT '问题单号';
 alter table cim_chat_file Add column user_id varchar(32) null default '' COMMENT '用户id';
+
+ALTER TABLE `cim_chat_file` MODIFY COLUMN `is_join` tinyint(255);