Merge branch 'master' of http://git.12345lm.cn/Fengwo/hotline

src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -456,7 +456,8 @@ namespace Hotline.Api.Controllers
 			{
 				new KeyValuePair<int, string>(1, "审核中"),
 				new KeyValuePair<int, string>(3, "已上架"),
-				new KeyValuePair<int, string>(4, "已下架")
+				new KeyValuePair<int, string>(4, "已下架"),
+				new KeyValuePair<int, string>(5, "审核不通过")
 			};
 		}
 
@@ -1067,6 +1068,7 @@ namespace Hotline.Api.Controllers
 				.WhereIF(!string.IsNullOrEmpty(dto.Keyword),x=>x.Knowledge.Title.Contains(dto.Keyword!)||( x.Knowledge.Summary != null &&  x.Knowledge.Summary.Contains(dto.Keyword!)))
 				.Where(x=>x.CreatorId == _sessionContext.UserId)
 				.Where(x => !string.IsNullOrEmpty(x.Knowledge.Id))
+				.Where(x=> x.Collect!.Value)
 				.OrderByDescending(x => x.CreationTime)
 				.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 			return new PagedDto<KnowledgeCollectDto>(total,_mapper.Map<IReadOnlyList<KnowledgeCollectDto>>(items));

src/Hotline.Api/Controllers/UserController.cs

@@ -115,10 +115,6 @@ public class UserController : BaseController
 
     #endregion
 
-
-
-
-
     /// <summary>
     /// 上班
     /// </summary>
@@ -395,8 +391,8 @@ public class UserController : BaseController
     /// </summary>
     /// <param name="ids"></param>
     /// <returns></returns>
-    [HttpGet]
-    public async Task<IReadOnlyList<UserDto>> Query([FromQuery] IReadOnlyList<string> ids)
+    [HttpPost("range")]
+    public async Task<IReadOnlyList<UserDto>> Query([FromBody] IReadOnlyList<string> ids)
     {
         var users = await _userRepository.Queryable()
             .Includes(d => d.Account, x => x.Roles)

src/Hotline.Api/config/appsettings.json

@@ -119,9 +119,9 @@
   },
   //企业服务
   "Enterprise": {
-    "AddressUrl": "http://10.12.185.227:8834/",
-    "ClientId": "1462598736",
-    "ClientSecret": "6nZtVK4rKfnsncGymUHB",
+    "AddressUrl": "http://172.15.28.11:8835",
+    "ClientId": "1476116956",
+    "ClientSecret": "6NVnvmsFSC8d3qwgBZmN",
     "TenantId": "000000"
   }
 }

src/Hotline.Share/Hotline.Share.csproj

@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591;8618;</NoWarn>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.61</Version>
+    <Version>1.0.62</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/Hotline.YbEnterprise.Sdk/EnterpriseService.cs

@@ -46,7 +46,7 @@ namespace Hotline.YbEnterprise.Sdk
 			var path = _config.AddressUrl + "platform/12345/selectEnterpriseList";
 			var rest = new RestRequest(path, Method.Post);
 			rest.AddHeader("content-type", "application/json");
-			rest.AddHeader("Blade-Auth", "application/json");
+			rest.AddHeader("Blade-Auth", token.TokenType + " " + token.AccessToken);
 			var res = await ExecuteAsync<EnterpriseListRequest, EnterpriseListResponse>(path, Method.Post, request, rest, cancellationToken);
 			return res == null? null: res.data;
 		}
@@ -97,7 +97,7 @@ namespace Hotline.YbEnterprise.Sdk
 			}
 			catch (Exception e)
 			{
-				throw new HttpRequestException($"智能质检平台错误，Error: {e.Message}");
+				throw new HttpRequestException($"企业服务数据错误，Error: {e.Message}");
 			}
 		}
 

src/Hotline/FlowEngine/Workflows/StepBasicEntity.cs

@@ -276,7 +276,7 @@ public abstract class StepBasicEntity : CreationEntity
         string userId, string? userName,
         string orgId, string? orgName,
         string? orgAreaCode, string? orgAreaName,
-        bool orgIsCenter, string? opinion)
+        bool orgIsCenter, string opinion)
     {
         if (!HasAccepted())
             Accept(userId, userName, orgId, orgName, orgAreaCode, orgAreaName);

src/Hotline/FlowEngine/Workflows/Workflow.cs

@@ -494,9 +494,9 @@ public partial class Workflow
     /// </summary>
     public void UpdateActualOption()
     {
-        if (FlowType is EFlowType.Review) return;
+        //if (FlowType is EFlowType.Review) return;
 
-        WorkflowStep step;
+        WorkflowStep? step;
         if (Steps.Count == 2
            && Steps.Exists(d => d.StepType == EStepType.Start)
            && Steps.Exists(d => d.StepType == EStepType.End))

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -149,7 +149,7 @@ namespace Hotline.FlowEngine.Workflows
             //    startStep, firstSteps.First());
 
             //指派实际办理节点
-            if (workflow.FlowType is EFlowType.Handle &&
+            if (/*workflow.FlowType is EFlowType.Handle &&*/
                 !workflow.IsInCountersign &&
                 firstStepDefine.StepType != EStepType.Summary &&
                 firstStepDefine.StepType != EStepType.End)
@@ -857,6 +857,13 @@ namespace Hotline.FlowEngine.Workflows
                 _sessionContext.RequiredUserId);
             await HandleStepAsync(currentStep, workflow, dto, null,
                 null, null, cancellationToken);
+            await _workflowStepRepository.UpdateAsync(currentStep, cancellationToken);
+
+            workflow.UpdateActualStepWhenHandle(currentStep,
+                    _sessionContext.RequiredUserId, _sessionContext.UserName,
+                    _sessionContext.RequiredOrgId, _sessionContext.OrgName,
+                    _sessionContext.OrgAreaCode, _sessionContext.OrgAreaName,
+                    _sessionContext.OrgLevel);
 
             var endStepDefine = workflow.WorkflowDefinition.FindEndStepDefine();
             var endTrace = await EndAsync(workflow, dto, endStepDefine, currentStep, EReviewResult.Failed,
@@ -1308,7 +1315,8 @@ namespace Hotline.FlowEngine.Workflows
         /// 办理节点
         /// </summary>
         public async Task HandleStepAsync(WorkflowStep step, Workflow workflow, BasicWorkflowDto dto,
-            EFlowAssignType? flowAssignType, ECounterSignType? counterSignType, DateTime? expiredTime, CancellationToken cancellationToken)
+            EFlowAssignType? flowAssignType, ECounterSignType? counterSignType, DateTime? expiredTime,
+            CancellationToken cancellationToken)
         {
             if (step.Status is EWorkflowStepStatus.Handled)
                 throw UserFriendlyException.SameMessage("当前节点状态已办理");
@@ -1333,7 +1341,7 @@ namespace Hotline.FlowEngine.Workflows
             _mapper.Map(dto, step);
 
             //step办理状态
-            HandleStep(step, dto.NextStepCode);
+            HandleStep(step, dto.Opinion, dto.NextStepCode);
         }
 
         private bool CheckIsActualHandle(Workflow workflow, WorkflowStep step, StepDefine nextStepDefine,
@@ -1356,12 +1364,12 @@ namespace Hotline.FlowEngine.Workflows
         /// <summary>
         /// 办理节点(赋值节点的办理对象信息)
         /// </summary>
-        private void HandleStep(WorkflowStep step, string nextStepCode)
+        private void HandleStep(WorkflowStep step, string opinion, string nextStepCode)
         {
             step.Handle(_sessionContext.RequiredUserId, _sessionContext.UserName,
                 _sessionContext.RequiredOrgId, _sessionContext.OrgName,
                 _sessionContext.OrgAreaCode, _sessionContext.OrgAreaName,
-                _sessionContext.OrgIsCenter, nextStepCode);
+                _sessionContext.OrgIsCenter, opinion, nextStepCode);
         }
 
 
@@ -1518,7 +1526,7 @@ namespace Hotline.FlowEngine.Workflows
             await _workflowTraceRepository.UpdateRangeAsync(uncompleteTraces, cancellationToken);
         }
 
-        private void HandleTrace(WorkflowTrace trace, string? opinion)
+        private void HandleTrace(WorkflowTrace trace, string opinion)
         {
             trace.Handle(
                 _sessionContext.RequiredUserId, _sessionContext.UserName,
@@ -1723,7 +1731,7 @@ namespace Hotline.FlowEngine.Workflows
             //    _sessionContext.RequiredOrgId, _sessionContext.OrgName,
             //    _sessionContext.OrgAreaCode, _sessionContext.OrgAreaName);
 
-            HandleStep(step, string.Empty);
+            HandleStep(step, "流程归档", string.Empty);
 
             await _workflowStepRepository.AddAsync(step, cancellationToken);
 
@@ -1957,11 +1965,11 @@ namespace Hotline.FlowEngine.Workflows
             if (step.IsStartCountersign)
             {
                 var countersignSteps = steps.Where(d => d.CountersignId == step.StartCountersignId).ToList();
-                if(countersignSteps.Any())
+                if (countersignSteps.Any())
                 {
                     foreach (var countersignStep in countersignSteps)
                     {
-                        HandleStepsByTerminalCs(countersignStep,steps,traces,ref updateSteps, ref updateTraces);
+                        HandleStepsByTerminalCs(countersignStep, steps, traces, ref updateSteps, ref updateTraces);
                     }
                 }
             }
@@ -1984,8 +1992,7 @@ namespace Hotline.FlowEngine.Workflows
                 step.Handle(_sessionContext.RequiredUserId, _sessionContext.UserName,
                     _sessionContext.RequiredOrgId, _sessionContext.OrgName,
                     _sessionContext.OrgAreaCode, _sessionContext.OrgAreaName,
-                    _sessionContext.OrgIsCenter, null);
-                step.Opinion = opinion;
+                    _sessionContext.OrgIsCenter, opinion);
             }
             updateSteps.Add(step);
 

src/Hotline/FlowEngine/Workflows/WorkflowStep.cs

@@ -123,9 +123,9 @@ public class WorkflowStep : StepBasicEntity
         string userId, string? userName,
         string orgId, string? orgName,
         string? orgAreaCode, string? orgAreaName,
-        bool orgIsCenter, string nextStepCode)
+        bool orgIsCenter, string opinion, string nextStepCode)
     {
-        base.Handle(userId, userName, orgId, orgName, orgAreaCode, orgAreaName, orgIsCenter, null);
+        base.Handle(userId, userName, orgId, orgName, orgAreaCode, orgAreaName, orgIsCenter, opinion);
         Status = EWorkflowStepStatus.Handled;
 
         if (!IsInCountersign()

src/Hotline/KnowledgeBase/KnowledgeDomainService.cs

@@ -214,19 +214,25 @@ namespace Hotline.KnowledgeBase
             workFlow.WorkFlowApplyStatus = EKnowledgeWorkFlowStatus.Revoke;
             await _knowledgeWorkFlowRepository.UpdateAsync(workFlow);
 
-            switch (workFlow.WorkflowModuleStatus)
-            {
-                case EKnowledgeApplyType.Add:
-                    //将知识保存为草稿
-                    knowledge.Status = EKnowledgeStatus.Drafts;
-                    await _knowledgeRepository.UpdateAsync(knowledge, cancellationToken);
-                    break;
-                default:
-                    //现有知识状态更改为已撤回
-                    knowledge.Status = EKnowledgeStatus.Revert;
-                    await _knowledgeRepository.UpdateAsync(knowledge, cancellationToken);
-                    break;
-            }
+            //现有知识状态更改为已撤回
+            knowledge.Status = EKnowledgeStatus.Revert;
+            await _knowledgeRepository.UpdateAsync(knowledge, cancellationToken);
+
+			//switch (workFlow.WorkflowModuleStatus)
+   //         {
+   //             case EKnowledgeApplyType.Add:
+   //                 //将知识保存为草稿
+   //                 knowledge.Status = EKnowledgeStatus.Drafts;
+   //                 await _knowledgeRepository.UpdateAsync(knowledge, cancellationToken);
+   //                 break;
+   //             default:
+   //                 //现有知识状态更改为已撤回
+   //                 knowledge.Status = EKnowledgeStatus.Revert;
+   //                 await _knowledgeRepository.UpdateAsync(knowledge, cancellationToken);
+   //                 break;
+
+                   
+			//}
         }
 
         /// <summary>