问题修改

takai-admin/src/main/java/com/takai/web/controller/takaiai/TakaiAiController.java

@@ -852,6 +852,18 @@ public class TakaiAiController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 审核历史列表
+     * @param params
+     * @return
+     */
+    @PostMapping("/app/auditHistory/list")
+    public TableDataInfo documentAuditHistoryList(@RequestBody TakaiApplicationParams params) {
+        startPage();
+        List<TakaiApplication> list = takaiAisService.applicationHistoryListByApprover(params);
+        return getDataTable(list);
+    }
+
     /**
      * 开始审核
      * @return

takai-ai/src/main/java/com/takai/ai/mapper/TakaiApplicationMapper.java

@@ -58,6 +58,8 @@ public interface TakaiApplicationMapper
 
     public List<TakaiApplication> selectAppListByApprover(TakaiApplication mData);
 
+    public List<TakaiApplication> selectAppListHistoryByApprover(TakaiApplication mData);
+
     List<TakaiApplicationResult> selectAppByUserId(String userId);
 
     public List<TakaiApplicationResult> selectApplicationListByProjectType(String appId);

takai-ai/src/main/java/com/takai/ai/service/ITakaiAiService.java

@@ -108,6 +108,8 @@ public interface ITakaiAiService
 
     List<TakaiApplication> applicationListByApprover(TakaiApplicationParams documentParams);
 
+    List<TakaiApplication> applicationHistoryListByApprover(TakaiApplicationParams documentParams);
+
     public int startAudit(String appId, String userId);
 
     int updateAuditApplication(TakaiApplicationParams appParams, String appId);

takai-ai/src/main/java/com/takai/ai/service/impl/TakaiAiServiceImpl.java

@@ -1029,7 +1029,7 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
                     || AppTypeEnum.PROJECT.getCode().equals(String.valueOf(params.getTypeId()))){ // 1 私有 0 公开
                 info.setStatus("3"); // 有直接创建权限无需审核
             }else{
-                info.setStatus("5"); // 未开始审核状态
+                info.setStatus("2"); // 未开始审核状态
                 info.setApprover(String.valueOf(vo.getApprover()));
                 info.setNodeOrder(String.valueOf(vo.getNodeOrder()));
             }
@@ -1659,6 +1659,13 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
         return takaiApplicationMapper.selectAppListByApprover(vo);
     }
 
+    @Override
+    public List<TakaiApplication> applicationHistoryListByApprover(TakaiApplicationParams takaiApplicationParams) {
+        TakaiApplication vo = TakaiApplication.builder().approver(takaiApplicationParams.getApprover())
+                .build();
+        return takaiApplicationMapper.selectAppListHistoryByApprover(vo);
+    }
+
     @Override
     public int startAudit(String appId, String userId) {
         List<DocumentAuditConfig> list = documentAuditConfigMapper.selectDocumentAuditConfigListByBo(null);

takai-ai/src/main/resources/mapper/takaiai/TakaiApplicationMapper.xml

@@ -437,7 +437,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from bm_application bm
 		left join sys_user su on FIND_IN_SET(su.user_id,bm.approver) > 0
 		<where>
-			(bm.status = '4'  OR bm.status = '1' OR bm.status = '2')
+			(bm.status = '1' OR bm.status = '2')
 			<if test="appId != null and appId != ''">
 				AND bm.appId = #{appId}
 			</if>
@@ -450,6 +450,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by bm.create_time desc
 	</select>
 
+	<select id="selectAppListHistoryByApprover" parameterType="BmApplication" resultMap="BmApplicationListResult">
+		select bm.appId, bm.name, bm.description, bm.prompt, bm.type_id,
+		bm.status, bm.approver, dai.comment, dai.create_time, bm.is_deep_think, bm.visible ,GROUP_CONCAT(su.user_name ) as user_name
+		from bm_application bm
+		left join sys_user su on FIND_IN_SET(su.user_id,bm.approver) > 0
+		left join document_audit_info dai on bm.appId = dai.app_id
+		<where>
+			(bm.status = '4'  OR bm.status = '3' )
+			<if test="appId != null and appId != ''">
+				AND bm.appId = #{appId}
+			</if>
+			<if test="approver != null and approver != ''">
+				AND FIND_IN_SET(#{approver},bm.approver) > 0
+			</if>
+		</where>
+		group by bm.appId, bm.name, bm.description, bm.prompt, bm.type_id,
+		bm.status, bm.approver, dai.comment, dai.create_time, bm.is_deep_think, bm.visible
+		order by dai.create_time desc
+	</select>
+
 	<select id="selectAppByUserId"  resultMap="BmApplicationListResult">
 		SELECT DISTINCT
 			bm.appId,

takai-system/src/main/java/com/takai/system/service/impl/JkApiServiceImpl.java

@@ -265,16 +265,17 @@ public class JkApiServiceImpl implements IJkApiService {
                 for (Member member : project.getMemberList()) {
                     SysProjectStaff sysProjectStaff = new SysProjectStaff();
                     SysUser sysUser = sysUserService.selectUserByUserName(member.getAccountNo());
-                    sysProjectStaff.setProjectPid(project.getProCode());
-                    sysProjectStaff.setProjectName(project.getProName());
-                    sysProjectStaff.setUserId(null != sysUser ? sysUser.getUserId() : null);
-                    sysProjectStaff.setRoleId(null != sysUser ? sysUser.getRoleId() : null);
-                    SysProjectStaff dbStaff = projectStaffService.selectSysProjectStaff(sysProjectStaff);
-                    if(null == dbStaff) {
-                        projectStaffService.insertSysProjectStaff(sysProjectStaff);
-                        projectStaffNum++;
+                    if(sysUser != null) {
+                        sysProjectStaff.setProjectPid(project.getProCode());
+                        sysProjectStaff.setProjectName(project.getProName());
+                        sysProjectStaff.setUserId(null != sysUser ? sysUser.getUserId() : null);
+                        sysProjectStaff.setRoleId(null != sysUser ? sysUser.getRoleId() : null);
+                        SysProjectStaff dbStaff = projectStaffService.selectSysProjectStaff(sysProjectStaff);
+                        if(null == dbStaff) {
+                            projectStaffService.insertSysProjectStaff(sysProjectStaff);
+                            projectStaffNum++;
+                        }
                     }
-
                 }
             }
             if(sourceFrom.equals(HJL)){
@@ -337,7 +338,8 @@ public class JkApiServiceImpl implements IJkApiService {
         logger.info("获取建科"+objectName+"请求url：" + url);
         Request request = buildPostRequest(url);
         try {
-            Response response = client.newCall(request).execute();
+            OkHttpClient okHttpClient = buildOkHttpClient();
+            Response response = okHttpClient.newCall(request).execute();
             String responseBody = response.body().string();
             logger.info("获取建科项目"+objectName+"返回：" + responseBody);
 
@@ -557,9 +559,9 @@ public class JkApiServiceImpl implements IJkApiService {
 
     private OkHttpClient buildOkHttpClient() {
         return new OkHttpClient.Builder()
-                .connectTimeout(10, TimeUnit.SECONDS)
+                .connectTimeout(60, TimeUnit.SECONDS)
                 .writeTimeout(50, TimeUnit.SECONDS)
-                .readTimeout(10, TimeUnit.MINUTES)
+                .readTimeout(60, TimeUnit.MINUTES)
                 .build();
     }