版本大更新

lixiaojun

2024-03-25 2fbfc7930364dffbb846d018226755ab66f5bcfb

版本大更新

 Yw.Application.Repair.Core/00-core/ConfigHelper.cs

 Yw.Application.Repair.Core/00-core/Extensions.cs

 Yw.Application.Repair.Core/00-core/Mapper.cs

 Yw.Application.Repair.Core/01-request-form/RepairRequestForm_Controller.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/RepairRequestForm_Controller.cs ÐÞ¸Ä
@@ -97,7 +97,7 @@
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"ID:{input.ID} è¡¨å•çŠ¶æ€é”™è¯¯");
            }
            var bol = _service.Accept(input.ID, input.Note, UserManager.UserID, DateTime.Now, UserManager.UserName);
            var bol = _service.Accept(input.ID, input.Note);
            return bol;
        }

@@ -117,7 +117,7 @@
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"ID:{input.ID} è¡¨å•çŠ¶æ€é”™è¯¯");
            }
            var bol = _service.Reject(input.ID, input.Reason, UserManager.UserID, DateTime.Now, UserManager.UserName);
            var bol = _service.Reject(input.ID, input.Reason);
            return bol;
        }


 Yw.Application.Repair.Core/01-request-form/RepairRequestForm_StdController.cs

 Yw.Application.Repair.Core/02-task-form/RepairTaskForm_Controller.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/RepairTaskForm_Controller.cs ÐÞ¸Ä
@@ -86,7 +86,7 @@
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"ID:{input.ID} è¡¨å•çŠ¶æ€å¼‚常");
            }
            var bol = _service.Assign(input.ID, input.RepairUserID, input.RepairUserName, input.Note, UserManager.UserID, DateTime.Now, UserManager.UserName);
            var bol = _service.Assign(input.ID, input.RepairUserID, input.RepairUserName, input.Note);
            return bol;
        }

@@ -106,7 +106,7 @@
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"ID:{input.ID} è¡¨å•çŠ¶æ€å¼‚常");
            }
            var bol = _service.Receive(input.ID, input.Note, UserManager.UserID, DateTime.Now, UserManager.UserName);
            var bol = _service.Receive(input.ID, input.Note);
            return bol;
        }

@@ -145,7 +145,7 @@
                    fileList.Add(file);
                }
            }
            var bol = _service.Start(input.ID, input.Note, fileList, UserManager.UserID, DateTime.Now, UserManager.UserName);
            var bol = _service.Start(input.ID, input.Note, fileList);
            return bol;
        }

@@ -183,7 +183,7 @@
                    fileList.Add(file);
                }
            }
            var bol = _service.Pause(input.ID, input.Note, fileList, UserManager.UserID, DateTime.Now, UserManager.UserName);
            var bol = _service.Pause(input.ID, input.Note, fileList);
            return bol;
        }

@@ -221,7 +221,7 @@
                    fileList.Add(file);
                }
            }
            var bol = _service.Restart(input.ID, input.Note, fileList, UserManager.UserID, DateTime.Now, UserManager.UserName);
            var bol = _service.Restart(input.ID, input.Note, fileList);
            return bol;
        }

@@ -259,7 +259,7 @@
                    fileList.Add(file);
                }
            }
            var bol = _service.Finish(input.ID, input.Note, fileList, UserManager.UserID, DateTime.Now, UserManager.UserName);
            var bol = _service.Finish(input.ID, input.Note, fileList);
            return bol;
        }

@@ -279,7 +279,7 @@
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"ID:{input.ID} è¡¨å•çŠ¶æ€å¼‚常");
            }
            var bol = _service.Success(input.ID, input.Note, UserManager.UserID, DateTime.Now, UserManager.UserName);
            var bol = _service.Success(input.ID, input.Note);
            return bol;
        }


 Yw.Application.Repair.Core/02-task-form/RepairTaskForm_MobileController.cs

 Yw.Application.Repair.Core/03-repair-form/RepairForm_Controller.cs

 Yw.Application.Repair.Core/GlobalUsings.cs

@@ -10,3 +10,5 @@
global using Yw.JWT;
global using Microsoft.AspNetCore.Http;
global using Yw.Model.Repair;
global using Yw.Dto;
global using Yw.Dto.Repair;

 Yw.Application.Repair.Core/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,6 +4,6 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-01-31T05:24:07.4728291Z;True|2024-01-22T11:23:19.7067580+08:00;True|2023-12-25T10:02:24.8948808+08:00;True|2023-12-11T09:27:38.5966472+08:00;True|2023-12-04T18:25:37.5121850+08:00;True|2023-12-04T18:25:32.0321208+08:00;True|2023-07-13T12:10:11.2591498+08:00;True|2023-05-25T18:02:16.3580168+08:00;True|2023-05-25T15:44:32.4909866+08:00;</History>
    <History>True|2024-03-25T06:29:53.3457703Z;True|2024-01-31T13:24:07.4728291+08:00;True|2024-01-22T11:23:19.7067580+08:00;True|2023-12-25T10:02:24.8948808+08:00;True|2023-12-11T09:27:38.5966472+08:00;True|2023-12-04T18:25:37.5121850+08:00;True|2023-12-04T18:25:32.0321208+08:00;True|2023-07-13T12:10:11.2591498+08:00;True|2023-05-25T18:02:16.3580168+08:00;True|2023-05-25T15:44:32.4909866+08:00;</History>
  </PropertyGroup>
</Project>

 Yw.Application.Repair.Core/Yw.Application.Repair.Core.csproj

@@ -7,7 +7,7 @@
    <RootNamespace>Yw.Application</RootNamespace>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
    <Version>1.0.4</Version>
    <Version>3.0.0</Version>
  </PropertyGroup>

  <ItemGroup>
@@ -26,9 +26,8 @@
  </ItemGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Application.Core" Version="1.4.0" />
    <PackageReference Include="Yw.Service.Assets.Core" Version="1.3.1" />
    <PackageReference Include="Yw.Service.Repair.Core" Version="1.0.2" />
    <PackageReference Include="Yw.Application.Core" Version="3.0.1" />
    <PackageReference Include="Yw.Dto.Repair.Core" Version="3.0.0" />
  </ItemGroup>

</Project>

 Yw.Dto.Repair.Core/01-repair-request-form/01-insert/AddRepairRequestFormInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/1-insert/AddRepairRequestFormInput.cs ÐÞ¸Ä
@@ -1,5 +1,6 @@
namespace Yw.Application
namespace Yw.Dto
{

    /// <summary>
    /// 
    /// </summary>
@@ -43,8 +44,6 @@
        /// å®šä½
        /// </summary>
        public Model.Repair.Location Location { get; set; }






 Yw.Dto.Repair.Core/01-repair-request-form/01-insert/UploadRepairRequestFileInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/1-insert/UploadRepairRequestFileInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/01-repair-request-form/02-accept/MyRepairRequestFormAcceptedDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/2-accept/MyRepairRequestFormAcceptedDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// æˆ‘的已受理报修单dto

 Yw.Dto.Repair.Core/01-repair-request-form/02-accept/MyRepairRequestTaskFormAcceptedDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/2-accept/MyRepairRequestTaskFormAcceptedDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// æˆ‘的已受理报修维修单dto

 Yw.Dto.Repair.Core/01-repair-request-form/02-accept/MyRepairRequestTaskLogAcceptedDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/2-accept/MyRepairRequestTaskLogAcceptedDto.cs ÐÞ¸Ä
@@ -1,7 +1,7 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// æˆ‘的报修中维修日志详细手机DTO
    /// æˆ‘的报修中维修日志详细手机DTO 
    /// </summary>
    public class MyRepairRequestTaskLogAcceptedDto
    {

 Yw.Dto.Repair.Core/01-repair-request-form/02-accept/MyRepairRequestTaskLogFileAcceptedDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/2-accept/MyRepairRequestTaskLogFileAcceptedDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// æˆ‘的已受理报修维修日志dto

 Yw.Dto.Repair.Core/01-repair-request-form/02-accept/QueryMyRepairRequestFormAcceptedPageListInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/2-accept/QueryMyRepairRequestFormAcceptedPageListInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// èŽ·å–我的已受理报修单分页列表

 Yw.Dto.Repair.Core/01-repair-request-form/02-accept/RepairRequestAcceptInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/2-accept/RepairRequestAcceptInput.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// <summary> 
    /// æŠ¥ä¿®å•å—理
    /// </summary>
    public class RepairRequestAcceptInput

 Yw.Dto.Repair.Core/01-repair-request-form/03-pending/MyRepairRequestFormPendingDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/3-pending/MyRepairRequestFormPendingDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// æˆ‘的待受理报修单dto

 Yw.Dto.Repair.Core/01-repair-request-form/03-pending/QueryMyRepairRequestFormPendingPageListInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/3-pending/QueryMyRepairRequestFormPendingPageListInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// èŽ·å–我的待受理报修单分页列表

 Yw.Dto.Repair.Core/01-repair-request-form/03-pending/QueryRepairRequestFormPendingPageListInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/3-pending/QueryRepairRequestFormPendingPageListInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// èŽ·å–待受理报修单分析列表

 Yw.Dto.Repair.Core/01-repair-request-form/04-reject/MyRepairRequestFormRejectedMobileDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/4-reject/MyRepairRequestFormRejectedMobileDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// æˆ‘的被驳回报修单dto

 Yw.Dto.Repair.Core/01-repair-request-form/04-reject/QueryMyRepairRequestFormRejectedPageListInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/4-reject/QueryMyRepairRequestFormRejectedPageListInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// èŽ·å–我的被驳回报修单分页列表

 Yw.Dto.Repair.Core/01-repair-request-form/04-reject/RepairRequestRejectInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/4-reject/RepairRequestRejectInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// é©³å›ž

 Yw.Dto.Repair.Core/01-repair-request-form/05-just_accepted/QueryRepairRequestFormJustAcceptedPageListInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/5-just_accepted/QueryRepairRequestFormJustAcceptedPageListInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// èŽ·å–待受理报修单分析列表

 Yw.Dto.Repair.Core/01-repair-request-form/05-just_accepted/RepairRequestFormJustAcceptedDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/5-just_accepted/RepairRequestFormJustAcceptedDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// å¾…派单的报修单

 Yw.Dto.Repair.Core/01-repair-request-form/06-detail/RepairRequestFileDetailDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/2-std/dto/1-detail/RepairRequestFileDetailDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/01-repair-request-form/06-detail/RepairRequestFormDetailDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/2-std/dto/1-detail/RepairRequestFormDetailDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/01-repair-request-form/06-detail/RepairRequestLogDetailDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/2-std/dto/1-detail/RepairRequestLogDetailDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/01-repair-request-form/06-detail/RepairRequestTaskFormDetailDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/2-std/dto/1-detail/RepairRequestTaskFormDetailDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// ç»´ä¿®å•è¯¦ç»†ä¿¡æ¯

 Yw.Dto.Repair.Core/01-repair-request-form/06-detail/RepairRequestTaskLogDetailDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/2-std/dto/1-detail/RepairRequestTaskLogDetailDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// ç»´ä¿®å•æ—¥å¿—详细

 Yw.Dto.Repair.Core/01-repair-request-form/06-detail/RepairRequestTaskLogFileDetailDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/2-std/dto/1-detail/RepairRequestTaskLogFileDetailDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/01-repair-request-form/07-pending-detail/RepairRequestFormPendingDetailDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/2-std/dto/2-pending-detail/RepairRequestFormPendingDetailDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/01-repair-request-form/08-reject-detail/RepairRequestFormRejectedDetailDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/2-std/dto/3-reject-detail/RepairRequestFormRejectedDetailDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/01-repair-request-form/09-accepted-detail/RepairRequestFormAcceptedDetailDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/2-std/dto/4-accepted-detail/RepairRequestFormAcceptedDetailDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// å·²å—理报修单详细dto

 Yw.Dto.Repair.Core/01-repair-request-form/10-page/MyRepairRequestFormDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/6-page/MyRepairRequestFormDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/01-repair-request-form/10-page/QueryMyRepairRequestFormPageListInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/6-page/QueryMyRepairRequestFormPageListInput.cs ÐÞ¸Ä
@@ -1,11 +1,4 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// èŽ·å–我的报修单分析列表

 Yw.Dto.Repair.Core/01-repair-request-form/10-page/QueryRepairRequestFormPageListInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/6-page/QueryRepairRequestFormPageListInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// èŽ·å–报修单分页列表

 Yw.Dto.Repair.Core/01-repair-request-form/10-page/RepairRequestFormDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/1-request-form/1-mgr/dto/6-page/RepairRequestFormDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/02-repair-task-form/01-upload/UploadRepairTaskFormFileMobileInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/0-upload/UploadRepairTaskFormFileMobileInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// ä¸Šä¼ ç»´ä¿®å•æ–‡ä»¶

 Yw.Dto.Repair.Core/02-repair-task-form/02-assign/RepairTaskAssignInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/1-assign/RepairTaskAssignInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// æ´¾å•

 Yw.Dto.Repair.Core/02-repair-task-form/02-assign/my/MyRepairTaskFormAssignedDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/1-assign/my/MyRepairTaskFormAssignedDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// æˆ‘的已派单的维修单dto

 Yw.Dto.Repair.Core/02-repair-task-form/02-assign/my/QueryMyRepairTaskFormAssignedPageListInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/1-assign/my/QueryMyRepairTaskFormAssignedPageListInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// èŽ·å–我的已派单的维修单分页列表输入

 Yw.Dto.Repair.Core/02-repair-task-form/03-receive/RepairTaskReceiveInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/2-receive/RepairTaskReceiveInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// æŽ¥å•

 Yw.Dto.Repair.Core/02-repair-task-form/04-start/RepairTaskStartInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/3-start/RepairTaskStartInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// ç»´ä¿®å•å¼€å·¥

 Yw.Dto.Repair.Core/02-repair-task-form/05-pause/RepairTaskPauseInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/4-pause/RepairTaskPauseInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// ç»´ä¿®å•æš‚停

 Yw.Dto.Repair.Core/02-repair-task-form/06-restart/RepairTaskRestartInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/5-restart/RepairTaskRestartInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// ç»´ä¿®å•é‡æ–°å¼€å·¥

 Yw.Dto.Repair.Core/02-repair-task-form/07-finish/RepairTaskFinishInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/6-finish/RepairTaskFinishInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// ç»´ä¿®å•å®Œå·¥

 Yw.Dto.Repair.Core/02-repair-task-form/07-finish/my/MyRepairTaskFormHasFinishedMobileDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/6-finish/my/MyRepairTaskFormHasFinishedMobileDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// æˆ‘的已完成的维修单dto

 Yw.Dto.Repair.Core/02-repair-task-form/07-finish/my/QueryMyRepairTaskFormHasFinishedPageListInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/6-finish/my/QueryMyRepairTaskFormHasFinishedPageListInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// èŽ·å–我的已完成的维修单分页列表输入

 Yw.Dto.Repair.Core/02-repair-task-form/07-finish/page/QueryRepairTaskFormFinishedPageListInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/6-finish/page/QueryRepairTaskFormFinishedPageListInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// èŽ·å–维修单完工分页列表

 Yw.Dto.Repair.Core/02-repair-task-form/07-finish/page/RepairTaskFormFinishedDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/6-finish/page/RepairTaskFormFinishedDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/02-repair-task-form/08-success/RepairTaskSuccessInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/7-success/RepairTaskSuccessInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// éªŒæ”¶é€šè¿‡

 Yw.Dto.Repair.Core/02-repair-task-form/09-progress/my/MyRepairTaskFormProgressMobileDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/8-progress/my/MyRepairTaskFormProgressMobileDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// æˆ‘的进行中的维修单dto

 Yw.Dto.Repair.Core/02-repair-task-form/09-progress/my/QueryMyRepairTaskFormProgressPageListInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/8-progress/my/QueryMyRepairTaskFormProgressPageListInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// èŽ·å–我的进行中的维修单分页列表输入

 Yw.Dto.Repair.Core/02-repair-task-form/09-progress/page/QueryRepairTaskFormProgressPageListInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/8-progress/page/QueryRepairTaskFormProgressPageListInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// èŽ·å–维修单进度分页列表

 Yw.Dto.Repair.Core/02-repair-task-form/09-progress/page/RepairTaskFormProgressDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/8-progress/page/RepairTaskFormProgressDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/02-repair-task-form/10-request/RepairTaskLogDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/9-request/RepairTaskLogDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// ç»´ä¿®å•æ—¥å¿—

 Yw.Dto.Repair.Core/02-repair-task-form/10-request/RepairTaskRequestFormDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/1-mgr/dto/9-request/RepairTaskRequestFormDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/02-repair-task-form/11-detail/RepairTaskFormDetailDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/2-std/dto/1-detail/RepairTaskFormDetailDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// ç»´ä¿®å•è¯¦ç»†ä¿¡æ¯

 Yw.Dto.Repair.Core/02-repair-task-form/11-detail/RepairTaskLogDetailDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/2-std/dto/1-detail/RepairTaskLogDetailDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// ç»´ä¿®å•æ—¥å¿—详细

 Yw.Dto.Repair.Core/02-repair-task-form/11-detail/RepairTaskLogFileDetailDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/2-std/dto/1-detail/RepairTaskLogFileDetailDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/02-repair-task-form/11-detail/RepairTaskRequestFileDetailDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/2-std/dto/1-detail/RepairTaskRequestFileDetailDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/02-repair-task-form/11-detail/RepairTaskRequestFormDetailDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/2-std/dto/1-detail/RepairTaskRequestFormDetailDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/02-repair-task-form/11-detail/RepairTaskRequestLogDetailDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/2-std/dto/1-detail/RepairTaskRequestLogDetailDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/02-repair-task-form/12-assigned-detail/MyRepairTaskFormAssignedDetailMobileDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/2-std/dto/2-assigned-detail/MyRepairTaskFormAssignedDetailMobileDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/02-repair-task-form/13-progress-detail/RepairTaskFormProgressDetailDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/2-std/dto/3-progress-detail/RepairTaskFormProgressDetailDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/02-repair-task-form/14-has-finished-detail/MyRepairTaskFormHasFinishedDetailMobileDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/2-task-form/2-std/dto/4-has-finished-detail/MyRepairTaskFormHasFinishedDetailMobileDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/03-repair-form/RepairFormKindMapDto.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/3-repair-form/dto/RepairFormKindMapDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application
namespace Yw.Dto
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/99-model/kind/KindInput.cs

ÎļþÃû´Ó Yw.Application.Repair.Core/0-core/3-dto/kind/KindInput.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace Yw.Application.Repair
namespace Yw.Dto.Repair
{
    /// <summary>
    /// 

 Yw.Dto.Repair.Core/GlobalUsings.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
global using System.ComponentModel.DataAnnotations;
global using System.Text;
global using Yw.Untity;
global using Yw.Repair;
global using Yw.Dto.Repair;
global using Yw.Model.Repair;


 Yw.Dto.Repair.Core/Properties/PublishProfiles/FolderProfile.pubxml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
  <PropertyGroup>
    <Configuration>Release</Configuration>
    <Platform>Any CPU</Platform>
    <PublishDir>bin\Release\net6.0\publish\</PublishDir>
    <PublishProtocol>FileSystem</PublishProtocol>
  </PropertyGroup>
</Project>

 Yw.Dto.Repair.Core/Properties/PublishProfiles/FolderProfile.pubxml.user

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
  <PropertyGroup>
    <History>True|2024-03-25T05:38:09.3123355Z;</History>
  </PropertyGroup>
</Project>

 Yw.Dto.Repair.Core/Yw.Dto.Repair.Core.csproj

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>disable</Nullable>
    <Version>3.0.0</Version>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Dto.Assets.Core" Version="3.0.0" />
    <PackageReference Include="Yw.Service.Repair.Core" Version="3.0.0" />
  </ItemGroup>

</Project>

 Yw.Dto.Repair.Core/Yw.Dto.Repair.Core.csproj.user

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_LastSelectedProfileId>D:\WorkData\模块\Code\Repair\Yw.Dto.Repair.Core\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
  </PropertyGroup>
</Project>

 Yw.Repair.Core.sln

@@ -11,6 +11,8 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yw.Entry.Repair.Core", "Yw.Entry.Repair.Core\Yw.Entry.Repair.Core.csproj", "{FFC7B687-77C2-4454-BA7F-87A2B17A889B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yw.Dto.Repair.Core", "Yw.Dto.Repair.Core\Yw.Dto.Repair.Core.csproj", "{8F2A1341-0BA0-4C9F-A10F-C987CFD6E787}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
        Debug|Any CPU = Debug|Any CPU
@@ -33,6 +35,10 @@
        {FFC7B687-77C2-4454-BA7F-87A2B17A889B}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {FFC7B687-77C2-4454-BA7F-87A2B17A889B}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {FFC7B687-77C2-4454-BA7F-87A2B17A889B}.Release|Any CPU.Build.0 = Release|Any CPU
        {8F2A1341-0BA0-4C9F-A10F-C987CFD6E787}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {8F2A1341-0BA0-4C9F-A10F-C987CFD6E787}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {8F2A1341-0BA0-4C9F-A10F-C987CFD6E787}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {8F2A1341-0BA0-4C9F-A10F-C987CFD6E787}.Release|Any CPU.Build.0 = Release|Any CPU
    EndGlobalSection
    GlobalSection(SolutionProperties) = preSolution
        HideSolutionNode = FALSE

 Yw.Service.Repair.Core/0-core/ConfigHelper.cs

ÎļþÒÑɾ³ý

 Yw.Service.Repair.Core/00-core/ConfigHelper.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,108 @@
namespace Yw.Repair
{
    internal class ConfigHelper
    {

        /// <summary>
        /// é»˜è®¤è¿žæŽ¥é…ç½®
        /// </summary>
        internal static ConnectionConfig DefaultConnectionConfig
        {
            get
            {
                //SnowFlakeSingle.WorkId = Settings.SqlSugar.SnowFlakeWorkId; ä¸åŒæœºå™¨é…ç½®çš„唯一数字; // å•æœåŠ¡å™¨ä¸éœ€è¦æŒ‡å®š
                return new ConnectionConfig()
                {
                    DbType = SqlSugar.DbType.PostgreSQL,//数据库类型
                    ConnectionString = RepairParasHelper.Repair.DataBase.PostgreSql.ConnectString,
                    IsAutoCloseConnection = true,//是否自动关闭
                    MoreSettings = new ConnMoreSettings()
                    {
                        //PgSqlIsAutoToLower = false //数据库存在大写字段的 ï¼Œéœ€è¦æŠŠè¿™ä¸ªè®¾ä¸ºfalse ï¼Œå¹¶ä¸”实体和字段名称要一样
                    },
                    AopEvents = new AopEvents
                    {
                        OnLogExecuting = (sql, p) =>
                        {
                            // var sqlString = UtilMethods.GetNativeSql(sql, p);
                            //LogHelper.Debug(sqlString);
                            // Console.WriteLine(sql);
                        }
                    }
                };
            }
        }

        /// <summary>
        /// PostgreSql连接配置
        /// </summary>
        internal static ConnectionConfig PostgreSqlConnectionConfig
        {
            get
            {
                //SnowFlakeSingle.WorkId = Settings.SqlSugar.SnowFlakeWorkId; ä¸åŒæœºå™¨é…ç½®çš„唯一数字; // å•æœåŠ¡å™¨ä¸éœ€è¦æŒ‡å®š
                return new ConnectionConfig()
                {
                    DbType = SqlSugar.DbType.PostgreSQL,//数据库类型
                    ConnectionString = RepairParasHelper.Repair.DataBase.PostgreSql.ConnectString,
                    IsAutoCloseConnection = true,//是否自动关闭
                    MoreSettings = new ConnMoreSettings()
                    {
                        //PgSqlIsAutoToLower = false //数据库存在大写字段的 ï¼Œéœ€è¦æŠŠè¿™ä¸ªè®¾ä¸ºfalse ï¼Œå¹¶ä¸”实体和字段名称要一样
                    },
                    AopEvents = new AopEvents
                    {
                        OnLogExecuting = (sql, p) =>
                        {
                            // var sqlString = UtilMethods.GetNativeSql(sql, p);
                            //LogHelper.Debug(sqlString);
                            // Console.WriteLine(sql);
                        }
                    }
                };
            }
        }

        /// <summary>
        /// SQLite连接配置
        /// </summary>
        internal static ConnectionConfig SQLiteConnectionConfig
        {
            get
            {
                //SnowFlakeSingle.WorkId = Settings.SqlSugar.SnowFlakeWorkId; ä¸åŒæœºå™¨é…ç½®çš„唯一数字; // å•æœåŠ¡å™¨ä¸éœ€è¦æŒ‡å®š
                return new ConnectionConfig()
                {
                    DbType = SqlSugar.DbType.Sqlite,//数据库类型
                    ConnectionString = RepairParasHelper.Repair.DataBase.SQLite.ConnectString,
                    IsAutoCloseConnection = true,//是否自动关闭
                    MoreSettings = new ConnMoreSettings()
                    {
                        //PgSqlIsAutoToLower = false //数据库存在大写字段的 ï¼Œéœ€è¦æŠŠè¿™ä¸ªè®¾ä¸ºfalse ï¼Œå¹¶ä¸”实体和字段名称要一样
                    },
                    AopEvents = new AopEvents
                    {
                        OnLogExecuting = (sql, p) =>
                        {
                            // var sqlString = UtilMethods.GetNativeSql(sql, p);
                            //LogHelper.Debug(sqlString);
                            // Console.WriteLine(sql);
                        }
                    }
                };
            }
        }












    }
}

 Yw.Service.Repair.Core/00-core/DataType.cs

 Yw.Service.Repair.Core/00-core/Kind.cs

 Yw.Service.Repair.Core/00-core/MemoryCacheKey.cs

 Yw.Service.Repair.Core/00-core/eRequestOperation.cs

 Yw.Service.Repair.Core/00-core/eRequestStatus.cs

 Yw.Service.Repair.Core/00-core/eTaskOperation.cs

 Yw.Service.Repair.Core/00-core/eTaskStatus.cs

 Yw.Service.Repair.Core/00-core/eUrgency.cs

 Yw.Service.Repair.Core/01-entity/01-request/RepairRequestFile.cs

ÎļþÃû´Ó Yw.Service.Repair.Core/1-entity/1-request/RepairRequestFile.cs ÐÞ¸Ä
@@ -4,7 +4,7 @@
    /// æŠ¥ä¿®æ–‡ä»¶
    /// </summary>
    [SugarTable("repair_request_file")]
    public class RepairRequestFile : BaseEntity, System.ICloneable, ISorter
    public class RepairRequestFile : BaseEntity, ISorter, System.ICloneable
    {
        /// <summary>
        /// 

 Yw.Service.Repair.Core/01-entity/01-request/RepairRequestForm.cs

 Yw.Service.Repair.Core/01-entity/01-request/RepairRequestLog.cs

 Yw.Service.Repair.Core/01-entity/02-task/RepairTaskForm.cs

 Yw.Service.Repair.Core/01-entity/02-task/RepairTaskLog.cs

 Yw.Service.Repair.Core/01-entity/02-task/RepairTaskLogFile.cs

ÎļþÃû´Ó Yw.Service.Repair.Core/1-entity/2-task/RepairTaskLogFile.cs ÐÞ¸Ä
@@ -4,7 +4,7 @@
    /// ç»´ä¿®æ—¥å¿—文件
    /// </summary>
    [SugarTable("repair_task_log_file")]
    public class RepairTaskLogFile : BaseEntity, System.ICloneable
    public class RepairTaskLogFile : BaseEntity, ISorter, System.ICloneable
    {
        /// <summary>
        /// 

 Yw.Service.Repair.Core/02-model/01-request/RepairRequestFile.cs

 Yw.Service.Repair.Core/02-model/01-request/RepairRequestForm.cs

 Yw.Service.Repair.Core/02-model/01-request/RepairRequestLog.cs

 Yw.Service.Repair.Core/02-model/02-task/RepairTaskForm.cs

 Yw.Service.Repair.Core/02-model/02-task/RepairTaskLog.cs

 Yw.Service.Repair.Core/02-model/02-task/RepairTaskLogFile.cs

 Yw.Service.Repair.Core/02-model/09-model/01-location/Location.cs

 Yw.Service.Repair.Core/02-model/09-model/01-location/Marker.cs

 Yw.Service.Repair.Core/02-model/09-model/01-location/Point.cs

 Yw.Service.Repair.Core/03-settings/helper/RepairFileHelper.cs

 Yw.Service.Repair.Core/03-settings/helper/RepairParasHelper.cs

 Yw.Service.Repair.Core/03-settings/paras/Paras_Repair.cs

 Yw.Service.Repair.Core/03-settings/paras/Paras_Repair_DataBase.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
namespace Yw.Settings
{
    /// <summary>
    /// 
    /// </summary>
    public class Paras_Repair_DataBase
    {
        /// <summary>
        /// æ•°æ®åº“类型
        /// </summary>
        public string DbType { get; set; }

        /// <summary>
        /// PostgreSql
        /// </summary>
        public Paras_Repair_DataBase_PostgreSql PostgreSql { get; set; }

        /// <summary>
        /// SQLite
        /// </summary>
        public Paras_Repair_DataBase_SQLite SQLite { get; set; }


    }

}

 Yw.Service.Repair.Core/03-settings/paras/Paras_Repair_DataBase_PostgreSql.cs

copy from Yw.Service.Repair.Core/3-settings/paras/Paras_Repair_DataBase.cs
copy to Yw.Service.Repair.Core/03-settings/paras/Paras_Repair_DataBase_PostgreSql.cs
Îļþ´Ó Yw.Service.Repair.Core/3-settings/paras/Paras_Repair_DataBase.cs ¸´ÖÆ
@@ -3,14 +3,11 @@
    /// <summary>
    /// 
    /// </summary>
    public class Paras_Repair_DataBase
    public class Paras_Repair_DataBase_PostgreSql
    {
        /// <summary>
        /// è¿žæŽ¥å­—符串
        /// </summary>
        public string ConnectString { get; set; }


    }

}

 Yw.Service.Repair.Core/03-settings/paras/Paras_Repair_DataBase_SQLite.cs

ÎļþÃû´Ó Yw.Service.Repair.Core/3-settings/paras/Paras_Repair_DataBase.cs ÐÞ¸Ä
@@ -3,14 +3,11 @@
    /// <summary>
    /// 
    /// </summary>
    public class Paras_Repair_DataBase
    public class Paras_Repair_DataBase_SQLite
    {
        /// <summary>
        /// è¿žæŽ¥å­—符串
        /// </summary>
        public string ConnectString { get; set; }


    }

}

 Yw.Service.Repair.Core/03-settings/paras/RepairParas.cs

 Yw.Service.Repair.Core/04-dal/01-interface/01-request/IRepairRequestFile.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
namespace Yw.DAL
{
    /// <summary>
    /// RepairRequestFile
    /// </summary>
    public interface IRepairRequestFile : IBaseDAL<Entity.RepairRequestFile>, IUpdateSorter
    {

        /// <summary>
        /// é€šè¿‡ FormID èŽ·å–
        /// </summary>
        List<Entity.RepairRequestFile> GetByFormID(long FormID);



    }
}

 Yw.Service.Repair.Core/04-dal/01-interface/01-request/IRepairRequestForm.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,173 @@
namespace Yw.DAL
{
    /// <summary>
    /// RepairRequestForm
    /// </summary>
    public interface IRepairRequestForm : IBaseTraceDAL<Entity.RepairRequestForm>
    {

        /// <summary>
        /// èŽ·å–最近列表
        /// </summary>
        List<Entity.RepairRequestForm> GetLastList(int Number = 1);

        /// <summary>
        /// èŽ·å–所有待受理的数据
        /// </summary>
        List<Entity.RepairRequestForm> GetPendingList();

        /// <summary>
        /// èŽ·å–待受理的数量
        /// </summary>
        int GetPendingCount();

        /// <summary>
        /// é€šè¿‡ FormStatus èŽ·å–
        /// </summary>
        List<Entity.RepairRequestForm> GetByFormStatus(int FormStatus);

        /// <summary>
        /// é€šè¿‡ FormStatus èŽ·å–数量
        /// </summary>
        int GetCountByFormStatus(int FormStatus);

        /// <summary>
        /// é€šè¿‡ EquipmentID èŽ·å–
        /// </summary>
        List<Entity.RepairRequestForm> GetByEquipmentID(long EquipmentID);

        /// <summary>
        /// é€šè¿‡ EquipmentIds èŽ·å–
        /// </summary>
        List<Entity.RepairRequestForm> GetByEquipmentIds(List<long> EquipmentIds);

        /// <summary>
        /// èŽ·å–某日的数量
        /// </summary>
        int GetCountOfDay(DateTime Day);

        /// <summary>
        /// æ›´æ–° FormStatus
        /// </summary>
        bool UpdateFormStatus(long ID, int FormStatus);

        /// <summary>
        /// æ’å…¥
        /// </summary>
        long Insert(Entity.RepairRequestForm entity, List<Entity.RepairRequestFile> entity4FileList)
        {
            if (string.IsNullOrEmpty(entity.FormNo))
            {
                var count = GetCountOfDay(entity.CreateTime) + 1;
                entity.FormNo = $"R{entity.CreateTime.ToString("yyyyMMdd")}{count.ToString("000000")}";
            }
            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    db.BeginTran();
                    var formId = db.Insertable(entity).ExecuteReturnSnowflakeId();
                    if (formId < 1)
                    {
                        db.RollbackTran();
                        return default;
                    }
                    var entity4Log = new Entity.RepairRequestLog();
                    entity4Log.FormID = formId;
                    entity4Log.OperateType = (int)eRequestOperation.Create;
                    entity4Log.OperateContent = "创建";
                    entity4Log.OperateTime = entity.CreateTime;
                    entity4Log.OperateUserID = entity.CreateUserID;
                    entity4Log.OperateUserName = entity.CreateUserName;
                    entity4Log.OperateNote = "创建";
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)
                    {
                        db.RollbackTran();
                        return default;
                    }
                    if (entity4FileList != null && entity4FileList.Count > 0)
                    {
                        entity4FileList.ForEach(x => x.FormID = formId);
                        var fileIds = db.Insertable(entity4FileList).ExecuteReturnSnowflakeIdList();
                        if (fileIds == null || fileIds.Count != entity4FileList.Count)
                        {
                            db.RollbackTran();
                            return default;
                        }
                    }

                    db.CommitTran();
                    return formId;
                }
                catch
                {
                    db.RollbackTran();
                    throw;
                }
            }
        }

        /// <summary>
        /// é©³å›ž
        /// </summary>
        bool Reject(long ID, string Reason);

        /// <summary>
        /// å—理
        /// </summary>
        bool Accept(long ID, string Note);

        /// <summary>
        /// èŽ·å–我的模糊分页列表
        /// </summary>
        List<Entity.RepairRequestForm> GetMyFluzzyPageList
              (
                 long CreateUserID,
                 int? FormStatus,
                 int? Urgency,
                 DateTime? StartTime,
                 DateTime? EndTime,
                 int PageIndex,
                 int PageSize,
                 ref int Total
            );

        /// <summary>
        /// èŽ·å–模糊分页列表
        /// </summary>
        List<Entity.RepairRequestForm> GetFluzzyPageList
          (
                 List<long> EquipmentIds,
                 long? CreateUserID,
                 int? FormStatus,
                 int? Urgency,
                 string FormNo,
                 DateTime? StartTime,
                 DateTime? EndTime,
                 int PageIndex,
                 int PageSize,
                 ref int Total
            );

        /// <summary>
        /// èŽ·å–待派单分页列表
        /// </summary>
        List<Tuple<Entity.RepairRequestForm, Entity.RepairTaskForm>> GetJustAccepedPageList
          (
                 List<long> EquipmentIds,
                 long? CreateUserID,
                 int? Urgency,
                 string FormNo,
                 DateTime? StartTime,
                 DateTime? EndTime,
                 int PageIndex,
                 int PageSize,
                 ref int Total
            );




    }
}

 Yw.Service.Repair.Core/04-dal/01-interface/01-request/IRepairRequestLog.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
namespace Yw.DAL
{
    /// <summary>
    /// RepairRequestLog
    /// </summary>
    public interface IRepairRequestLog : IBaseDAL<Entity.RepairRequestLog>
    {

        /// <summary>
        /// é€šè¿‡ FormID èŽ·å–
        /// </summary>
        List<Entity.RepairRequestLog> GetByFormID(long FormID);

        /// <summary>
        /// é€šè¿‡ FormID å’Œ OperateType èŽ·å–
        /// </summary>
        Entity.RepairRequestLog GetByFormIDAndOperateType(long FormID, int OperateType);

        /// <summary>
        /// é€šè¿‡ FormIds å’Œ OperateType èŽ·å–
        /// </summary>
        List<Entity.RepairRequestLog> GetByFormIdsAndOperateType(List<long> FormIds, int OperateType);


    }
}

 Yw.Service.Repair.Core/04-dal/01-interface/2-task/IRepairTaskForm.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,141 @@
namespace Yw.DAL
{
    /// <summary>
    /// RepairTaskForm
    /// </summary>
    public interface IRepairTaskForm : IBaseTraceDAL<Entity.RepairTaskForm>
    {

        /// <summary>
        /// é€šè¿‡ RequestID èŽ·å–
        /// </summary>
        List<Entity.RepairTaskForm> GetByRequestID(long RequestID);

        /// <summary>
        /// é€šè¿‡ RequestIds èŽ·å–
        /// </summary>
        List<Entity.RepairTaskForm> GetByRequestIds(List<long> RequestIds);

        /// <summary>
        /// èŽ·å–数量
        /// </summary>
        int GetCount();

        /// <summary>
        /// èŽ·å–所有未验收的数据
        /// </summary>
        List<Entity.RepairTaskForm> GetUnCheckedList();

        /// <summary>
        /// èŽ·å–某日的数量
        /// </summary>
        int GetCountOfDay(DateTime Day);

        /// <summary>
        /// æ›´æ–° FormStatus
        /// </summary>
        bool UpdateFormStatus(long ID, int FormStatus);

        /// <summary>
        /// æ´¾å•
        /// </summary>
        bool Assign(long ID, long RepairUserID, string RepairUserName, string Note);

        /// <summary>
        /// æŽ¥å•
        /// </summary>
        bool Receive(long ID, string Note);

        /// <summary>
        /// å¼€å·¥
        /// </summary>
        bool Start(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList);

        /// <summary>
        /// æš‚停
        /// </summary>
        bool Pause(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList);

        /// <summary>
        /// é‡æ–°å¼€å·¥
        /// </summary>
        bool Restart(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList);

        /// <summary>
        /// å®Œå·¥
        /// </summary>
        bool Finish(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList);

        /// <summary>
        /// éªŒæ”¶é€šè¿‡
        /// </summary>
        bool Success(long ID, string Note);

        /// <summary>
        /// èŽ·å–模糊列表
        /// </summary>
        List<Tuple<Entity.RepairTaskForm, Entity.RepairRequestForm>> GetFluzzyList
            (
                 List<long> EquipmentIds,
                 long? RepairUserID,
                 int? FormStatus,
                 int? Urgency,
                 string FormNo,
                 DateTime? StartTime,
                 DateTime? EndTime
            );

        /// <summary>
        /// èŽ·å–分页列表
        /// </summary>
        List<Tuple<Entity.RepairTaskForm, Entity.RepairRequestForm>> GetPageList
            (
                 List<long> EquipmentIds,
                 long? RepairUserID,
                 int? FormStatus,
                 int? Urgency,
                 string FormNo,
                 DateTime? StartTime,
                 DateTime? EndTime,
                 int PageIndex,
                 int PageSize,
                 ref int Total
            );

        /// <summary>
        /// èŽ·å–进行中的分页列表
        /// </summary>
        List<Tuple<Entity.RepairTaskForm, Entity.RepairRequestForm>> GetProgressPageList
            (
                 List<long> EquipmentIds,
                 long? RepairUserID,
                 int? Urgency,
                 string FormNo,
                 DateTime? StartTime,
                 DateTime? EndTime,
                 int PageIndex,
                 int PageSize,
                 ref int Total
            );

        /// <summary>
        /// èŽ·å–已完成的分页列表
        /// </summary>
        List<Tuple<Entity.RepairTaskForm, Entity.RepairRequestForm>> GetHasFinishedPageList
            (
                 List<long> EquipmentIds,
                 long? RepairUserID,
                 int? Urgency,
                 string FormNo,
                 DateTime? StartTime,
                 DateTime? EndTime,
                 int PageIndex,
                 int PageSize,
                 ref int Total
            );




    }
}

 Yw.Service.Repair.Core/04-dal/01-interface/2-task/IRepairTaskLog.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
namespace Yw.DAL
{
    /// <summary>
    /// RepairTaskLog
    /// </summary>
    public interface IRepairTaskLog : IBaseDAL<Entity.RepairTaskLog>
    {

        /// <summary>
        /// é€šè¿‡ FormID èŽ·å–
        /// </summary>
        List<Entity.RepairTaskLog> GetByFormID(long FormID);

        /// <summary>
        /// é€šè¿‡ FormID èŽ·å–最后一条
        /// </summary>
        Entity.RepairTaskLog GetLastByFormID(long FormID);

        /// <summary>
        /// é€šè¿‡ FormIds èŽ·å–
        /// </summary>
        List<Entity.RepairTaskLog> GetByFormIds(List<long> FormIds);


    }
}

 Yw.Service.Repair.Core/04-dal/01-interface/2-task/IRepairTaskLogFile.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
namespace Yw.DAL
{
    /// <summary>
    /// RepairTaskLogFile
    /// </summary>
    public interface IRepairTaskLogFile : IBaseDAL<Entity.RepairTaskLogFile>, IUpdateSorter
    {

        /// <summary>
        /// é€šè¿‡ FormID èŽ·å–
        /// </summary>
        List<Entity.RepairTaskLogFile> GetByFormID(long FormID);

        /// <summary>
        /// é€šè¿‡ LogID èŽ·å–
        /// </summary>
        List<Entity.RepairTaskLogFile> GetByLogID(long FormID, long LogID);

        /// <summary>
        /// é€šè¿‡ LogID èŽ·å–最大排序码
        /// </summary>
        int GetMaxSortCodeByLogID(long FormID, long LogID);


    }
}

 Yw.Service.Repair.Core/04-dal/02-postgresql/01-request/RepairRequestFile.cs

copy from Yw.Service.Repair.Core/4-dal/1-request/RepairRequestFile.cs
copy to Yw.Service.Repair.Core/04-dal/02-postgresql/01-request/RepairRequestFile.cs
Îļþ´Ó Yw.Service.Repair.Core/4-dal/1-request/RepairRequestFile.cs ¸´ÖÆ
@@ -1,9 +1,9 @@
namespace Yw.DAL
namespace Yw.DAL.PostgreSql
{
    /// <summary>
    /// RepairRequestFile
    /// </summary>
    public partial class RepairRequestFile : BaseDAL_Sorter<Entity.RepairRequestFile>
    public partial class RepairRequestFile : BaseDAL_Sorter<Entity.RepairRequestFile>, IRepairRequestFile
    {
        /// <summary>
        /// 
@@ -12,7 +12,7 @@
        {
            get
            {
                return ConfigHelper.DefaultConnectionConfig;
                return ConfigHelper.PostgreSqlConnectionConfig;
            }
        }


 Yw.Service.Repair.Core/04-dal/02-postgresql/01-request/RepairRequestForm.cs

ÎļþÃû´Ó Yw.Service.Repair.Core/4-dal/1-request/RepairRequestForm.cs ÐÞ¸Ä
@@ -1,9 +1,9 @@
namespace Yw.DAL
namespace Yw.DAL.PostgreSql
{
    /// <summary>
    /// RepairRequestForm
    /// </summary>
    public partial class RepairRequestForm : BaseTraceDAL<Entity.RepairRequestForm>
    public partial class RepairRequestForm : BaseTraceDAL<Entity.RepairRequestForm>, IRepairRequestForm
    {
        /// <summary>
        /// 
@@ -12,7 +12,7 @@
        {
            get
            {
                return ConfigHelper.DefaultConnectionConfig;
                return ConfigHelper.PostgreSqlConnectionConfig;
            }
        }

@@ -122,15 +122,15 @@
        /// <summary>
        /// æ›´æ–° FormStatus
        /// </summary>
        public bool UpdateFormStatus(long ID, int FormStatus, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool UpdateFormStatus(long ID, int FormStatus)
        {
            using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
            {
                return db.Updateable<Entity.RepairRequestForm>()
                    .SetColumns(x => x.FormStatus == FormStatus)
                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                    .SetColumns(x => x.UpdateTime == UpdateTime)
                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                    .SetColumns(x => x.UpdateTime == DateTime.Now)
                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                    .Where(x => x.ID == ID)
                    .ExecuteCommandHasChange();
            }
@@ -146,7 +146,9 @@
                var count = GetCountOfDay(entity.CreateTime) + 1;
                entity.FormNo = $"R{entity.CreateTime.ToString("yyyyMMdd")}{count.ToString("000000")}";
            }

            entity.CreateUserID = UserRegister.UserID;
            entity.CreateUserName = UserRegister.UserName;
            entity.CreateTime = DateTime.Now;
            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                try
@@ -193,6 +195,9 @@
                var count = GetCountOfDay(entity.CreateTime) + 1;
                entity.FormNo = $"R{entity.CreateTime.ToString("yyyyMMdd")}{count.ToString("000000")}";
            }
            entity.CreateUserID = UserRegister.UserID;
            entity.CreateUserName = UserRegister.UserName;
            entity.CreateTime = DateTime.Now;
            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                try
@@ -243,18 +248,19 @@
        /// <summary>
        /// é©³å›ž
        /// </summary>
        public bool Reject(long ID, string Reason, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Reject(long ID, string Reason)
        {
            using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    var dtNow = DateTime.Now;
                    db.BeginTran();
                    var bol = db.Updateable<Entity.RepairRequestForm>()
                                    .SetColumns(x => x.FormStatus == (int)eRequestStatus.Rejected)
                                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                                    .SetColumns(x => x.UpdateTime == UpdateTime)
                                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                                    .SetColumns(x => x.UpdateTime == dtNow)
                                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                                    .Where(x => x.ID == ID)
                                    .ExecuteCommandHasChange();
                    if (!bol)
@@ -266,9 +272,9 @@
                    entity4Log.FormID = ID;
                    entity4Log.OperateType = (int)eRequestOperation.Reject;
                    entity4Log.OperateContent = "驳回";
                    entity4Log.OperateTime = UpdateTime;
                    entity4Log.OperateUserID = UpdateUserID;
                    entity4Log.OperateUserName = UpdateUserName;
                    entity4Log.OperateTime = dtNow;
                    entity4Log.OperateUserID = UserRegister.UserID;
                    entity4Log.OperateUserName = UserRegister.UserName;
                    entity4Log.OperateNote = Reason;
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)
@@ -290,12 +296,13 @@
        /// <summary>
        /// å—理
        /// </summary>
        public bool Accept(long ID, string Note, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Accept(long ID, string Note)
        {
            using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    var dtNow = DateTime.Now;
                    db.BeginTran();
                    var entity = db.Queryable<Entity.RepairRequestForm>().Where(x => x.ID == ID).First();
                    if (entity == null)
@@ -313,9 +320,9 @@

                    var bol = db.Updateable<Entity.RepairRequestForm>()
                            .SetColumns(x => x.FormStatus == (int)eRequestStatus.Accepted)
                            .SetColumns(x => x.UpdateUserID == UpdateUserID)
                            .SetColumns(x => x.UpdateTime == UpdateTime)
                            .SetColumns(x => x.UpdateUserName == UpdateUserName)
                            .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                            .SetColumns(x => x.UpdateTime == dtNow)
                            .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                            .Where(x => x.ID == ID)
                            .ExecuteCommandHasChange();
                    if (!bol)
@@ -332,9 +339,9 @@
                    entity4Log.FormID = ID;
                    entity4Log.OperateType = (int)eRequestOperation.Accept;
                    entity4Log.OperateContent = "受理";
                    entity4Log.OperateTime = UpdateTime;
                    entity4Log.OperateUserID = UpdateUserID;
                    entity4Log.OperateUserName = UpdateUserName;
                    entity4Log.OperateTime = dtNow;
                    entity4Log.OperateUserID = UserRegister.UserID;
                    entity4Log.OperateUserName = UserRegister.UserName;
                    entity4Log.OperateNote = Note;
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)
@@ -348,12 +355,12 @@
                    #region ç”Ÿæˆç»´ä¿®å•

                    var taskCount = db.Queryable<Entity.RepairTaskForm>()
                                        .Where(x => x.CreateTime >= UpdateTime.Date && x.CreateTime < UpdateTime.Date.AddDays(1)).Count();
                                        .Where(x => x.CreateTime >= dtNow.Date && x.CreateTime < dtNow.Date.AddDays(1)).Count();

                    var entity4Task = new Entity.RepairTaskForm();
                    entity4Task.EquipmentID = entity.EquipmentID;
                    entity4Task.RequestID = entity.ID;
                    entity4Task.FormNo = $"T{UpdateTime.ToString("yyyyMMdd")}{taskCount.ToString("000000")}";
                    entity4Task.FormNo = $"T{dtNow.ToString("yyyyMMdd")}{taskCount.ToString("000000")}";
                    entity4Task.FormName = entity.FormName;
                    entity4Task.FormStatus = (int)eTaskStatus.Accepted;
                    entity4Task.Faq = entity.Faq;
@@ -361,9 +368,9 @@
                    entity4Task.Urgency = entity.Urgency;
                    entity4Task.Address = entity.Address;
                    entity4Task.Location = entity.Location;
                    entity4Task.CreateUserID = UpdateUserID;
                    entity4Task.CreateTime = UpdateTime;
                    entity4Task.CreateUserName = UpdateUserName;
                    entity4Task.CreateUserID = UserRegister.UserID;
                    entity4Task.CreateTime = dtNow;
                    entity4Task.CreateUserName = UserRegister.UserName;

                    var taskId = db.Insertable(entity4Task).ExecuteReturnSnowflakeId();
                    if (taskId < 1)
@@ -379,9 +386,9 @@
                    entity4TaskLog.FormID = taskId;
                    entity4TaskLog.OperateType = (int)eTaskOperation.Accept;
                    entity4TaskLog.OperateContent = "受理";
                    entity4TaskLog.OperateTime = UpdateTime;
                    entity4TaskLog.OperateUserID = UpdateUserID;
                    entity4TaskLog.OperateUserName = UpdateUserName;
                    entity4TaskLog.OperateTime = dtNow;
                    entity4TaskLog.OperateUserID = UserRegister.UserID;
                    entity4TaskLog.OperateUserName = UserRegister.UserName;
                    entity4TaskLog.OperateNote = Note;

                    var taskLogId = db.Insertable(entity4TaskLog).ExecuteReturnSnowflakeId();

 Yw.Service.Repair.Core/04-dal/02-postgresql/01-request/RepairRequestLog.cs

ÎļþÃû´Ó Yw.Service.Repair.Core/4-dal/1-request/RepairRequestLog.cs ÐÞ¸Ä
@@ -1,9 +1,9 @@
namespace Yw.DAL
namespace Yw.DAL.PostgreSql
{
    /// <summary>
    /// RepairRequestLog
    /// </summary>
    public partial class RepairRequestLog : BaseDAL<Entity.RepairRequestLog>
    public partial class RepairRequestLog : BaseDAL<Entity.RepairRequestLog>, IRepairRequestLog
    {
        /// <summary>
        /// 
@@ -12,7 +12,7 @@
        {
            get
            {
                return ConfigHelper.DefaultConnectionConfig;
                return ConfigHelper.PostgreSqlConnectionConfig;
            }
        }


 Yw.Service.Repair.Core/04-dal/02-postgresql/02-task/RepairTaskForm.cs

copy from Yw.Service.Repair.Core/4-dal/2-task/RepairTaskForm.cs
copy to Yw.Service.Repair.Core/04-dal/02-postgresql/02-task/RepairTaskForm.cs
Îļþ´Ó Yw.Service.Repair.Core/4-dal/2-task/RepairTaskForm.cs ¸´ÖÆ
@@ -1,9 +1,9 @@
namespace Yw.DAL
namespace Yw.DAL.PostgreSql
{
    /// <summary>
    /// RepairTaskForm
    /// </summary>
    public partial class RepairTaskForm : BaseTraceDAL<Entity.RepairTaskForm>
    public partial class RepairTaskForm : BaseTraceDAL<Entity.RepairTaskForm>, IRepairTaskForm
    {
        /// <summary>
        /// 
@@ -12,7 +12,7 @@
        {
            get
            {
                return ConfigHelper.DefaultConnectionConfig;
                return ConfigHelper.PostgreSqlConnectionConfig;
            }
        }

@@ -87,15 +87,15 @@
        /// <summary>
        /// æ›´æ–° FormStatus
        /// </summary>
        public bool UpdateFormStatus(long ID, int FormStatus, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool UpdateFormStatus(long ID, int FormStatus)
        {
            using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
            {
                return db.Updateable<Entity.RepairTaskForm>()
                    .SetColumns(x => x.FormStatus == FormStatus)
                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                    .SetColumns(x => x.UpdateTime == UpdateTime)
                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                    .SetColumns(x => x.UpdateTime == DateTime.Now)
                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                    .Where(x => x.ID == ID)
                    .ExecuteCommand() > 0;
            }
@@ -104,20 +104,21 @@
        /// <summary>
        /// æ´¾å•
        /// </summary>
        public bool Assign(long ID, long RepairUserID, string RepairUserName, string Note, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Assign(long ID, long RepairUserID, string RepairUserName, string Note)
        {
            using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    var dt = DateTime.Now;
                    db.BeginTran();
                    var bol = db.Updateable<Entity.RepairTaskForm>()
                                    .SetColumns(x => x.FormStatus == (int)eTaskStatus.Assigned)
                                    .SetColumns(x => x.RepairUserID == RepairUserID)
                                    .SetColumns(x => x.RepairUserName == RepairUserName)
                                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                                    .SetColumns(x => x.UpdateTime == UpdateTime)
                                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                                    .SetColumns(x => x.UpdateTime == dt)
                                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                                    .Where(x => x.ID == ID)
                                    .ExecuteCommand() > 0;
                    if (!bol)
@@ -129,9 +130,9 @@
                    entity4Log.FormID = ID;
                    entity4Log.OperateType = (int)eTaskOperation.Assign;
                    entity4Log.OperateContent = "派单";
                    entity4Log.OperateTime = UpdateTime;
                    entity4Log.OperateUserID = UpdateUserID;
                    entity4Log.OperateUserName = UpdateUserName;
                    entity4Log.OperateTime = dt;
                    entity4Log.OperateUserID = UserRegister.UserID;
                    entity4Log.OperateUserName = UserRegister.UserName;
                    entity4Log.OperateNote = Note;
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)
@@ -153,18 +154,19 @@
        /// <summary>
        /// æŽ¥å•
        /// </summary>
        public bool Receive(long ID, string Note, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Receive(long ID, string Note)
        {
            using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    var dtNow = DateTime.Now;
                    db.BeginTran();
                    var bol = db.Updateable<Entity.RepairTaskForm>()
                                    .SetColumns(x => x.FormStatus == (int)eTaskStatus.Received)
                                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                                    .SetColumns(x => x.UpdateTime == UpdateTime)
                                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                                    .SetColumns(x => x.UpdateTime == dtNow)
                                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                                    .Where(x => x.ID == ID)
                                    .ExecuteCommandHasChange();
                    if (!bol)
@@ -176,9 +178,9 @@
                    entity4Log.FormID = ID;
                    entity4Log.OperateType = (int)eTaskOperation.Receive;
                    entity4Log.OperateContent = "接单";
                    entity4Log.OperateTime = UpdateTime;
                    entity4Log.OperateUserID = UpdateUserID;
                    entity4Log.OperateUserName = UpdateUserName;
                    entity4Log.OperateTime = dtNow;
                    entity4Log.OperateUserID = UserRegister.UserID;
                    entity4Log.OperateUserName = UserRegister.UserName;
                    entity4Log.OperateNote = Note;
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)
@@ -200,12 +202,13 @@
        /// <summary>
        /// å¼€å·¥
        /// </summary>
        public bool Start(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Start(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList)
        {
            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    var dtNow = DateTime.Now;
                    db.BeginTran();
                    var entity = db.Queryable<Entity.RepairTaskForm>().Where(x => x.ID == ID).First();
                    if (entity == null)
@@ -220,9 +223,9 @@
                    }
                    var bol = db.Updateable<Entity.RepairTaskForm>()
                                    .SetColumns(x => x.FormStatus == (int)eTaskStatus.Started)
                                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                                    .SetColumns(x => x.UpdateTime == UpdateTime)
                                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                                    .SetColumns(x => x.UpdateTime == dtNow)
                                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                                    .Where(x => x.ID == ID)
                                    .ExecuteCommand() > 0;
                    if (!bol)
@@ -234,9 +237,9 @@
                    entity4Log.FormID = ID;
                    entity4Log.OperateType = (int)eTaskOperation.Start;
                    entity4Log.OperateContent = "开工";
                    entity4Log.OperateTime = UpdateTime;
                    entity4Log.OperateUserID = UpdateUserID;
                    entity4Log.OperateUserName = UpdateUserName;
                    entity4Log.OperateTime = dtNow;
                    entity4Log.OperateUserID = UserRegister.UserID;
                    entity4Log.OperateUserName = UserRegister.UserName;
                    entity4Log.OperateNote = Note;
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)
@@ -273,12 +276,13 @@
        /// <summary>
        /// æš‚停
        /// </summary>
        public bool Pause(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Pause(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList)
        {
            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    var dtNow = DateTime.Now;
                    db.BeginTran();
                    var entity = db.Queryable<Entity.RepairTaskForm>().Where(x => x.ID == ID).First();
                    if (entity == null)
@@ -303,9 +307,9 @@
                    }
                    var bol = db.Updateable<Entity.RepairTaskForm>()
                                    .SetColumns(x => x.FormStatus == (int)eTaskStatus.Paused)
                                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                                    .SetColumns(x => x.UpdateTime == UpdateTime)
                                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                                    .SetColumns(x => x.UpdateTime == dtNow)
                                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                                    .Where(x => x.ID == ID)
                                    .ExecuteCommandHasChange();
                    if (!bol)
@@ -317,9 +321,9 @@
                    entity4Log.FormID = ID;
                    entity4Log.OperateType = (int)eTaskOperation.Pause;
                    entity4Log.OperateContent = "暂停";
                    entity4Log.OperateTime = UpdateTime;
                    entity4Log.OperateUserID = UpdateUserID;
                    entity4Log.OperateUserName = UpdateUserName;
                    entity4Log.OperateTime = dtNow;
                    entity4Log.OperateUserID = UserRegister.UserID;
                    entity4Log.OperateUserName = UserRegister.UserName;
                    entity4Log.OperateNote = Note;
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)
@@ -356,12 +360,13 @@
        /// <summary>
        /// é‡æ–°å¼€å·¥
        /// </summary>
        public bool Restart(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Restart(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList)
        {
            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    var dtNow = DateTime.Now;
                    db.BeginTran();
                    var entity = db.Queryable<Entity.RepairTaskForm>().Where(x => x.ID == ID).First();
                    if (entity == null)
@@ -376,9 +381,9 @@
                    }
                    var bol = db.Updateable<Entity.RepairTaskForm>()
                                    .SetColumns(x => x.FormStatus == (int)eTaskStatus.Restarted)
                                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                                    .SetColumns(x => x.UpdateTime == UpdateTime)
                                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                                    .SetColumns(x => x.UpdateTime == dtNow)
                                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                                    .Where(x => x.ID == ID)
                                    .ExecuteCommandHasChange();
                    if (!bol)
@@ -390,9 +395,9 @@
                    entity4Log.FormID = ID;
                    entity4Log.OperateType = (int)eTaskOperation.Restart;
                    entity4Log.OperateContent = "重新开工";
                    entity4Log.OperateTime = UpdateTime;
                    entity4Log.OperateUserID = UpdateUserID;
                    entity4Log.OperateUserName = UpdateUserName;
                    entity4Log.OperateTime = dtNow;
                    entity4Log.OperateUserID = UserRegister.UserID;
                    entity4Log.OperateUserName = UserRegister.UserName;
                    entity4Log.OperateNote = Note;
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)
@@ -429,12 +434,13 @@
        /// <summary>
        /// å®Œå·¥
        /// </summary>
        public bool Finish(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Finish(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList)
        {
            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    var dtNow = DateTime.Now;
                    db.BeginTran();
                    var entity = db.Queryable<Entity.RepairTaskForm>().Where(x => x.ID == ID).First();
                    if (entity == null)
@@ -449,9 +455,9 @@
                    }
                    var bol = db.Updateable<Entity.RepairTaskForm>()
                                    .SetColumns(x => x.FormStatus == (int)eTaskStatus.Finished)
                                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                                    .SetColumns(x => x.UpdateTime == UpdateTime)
                                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                                    .SetColumns(x => x.UpdateTime == dtNow)
                                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                                    .Where(x => x.ID == ID)
                                    .ExecuteCommandHasChange();
                    if (!bol)
@@ -463,9 +469,9 @@
                    entity4Log.FormID = ID;
                    entity4Log.OperateType = (int)eTaskOperation.Finish;
                    entity4Log.OperateContent = "完工";
                    entity4Log.OperateTime = UpdateTime;
                    entity4Log.OperateUserID = UpdateUserID;
                    entity4Log.OperateUserName = UpdateUserName;
                    entity4Log.OperateTime = dtNow;
                    entity4Log.OperateUserID = UserRegister.UserID;
                    entity4Log.OperateUserName = UserRegister.UserName;
                    entity4Log.OperateNote = Note;
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)
@@ -502,18 +508,19 @@
        /// <summary>
        /// éªŒæ”¶é€šè¿‡
        /// </summary>
        public bool Success(long ID, string Note, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Success(long ID, string Note)
        {
            using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    var dtNow = DateTime.Now;
                    db.BeginTran();
                    var bol = db.Updateable<Entity.RepairTaskForm>()
                                    .SetColumns(x => x.FormStatus == (int)eTaskStatus.Succeed)
                                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                                    .SetColumns(x => x.UpdateTime == UpdateTime)
                                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                                    .SetColumns(x => x.UpdateTime == dtNow)
                                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                                    .Where(x => x.ID == ID)
                                    .ExecuteCommandHasChange();
                    if (!bol)
@@ -525,9 +532,9 @@
                    entity4Log.FormID = ID;
                    entity4Log.OperateType = (int)eTaskOperation.Success;
                    entity4Log.OperateContent = "验收通过";
                    entity4Log.OperateTime = UpdateTime;
                    entity4Log.OperateUserID = UpdateUserID;
                    entity4Log.OperateUserName = UpdateUserName;
                    entity4Log.OperateTime = dtNow;
                    entity4Log.OperateUserID = UserRegister.UserID;
                    entity4Log.OperateUserName = UserRegister.UserName;
                    entity4Log.OperateNote = Note;
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)

 Yw.Service.Repair.Core/04-dal/02-postgresql/02-task/RepairTaskLog.cs

copy from Yw.Service.Repair.Core/4-dal/2-task/RepairTaskLog.cs
copy to Yw.Service.Repair.Core/04-dal/02-postgresql/02-task/RepairTaskLog.cs
Îļþ´Ó Yw.Service.Repair.Core/4-dal/2-task/RepairTaskLog.cs ¸´ÖÆ
@@ -1,9 +1,9 @@
namespace Yw.DAL
namespace Yw.DAL.PostgreSql
{
    /// <summary>
    /// RepairTaskLog
    /// </summary>
    public partial class RepairTaskLog : BaseDAL<Entity.RepairTaskLog>
    public partial class RepairTaskLog : BaseDAL<Entity.RepairTaskLog>, IRepairTaskLog
    {
        /// <summary>
        /// 
@@ -12,7 +12,7 @@
        {
            get
            {
                return ConfigHelper.DefaultConnectionConfig;
                return ConfigHelper.PostgreSqlConnectionConfig;
            }
        }


 Yw.Service.Repair.Core/04-dal/02-postgresql/02-task/RepairTaskLogFile.cs

copy from Yw.Service.Repair.Core/4-dal/2-task/RepairTaskLogFile.cs
copy to Yw.Service.Repair.Core/04-dal/02-postgresql/02-task/RepairTaskLogFile.cs
Îļþ´Ó Yw.Service.Repair.Core/4-dal/2-task/RepairTaskLogFile.cs ¸´ÖÆ
@@ -1,9 +1,9 @@
namespace Yw.DAL
namespace Yw.DAL.PostgreSql
{
    /// <summary>
    /// RepairTaskLogFile
    /// </summary>
    public partial class RepairTaskLogFile : BaseDAL<Entity.RepairTaskLogFile>
    public partial class RepairTaskLogFile : BaseDAL_Sorter<Entity.RepairTaskLogFile>, IRepairTaskLogFile
    {
        /// <summary>
        /// 
@@ -12,7 +12,7 @@
        {
            get
            {
                return ConfigHelper.DefaultConnectionConfig;
                return ConfigHelper.PostgreSqlConnectionConfig;
            }
        }


 Yw.Service.Repair.Core/04-dal/03-sqlite/01-request/RepairRequestFile.cs

ÎļþÃû´Ó Yw.Service.Repair.Core/4-dal/1-request/RepairRequestFile.cs ÐÞ¸Ä
@@ -1,9 +1,9 @@
namespace Yw.DAL
namespace Yw.DAL.SQLite
{
    /// <summary>
    /// RepairRequestFile
    /// </summary>
    public partial class RepairRequestFile : BaseDAL_Sorter<Entity.RepairRequestFile>
    public partial class RepairRequestFile : BaseDAL_Sorter<Entity.RepairRequestFile>, IRepairRequestFile
    {
        /// <summary>
        /// 
@@ -12,7 +12,7 @@
        {
            get
            {
                return ConfigHelper.DefaultConnectionConfig;
                return ConfigHelper.SQLiteConnectionConfig;
            }
        }


 Yw.Service.Repair.Core/04-dal/03-sqlite/01-request/RepairRequestForm.cs

copy from Yw.Service.Repair.Core/4-dal/1-request/RepairRequestForm.cs
copy to Yw.Service.Repair.Core/04-dal/03-sqlite/01-request/RepairRequestForm.cs
Îļþ´Ó Yw.Service.Repair.Core/4-dal/1-request/RepairRequestForm.cs ¸´ÖÆ
@@ -1,9 +1,9 @@
namespace Yw.DAL
namespace Yw.DAL.SQLite
{
    /// <summary>
    /// RepairRequestForm
    /// </summary>
    public partial class RepairRequestForm : BaseTraceDAL<Entity.RepairRequestForm>
    public partial class RepairRequestForm : BaseTraceDAL<Entity.RepairRequestForm>, IRepairRequestForm
    {
        /// <summary>
        /// 
@@ -12,7 +12,7 @@
        {
            get
            {
                return ConfigHelper.DefaultConnectionConfig;
                return ConfigHelper.SQLiteConnectionConfig;
            }
        }

@@ -122,15 +122,15 @@
        /// <summary>
        /// æ›´æ–° FormStatus
        /// </summary>
        public bool UpdateFormStatus(long ID, int FormStatus, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool UpdateFormStatus(long ID, int FormStatus)
        {
            using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
            {
                return db.Updateable<Entity.RepairRequestForm>()
                    .SetColumns(x => x.FormStatus == FormStatus)
                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                    .SetColumns(x => x.UpdateTime == UpdateTime)
                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                    .SetColumns(x => x.UpdateTime == DateTime.Now)
                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                    .Where(x => x.ID == ID)
                    .ExecuteCommandHasChange();
            }
@@ -146,7 +146,9 @@
                var count = GetCountOfDay(entity.CreateTime) + 1;
                entity.FormNo = $"R{entity.CreateTime.ToString("yyyyMMdd")}{count.ToString("000000")}";
            }

            entity.CreateUserID = UserRegister.UserID;
            entity.CreateUserName = UserRegister.UserName;
            entity.CreateTime = DateTime.Now;
            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                try
@@ -193,6 +195,9 @@
                var count = GetCountOfDay(entity.CreateTime) + 1;
                entity.FormNo = $"R{entity.CreateTime.ToString("yyyyMMdd")}{count.ToString("000000")}";
            }
            entity.CreateUserID = UserRegister.UserID;
            entity.CreateUserName = UserRegister.UserName;
            entity.CreateTime = DateTime.Now;
            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                try
@@ -243,18 +248,19 @@
        /// <summary>
        /// é©³å›ž
        /// </summary>
        public bool Reject(long ID, string Reason, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Reject(long ID, string Reason)
        {
            using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    var dtNow = DateTime.Now;
                    db.BeginTran();
                    var bol = db.Updateable<Entity.RepairRequestForm>()
                                    .SetColumns(x => x.FormStatus == (int)eRequestStatus.Rejected)
                                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                                    .SetColumns(x => x.UpdateTime == UpdateTime)
                                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                                    .SetColumns(x => x.UpdateTime == dtNow)
                                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                                    .Where(x => x.ID == ID)
                                    .ExecuteCommandHasChange();
                    if (!bol)
@@ -266,9 +272,9 @@
                    entity4Log.FormID = ID;
                    entity4Log.OperateType = (int)eRequestOperation.Reject;
                    entity4Log.OperateContent = "驳回";
                    entity4Log.OperateTime = UpdateTime;
                    entity4Log.OperateUserID = UpdateUserID;
                    entity4Log.OperateUserName = UpdateUserName;
                    entity4Log.OperateTime = dtNow;
                    entity4Log.OperateUserID = UserRegister.UserID;
                    entity4Log.OperateUserName = UserRegister.UserName;
                    entity4Log.OperateNote = Reason;
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)
@@ -290,12 +296,13 @@
        /// <summary>
        /// å—理
        /// </summary>
        public bool Accept(long ID, string Note, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Accept(long ID, string Note)
        {
            using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    var dtNow = DateTime.Now;
                    db.BeginTran();
                    var entity = db.Queryable<Entity.RepairRequestForm>().Where(x => x.ID == ID).First();
                    if (entity == null)
@@ -313,9 +320,9 @@

                    var bol = db.Updateable<Entity.RepairRequestForm>()
                            .SetColumns(x => x.FormStatus == (int)eRequestStatus.Accepted)
                            .SetColumns(x => x.UpdateUserID == UpdateUserID)
                            .SetColumns(x => x.UpdateTime == UpdateTime)
                            .SetColumns(x => x.UpdateUserName == UpdateUserName)
                            .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                            .SetColumns(x => x.UpdateTime == dtNow)
                            .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                            .Where(x => x.ID == ID)
                            .ExecuteCommandHasChange();
                    if (!bol)
@@ -332,9 +339,9 @@
                    entity4Log.FormID = ID;
                    entity4Log.OperateType = (int)eRequestOperation.Accept;
                    entity4Log.OperateContent = "受理";
                    entity4Log.OperateTime = UpdateTime;
                    entity4Log.OperateUserID = UpdateUserID;
                    entity4Log.OperateUserName = UpdateUserName;
                    entity4Log.OperateTime = dtNow;
                    entity4Log.OperateUserID = UserRegister.UserID;
                    entity4Log.OperateUserName = UserRegister.UserName;
                    entity4Log.OperateNote = Note;
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)
@@ -348,12 +355,12 @@
                    #region ç”Ÿæˆç»´ä¿®å•

                    var taskCount = db.Queryable<Entity.RepairTaskForm>()
                                        .Where(x => x.CreateTime >= UpdateTime.Date && x.CreateTime < UpdateTime.Date.AddDays(1)).Count();
                                        .Where(x => x.CreateTime >= dtNow.Date && x.CreateTime < dtNow.Date.AddDays(1)).Count();

                    var entity4Task = new Entity.RepairTaskForm();
                    entity4Task.EquipmentID = entity.EquipmentID;
                    entity4Task.RequestID = entity.ID;
                    entity4Task.FormNo = $"T{UpdateTime.ToString("yyyyMMdd")}{taskCount.ToString("000000")}";
                    entity4Task.FormNo = $"T{dtNow.ToString("yyyyMMdd")}{taskCount.ToString("000000")}";
                    entity4Task.FormName = entity.FormName;
                    entity4Task.FormStatus = (int)eTaskStatus.Accepted;
                    entity4Task.Faq = entity.Faq;
@@ -361,9 +368,9 @@
                    entity4Task.Urgency = entity.Urgency;
                    entity4Task.Address = entity.Address;
                    entity4Task.Location = entity.Location;
                    entity4Task.CreateUserID = UpdateUserID;
                    entity4Task.CreateTime = UpdateTime;
                    entity4Task.CreateUserName = UpdateUserName;
                    entity4Task.CreateUserID = UserRegister.UserID;
                    entity4Task.CreateTime = dtNow;
                    entity4Task.CreateUserName = UserRegister.UserName;

                    var taskId = db.Insertable(entity4Task).ExecuteReturnSnowflakeId();
                    if (taskId < 1)
@@ -379,9 +386,9 @@
                    entity4TaskLog.FormID = taskId;
                    entity4TaskLog.OperateType = (int)eTaskOperation.Accept;
                    entity4TaskLog.OperateContent = "受理";
                    entity4TaskLog.OperateTime = UpdateTime;
                    entity4TaskLog.OperateUserID = UpdateUserID;
                    entity4TaskLog.OperateUserName = UpdateUserName;
                    entity4TaskLog.OperateTime = dtNow;
                    entity4TaskLog.OperateUserID = UserRegister.UserID;
                    entity4TaskLog.OperateUserName = UserRegister.UserName;
                    entity4TaskLog.OperateNote = Note;

                    var taskLogId = db.Insertable(entity4TaskLog).ExecuteReturnSnowflakeId();

 Yw.Service.Repair.Core/04-dal/03-sqlite/01-request/RepairRequestLog.cs

copy from Yw.Service.Repair.Core/4-dal/1-request/RepairRequestLog.cs
copy to Yw.Service.Repair.Core/04-dal/03-sqlite/01-request/RepairRequestLog.cs
Îļþ´Ó Yw.Service.Repair.Core/4-dal/1-request/RepairRequestLog.cs ¸´ÖÆ
@@ -1,9 +1,9 @@
namespace Yw.DAL
namespace Yw.DAL.SQLite
{
    /// <summary>
    /// RepairRequestLog
    /// </summary>
    public partial class RepairRequestLog : BaseDAL<Entity.RepairRequestLog>
    public partial class RepairRequestLog : BaseDAL<Entity.RepairRequestLog>, IRepairRequestLog
    {
        /// <summary>
        /// 
@@ -12,7 +12,7 @@
        {
            get
            {
                return ConfigHelper.DefaultConnectionConfig;
                return ConfigHelper.SQLiteConnectionConfig;
            }
        }


 Yw.Service.Repair.Core/04-dal/03-sqlite/02-task/RepairTaskForm.cs

ÎļþÃû´Ó Yw.Service.Repair.Core/4-dal/2-task/RepairTaskForm.cs ÐÞ¸Ä
@@ -1,9 +1,9 @@
namespace Yw.DAL
namespace Yw.DAL.SQLite
{
    /// <summary>
    /// RepairTaskForm
    /// </summary>
    public partial class RepairTaskForm : BaseTraceDAL<Entity.RepairTaskForm>
    public partial class RepairTaskForm : BaseTraceDAL<Entity.RepairTaskForm>, IRepairTaskForm
    {
        /// <summary>
        /// 
@@ -12,7 +12,7 @@
        {
            get
            {
                return ConfigHelper.DefaultConnectionConfig;
                return ConfigHelper.SQLiteConnectionConfig;
            }
        }

@@ -87,15 +87,15 @@
        /// <summary>
        /// æ›´æ–° FormStatus
        /// </summary>
        public bool UpdateFormStatus(long ID, int FormStatus, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool UpdateFormStatus(long ID, int FormStatus)
        {
            using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
            {
                return db.Updateable<Entity.RepairTaskForm>()
                    .SetColumns(x => x.FormStatus == FormStatus)
                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                    .SetColumns(x => x.UpdateTime == UpdateTime)
                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                    .SetColumns(x => x.UpdateTime == DateTime.Now)
                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                    .Where(x => x.ID == ID)
                    .ExecuteCommand() > 0;
            }
@@ -104,20 +104,21 @@
        /// <summary>
        /// æ´¾å•
        /// </summary>
        public bool Assign(long ID, long RepairUserID, string RepairUserName, string Note, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Assign(long ID, long RepairUserID, string RepairUserName, string Note)
        {
            using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    var dt = DateTime.Now;
                    db.BeginTran();
                    var bol = db.Updateable<Entity.RepairTaskForm>()
                                    .SetColumns(x => x.FormStatus == (int)eTaskStatus.Assigned)
                                    .SetColumns(x => x.RepairUserID == RepairUserID)
                                    .SetColumns(x => x.RepairUserName == RepairUserName)
                                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                                    .SetColumns(x => x.UpdateTime == UpdateTime)
                                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                                    .SetColumns(x => x.UpdateTime == dt)
                                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                                    .Where(x => x.ID == ID)
                                    .ExecuteCommand() > 0;
                    if (!bol)
@@ -129,9 +130,9 @@
                    entity4Log.FormID = ID;
                    entity4Log.OperateType = (int)eTaskOperation.Assign;
                    entity4Log.OperateContent = "派单";
                    entity4Log.OperateTime = UpdateTime;
                    entity4Log.OperateUserID = UpdateUserID;
                    entity4Log.OperateUserName = UpdateUserName;
                    entity4Log.OperateTime = dt;
                    entity4Log.OperateUserID = UserRegister.UserID;
                    entity4Log.OperateUserName = UserRegister.UserName;
                    entity4Log.OperateNote = Note;
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)
@@ -153,18 +154,19 @@
        /// <summary>
        /// æŽ¥å•
        /// </summary>
        public bool Receive(long ID, string Note, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Receive(long ID, string Note)
        {
            using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    var dtNow = DateTime.Now;
                    db.BeginTran();
                    var bol = db.Updateable<Entity.RepairTaskForm>()
                                    .SetColumns(x => x.FormStatus == (int)eTaskStatus.Received)
                                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                                    .SetColumns(x => x.UpdateTime == UpdateTime)
                                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                                    .SetColumns(x => x.UpdateTime == dtNow)
                                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                                    .Where(x => x.ID == ID)
                                    .ExecuteCommandHasChange();
                    if (!bol)
@@ -176,9 +178,9 @@
                    entity4Log.FormID = ID;
                    entity4Log.OperateType = (int)eTaskOperation.Receive;
                    entity4Log.OperateContent = "接单";
                    entity4Log.OperateTime = UpdateTime;
                    entity4Log.OperateUserID = UpdateUserID;
                    entity4Log.OperateUserName = UpdateUserName;
                    entity4Log.OperateTime = dtNow;
                    entity4Log.OperateUserID = UserRegister.UserID;
                    entity4Log.OperateUserName = UserRegister.UserName;
                    entity4Log.OperateNote = Note;
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)
@@ -200,12 +202,13 @@
        /// <summary>
        /// å¼€å·¥
        /// </summary>
        public bool Start(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Start(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList)
        {
            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    var dtNow = DateTime.Now;
                    db.BeginTran();
                    var entity = db.Queryable<Entity.RepairTaskForm>().Where(x => x.ID == ID).First();
                    if (entity == null)
@@ -220,9 +223,9 @@
                    }
                    var bol = db.Updateable<Entity.RepairTaskForm>()
                                    .SetColumns(x => x.FormStatus == (int)eTaskStatus.Started)
                                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                                    .SetColumns(x => x.UpdateTime == UpdateTime)
                                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                                    .SetColumns(x => x.UpdateTime == dtNow)
                                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                                    .Where(x => x.ID == ID)
                                    .ExecuteCommand() > 0;
                    if (!bol)
@@ -234,9 +237,9 @@
                    entity4Log.FormID = ID;
                    entity4Log.OperateType = (int)eTaskOperation.Start;
                    entity4Log.OperateContent = "开工";
                    entity4Log.OperateTime = UpdateTime;
                    entity4Log.OperateUserID = UpdateUserID;
                    entity4Log.OperateUserName = UpdateUserName;
                    entity4Log.OperateTime = dtNow;
                    entity4Log.OperateUserID = UserRegister.UserID;
                    entity4Log.OperateUserName = UserRegister.UserName;
                    entity4Log.OperateNote = Note;
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)
@@ -273,12 +276,13 @@
        /// <summary>
        /// æš‚停
        /// </summary>
        public bool Pause(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Pause(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList)
        {
            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    var dtNow = DateTime.Now;
                    db.BeginTran();
                    var entity = db.Queryable<Entity.RepairTaskForm>().Where(x => x.ID == ID).First();
                    if (entity == null)
@@ -303,9 +307,9 @@
                    }
                    var bol = db.Updateable<Entity.RepairTaskForm>()
                                    .SetColumns(x => x.FormStatus == (int)eTaskStatus.Paused)
                                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                                    .SetColumns(x => x.UpdateTime == UpdateTime)
                                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                                    .SetColumns(x => x.UpdateTime == dtNow)
                                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                                    .Where(x => x.ID == ID)
                                    .ExecuteCommandHasChange();
                    if (!bol)
@@ -317,9 +321,9 @@
                    entity4Log.FormID = ID;
                    entity4Log.OperateType = (int)eTaskOperation.Pause;
                    entity4Log.OperateContent = "暂停";
                    entity4Log.OperateTime = UpdateTime;
                    entity4Log.OperateUserID = UpdateUserID;
                    entity4Log.OperateUserName = UpdateUserName;
                    entity4Log.OperateTime = dtNow;
                    entity4Log.OperateUserID = UserRegister.UserID;
                    entity4Log.OperateUserName = UserRegister.UserName;
                    entity4Log.OperateNote = Note;
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)
@@ -356,12 +360,13 @@
        /// <summary>
        /// é‡æ–°å¼€å·¥
        /// </summary>
        public bool Restart(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Restart(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList)
        {
            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    var dtNow = DateTime.Now;
                    db.BeginTran();
                    var entity = db.Queryable<Entity.RepairTaskForm>().Where(x => x.ID == ID).First();
                    if (entity == null)
@@ -376,9 +381,9 @@
                    }
                    var bol = db.Updateable<Entity.RepairTaskForm>()
                                    .SetColumns(x => x.FormStatus == (int)eTaskStatus.Restarted)
                                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                                    .SetColumns(x => x.UpdateTime == UpdateTime)
                                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                                    .SetColumns(x => x.UpdateTime == dtNow)
                                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                                    .Where(x => x.ID == ID)
                                    .ExecuteCommandHasChange();
                    if (!bol)
@@ -390,9 +395,9 @@
                    entity4Log.FormID = ID;
                    entity4Log.OperateType = (int)eTaskOperation.Restart;
                    entity4Log.OperateContent = "重新开工";
                    entity4Log.OperateTime = UpdateTime;
                    entity4Log.OperateUserID = UpdateUserID;
                    entity4Log.OperateUserName = UpdateUserName;
                    entity4Log.OperateTime = dtNow;
                    entity4Log.OperateUserID = UserRegister.UserID;
                    entity4Log.OperateUserName = UserRegister.UserName;
                    entity4Log.OperateNote = Note;
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)
@@ -429,12 +434,13 @@
        /// <summary>
        /// å®Œå·¥
        /// </summary>
        public bool Finish(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Finish(long ID, string Note, List<Entity.RepairTaskLogFile> entity4FileList)
        {
            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    var dtNow = DateTime.Now;
                    db.BeginTran();
                    var entity = db.Queryable<Entity.RepairTaskForm>().Where(x => x.ID == ID).First();
                    if (entity == null)
@@ -449,9 +455,9 @@
                    }
                    var bol = db.Updateable<Entity.RepairTaskForm>()
                                    .SetColumns(x => x.FormStatus == (int)eTaskStatus.Finished)
                                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                                    .SetColumns(x => x.UpdateTime == UpdateTime)
                                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                                    .SetColumns(x => x.UpdateTime == dtNow)
                                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                                    .Where(x => x.ID == ID)
                                    .ExecuteCommandHasChange();
                    if (!bol)
@@ -463,9 +469,9 @@
                    entity4Log.FormID = ID;
                    entity4Log.OperateType = (int)eTaskOperation.Finish;
                    entity4Log.OperateContent = "完工";
                    entity4Log.OperateTime = UpdateTime;
                    entity4Log.OperateUserID = UpdateUserID;
                    entity4Log.OperateUserName = UpdateUserName;
                    entity4Log.OperateTime = dtNow;
                    entity4Log.OperateUserID = UserRegister.UserID;
                    entity4Log.OperateUserName = UserRegister.UserName;
                    entity4Log.OperateNote = Note;
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)
@@ -502,18 +508,19 @@
        /// <summary>
        /// éªŒæ”¶é€šè¿‡
        /// </summary>
        public bool Success(long ID, string Note, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Success(long ID, string Note)
        {
            using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    var dtNow = DateTime.Now;
                    db.BeginTran();
                    var bol = db.Updateable<Entity.RepairTaskForm>()
                                    .SetColumns(x => x.FormStatus == (int)eTaskStatus.Succeed)
                                    .SetColumns(x => x.UpdateUserID == UpdateUserID)
                                    .SetColumns(x => x.UpdateTime == UpdateTime)
                                    .SetColumns(x => x.UpdateUserName == UpdateUserName)
                                    .SetColumns(x => x.UpdateUserID == UserRegister.UserID)
                                    .SetColumns(x => x.UpdateTime == dtNow)
                                    .SetColumns(x => x.UpdateUserName == UserRegister.UserName)
                                    .Where(x => x.ID == ID)
                                    .ExecuteCommandHasChange();
                    if (!bol)
@@ -525,9 +532,9 @@
                    entity4Log.FormID = ID;
                    entity4Log.OperateType = (int)eTaskOperation.Success;
                    entity4Log.OperateContent = "验收通过";
                    entity4Log.OperateTime = UpdateTime;
                    entity4Log.OperateUserID = UpdateUserID;
                    entity4Log.OperateUserName = UpdateUserName;
                    entity4Log.OperateTime = dtNow;
                    entity4Log.OperateUserID = UserRegister.UserID;
                    entity4Log.OperateUserName = UserRegister.UserName;
                    entity4Log.OperateNote = Note;
                    var logId = db.Insertable(entity4Log).ExecuteReturnSnowflakeId();
                    if (logId < 1)

 Yw.Service.Repair.Core/04-dal/03-sqlite/02-task/RepairTaskLog.cs

ÎļþÃû´Ó Yw.Service.Repair.Core/4-dal/2-task/RepairTaskLog.cs ÐÞ¸Ä
@@ -1,9 +1,9 @@
namespace Yw.DAL
namespace Yw.DAL.SQLite
{
    /// <summary>
    /// RepairTaskLog
    /// </summary>
    public partial class RepairTaskLog : BaseDAL<Entity.RepairTaskLog>
    public partial class RepairTaskLog : BaseDAL<Entity.RepairTaskLog>, IRepairTaskLog
    {
        /// <summary>
        /// 
@@ -12,7 +12,7 @@
        {
            get
            {
                return ConfigHelper.DefaultConnectionConfig;
                return ConfigHelper.SQLiteConnectionConfig;
            }
        }


 Yw.Service.Repair.Core/04-dal/03-sqlite/02-task/RepairTaskLogFile.cs

ÎļþÃû´Ó Yw.Service.Repair.Core/4-dal/2-task/RepairTaskLogFile.cs ÐÞ¸Ä
@@ -1,9 +1,9 @@
namespace Yw.DAL
namespace Yw.DAL.SQLite
{
    /// <summary>
    /// RepairTaskLogFile
    /// </summary>
    public partial class RepairTaskLogFile : BaseDAL<Entity.RepairTaskLogFile>
    public partial class RepairTaskLogFile : BaseDAL_Sorter<Entity.RepairTaskLogFile>, IRepairTaskLogFile
    {
        /// <summary>
        /// 
@@ -12,7 +12,7 @@
        {
            get
            {
                return ConfigHelper.DefaultConnectionConfig;
                return ConfigHelper.SQLiteConnectionConfig;
            }
        }


 Yw.Service.Repair.Core/5-service/00-helper/CacheHelper.cs

 Yw.Service.Repair.Core/5-service/00-helper/DALCreateHelper.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
namespace Yw.Service.Repair
{
    /// <summary>
    /// DAL辅助类
    /// </summary>
    internal class DALCreateHelper
    {
        /// <summary>
        /// åˆ›å»ºDAL
        /// </summary>
        /// <typeparam name="T"></typeparam>
        /// <returns></returns>
        public static T CreateDAL<T>()
        {
            var dbType = Settings.RepairParasHelper.Repair.DataBase.DbType;
            return Yw.DALFactory.CreateDAL<T>(dbType);
        }
    }
}

 Yw.Service.Repair.Core/5-service/00-helper/Extensions.cs

 Yw.Service.Repair.Core/5-service/01-request/01-form/RepairRequestForm.cs

ÎļþÃû´Ó Yw.Service.Repair.Core/5-service/1-request/1-form/RepairRequestForm.cs ÐÞ¸Ä
@@ -5,7 +5,7 @@
    /// </summary>
    public partial class RepairRequestForm
    {
        private readonly DAL.RepairRequestForm _dal = new DAL.RepairRequestForm();
        private readonly DAL.IRepairRequestForm _dal = DALCreateHelper.CreateDAL<DAL.IRepairRequestForm>();

        #region Query

@@ -234,27 +234,27 @@
        /// <summary>
        /// æ›´æ–° FormStatus
        /// </summary>
        public bool UpdateFormStatus(long ID, eRequestStatus FormStatus, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool UpdateFormStatus(long ID, eRequestStatus FormStatus)
        {
            var bol = _dal.UpdateFormStatus(ID, (int)FormStatus, UpdateUserID, UpdateTime, UpdateUserName);
            var bol = _dal.UpdateFormStatus(ID, (int)FormStatus);
            return bol;
        }

        /// <summary>
        /// é©³å›ž
        /// </summary>
        public bool Reject(long ID, string Reason, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Reject(long ID, string Reason)
        {
            var bol = _dal.Reject(ID, Reason, UpdateUserID, UpdateTime, UpdateUserName);
            var bol = _dal.Reject(ID, Reason);
            return bol;
        }

        /// <summary>
        /// å—理
        /// </summary>
        public bool Accept(long ID, string Note, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Accept(long ID, string Note)
        {
            var bol = _dal.Accept(ID, Note, UpdateUserID, UpdateTime, UpdateUserName);
            var bol = _dal.Accept(ID, Note);
            return bol;
        }

@@ -269,8 +269,7 @@
        public bool DeleteByID(long ID, out string Msg)
        {
            Msg = string.Empty;
            var dal = new DAL.RepairRequestForm();
            var bol = dal.DeleteByID(ID);
            var bol = _dal.DeleteByID(ID);
            return bol;
        }


 Yw.Service.Repair.Core/5-service/01-request/01-form/RepairRequestForm_Instance.cs

 Yw.Service.Repair.Core/5-service/01-request/02-file/RepairRequestFile.cs

ÎļþÃû´Ó Yw.Service.Repair.Core/5-service/1-request/2-file/RepairRequestFile.cs ÐÞ¸Ä
@@ -5,7 +5,7 @@
    /// </summary>
    public partial class RepairRequestFile
    {
        private readonly DAL.RepairRequestFile _dal = new DAL.RepairRequestFile();
        private readonly DAL.IRepairRequestFile _dal = DALCreateHelper.CreateDAL<DAL.IRepairRequestFile>();

        /// <summary>
        /// æ‰¹é‡æ’å…¥

 Yw.Service.Repair.Core/5-service/01-request/02-file/RepairRequestFile_Instance.cs

 Yw.Service.Repair.Core/5-service/01-request/03-log/RepairRequestLog.cs

ÎļþÃû´Ó Yw.Service.Repair.Core/5-service/1-request/3-log/RepairRequestLog.cs ÐÞ¸Ä
@@ -5,7 +5,7 @@
    /// </summary>
    public partial class RepairRequestLog
    {
        private readonly DAL.RepairRequestLog _dal = new DAL.RepairRequestLog();
        private readonly DAL.IRepairRequestLog _dal = DALCreateHelper.CreateDAL<DAL.IRepairRequestLog>();

        /// <summary>
        /// é€šè¿‡ FormID èŽ·å–

 Yw.Service.Repair.Core/5-service/01-request/03-log/RepairRequestLog_Instance.cs

 Yw.Service.Repair.Core/5-service/02-task/01-form/RepairTaskForm.cs

ÎļþÃû´Ó Yw.Service.Repair.Core/5-service/2-task/1-form/RepairTaskForm.cs ÐÞ¸Ä
@@ -1,17 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Yw.Service
namespace Yw.Service
{
    /// <summary>
    /// ç»´ä¿®å•
    /// </summary>
    public partial class RepairTaskForm
    {
        private readonly DAL.RepairTaskForm _dal = new DAL.RepairTaskForm();
        private readonly DAL.IRepairTaskForm _dal = DALCreateHelper.CreateDAL<DAL.IRepairTaskForm>();

        #region Query

@@ -239,76 +233,76 @@
        /// <summary>
        /// æ›´æ–° FormStatus
        /// </summary>
        public bool UpdateFormStatus(long ID, eTaskStatus FormStatus, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool UpdateFormStatus(long ID, eTaskStatus FormStatus)
        {
            var bol = _dal.UpdateFormStatus(ID, (int)FormStatus, UpdateUserID, UpdateTime, UpdateUserName);
            var bol = _dal.UpdateFormStatus(ID, (int)FormStatus);
            return bol;
        }

        /// <summary>
        /// æ´¾å•
        /// </summary>
        public bool Assign(long ID, long RepairUserID, string RepairUserName, string Note, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Assign(long ID, long RepairUserID, string RepairUserName, string Note)
        {
            var bol = _dal.Assign(ID, RepairUserID, RepairUserName, Note, UpdateUserID, UpdateTime, UpdateUserName);
            var bol = _dal.Assign(ID, RepairUserID, RepairUserName, Note);
            return bol;
        }

        /// <summary>
        /// æŽ¥å•
        /// </summary>
        public bool Receive(long ID, string Note, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Receive(long ID, string Note)
        {
            var bol = _dal.Receive(ID, Note, UpdateUserID, UpdateTime, UpdateUserName);
            var bol = _dal.Receive(ID, Note);
            return bol;
        }

        /// <summary>
        /// å¼€å·¥
        /// </summary>
        public bool Start(long ID, string Note, List<Model.RepairTaskLogFile> fileList, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Start(long ID, string Note, List<Model.RepairTaskLogFile> fileList)
        {
            var entity4FileList = Model2Entities(fileList);
            var bol = _dal.Start(ID, Note, entity4FileList, UpdateUserID, UpdateTime, UpdateUserName);
            var bol = _dal.Start(ID, Note, entity4FileList);
            return bol;
        }

        /// <summary>
        /// æš‚停
        /// </summary>
        public bool Pause(long ID, string Note, List<Model.RepairTaskLogFile> fileList, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Pause(long ID, string Note, List<Model.RepairTaskLogFile> fileList)
        {
            var entity4FileList = Model2Entities(fileList);
            var bol = _dal.Pause(ID, Note, entity4FileList, UpdateUserID, UpdateTime, UpdateUserName);
            var bol = _dal.Pause(ID, Note, entity4FileList);
            return bol;
        }

        /// <summary>
        /// é‡æ–°å¼€å·¥
        /// </summary>
        public bool Restart(long ID, string Note, List<Model.RepairTaskLogFile> fileList, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Restart(long ID, string Note, List<Model.RepairTaskLogFile> fileList)
        {
            var entity4FileList = Model2Entities(fileList);
            var bol = _dal.Restart(ID, Note, entity4FileList, UpdateUserID, UpdateTime, UpdateUserName);
            var bol = _dal.Restart(ID, Note, entity4FileList);
            return bol;
        }

        /// <summary>
        /// å®Œå·¥
        /// </summary>
        public bool Finish(long ID, string Note, List<Model.RepairTaskLogFile> fileList, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Finish(long ID, string Note, List<Model.RepairTaskLogFile> fileList)
        {
            var entity4FileList = Model2Entities(fileList);
            var bol = _dal.Finish(ID, Note, entity4FileList, UpdateUserID, UpdateTime, UpdateUserName);
            var bol = _dal.Finish(ID, Note, entity4FileList);
            return bol;
        }

        /// <summary>
        /// éªŒæ”¶é€šè¿‡
        /// </summary>
        public bool Success(long ID, string Note, long UpdateUserID, DateTime UpdateTime, string UpdateUserName)
        public bool Success(long ID, string Note)
        {
            var bol = _dal.Success(ID, Note, UpdateUserID, UpdateTime, UpdateUserName);
            var bol = _dal.Success(ID, Note);
            return bol;
        }

@@ -323,8 +317,7 @@
        public bool DeleteByID(long ID, out string Msg)
        {
            Msg = string.Empty;
            var dal = new DAL.RepairTaskForm();
            var bol = dal.DeleteByID(ID);
            var bol = _dal.DeleteByID(ID);
            return bol;
        }


 Yw.Service.Repair.Core/5-service/02-task/01-form/RepairTaskForm_Instance.cs

 Yw.Service.Repair.Core/5-service/02-task/02-log/RepairTaskLog.cs

ÎļþÃû´Ó Yw.Service.Repair.Core/5-service/2-task/2-log/RepairTaskLog.cs ÐÞ¸Ä
@@ -5,7 +5,7 @@
    /// </summary>
    public partial class RepairTaskLog
    {
        private readonly DAL.RepairTaskLog _dal = new DAL.RepairTaskLog();
        private readonly DAL.IRepairTaskLog _dal = DALCreateHelper.CreateDAL<DAL.IRepairTaskLog>();

        /// <summary>
        /// é€šè¿‡ FormID èŽ·å–

 Yw.Service.Repair.Core/5-service/02-task/02-log/RepairTaskLog_Instance.cs

 Yw.Service.Repair.Core/5-service/02-task/03-file/RepairTaskLogFile.cs

ÎļþÃû´Ó Yw.Service.Repair.Core/5-service/2-task/3-file/RepairTaskLogFile.cs ÐÞ¸Ä
@@ -5,7 +5,7 @@
    /// </summary>
    public partial class RepairTaskLogFile
    {
        private readonly DAL.RepairTaskLogFile _dal = new DAL.RepairTaskLogFile();
        private readonly DAL.IRepairTaskLogFile _dal = DALCreateHelper.CreateDAL<DAL.IRepairTaskLogFile>();

        /// <summary>
        /// æ‰¹é‡æ’å…¥

 Yw.Service.Repair.Core/5-service/02-task/03-file/RepairTaskLogFile_Instance.cs

 Yw.Service.Repair.Core/GlobalUsings.cs

@@ -7,7 +7,6 @@
global using System.Collections;
global using SqlSugar;
global using AutoMapper;
global using Yw.Newtonsoft;
global using Yw.Repair;
global using Yw.Model.Repair;
global using Yw.Settings;

 Yw.Service.Repair.Core/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,6 +4,6 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-01-22T03:22:37.7738541Z;True|2023-12-25T15:19:27.1723882+08:00;True|2023-12-04T18:24:01.9884855+08:00;True|2023-07-13T11:54:33.7989040+08:00;True|2023-07-13T11:54:23.3967174+08:00;True|2023-07-06T09:49:52.7407983+08:00;True|2023-05-25T15:37:23.5406830+08:00;False|2023-05-25T15:36:09.3589239+08:00;</History>
    <History>True|2024-03-25T04:19:12.1673258Z;True|2024-01-22T11:22:37.7738541+08:00;True|2023-12-25T15:19:27.1723882+08:00;True|2023-12-04T18:24:01.9884855+08:00;True|2023-07-13T11:54:33.7989040+08:00;True|2023-07-13T11:54:23.3967174+08:00;True|2023-07-06T09:49:52.7407983+08:00;True|2023-05-25T15:37:23.5406830+08:00;False|2023-05-25T15:36:09.3589239+08:00;</History>
  </PropertyGroup>
</Project>

 Yw.Service.Repair.Core/Yw.Service.Repair.Core.csproj

@@ -7,7 +7,7 @@
        <RootNamespace>Yw</RootNamespace>
        <GenerateDocumentationFile>True</GenerateDocumentationFile>
        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
        <Version>1.0.2</Version>
        <Version>3.0.0</Version>
        <Description>引用升级</Description>
    </PropertyGroup>

@@ -27,7 +27,11 @@
    </ItemGroup>

    <ItemGroup>
      <PackageReference Include="Yw.Service.Core" Version="1.1.6" />
      <PackageReference Include="Yw.DAL.PostgreSql.Core" Version="3.0.0" />
      <PackageReference Include="Yw.DAL.SQLite.Core" Version="3.0.0" />
      <PackageReference Include="Yw.DALFactory.Core" Version="3.0.0" />
      <PackageReference Include="Yw.IDAL.Core" Version="3.0.0" />
      <PackageReference Include="Yw.Service.Core" Version="3.0.0" />
    </ItemGroup>

    <ItemGroup>

 Yw.Service.Repair.Core/paras_repair_settings.json

@@ -4,7 +4,13 @@

  "Repair": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=yw_repair;HOST=localhost;PASSWORD=123456;USER ID=postgres;"
      "DbType": "PostgreSql", //PostgreSql、SQLite
      "PostgreSql": {
        "ConnectString": "PORT=5432;DATABASE=yw_repair;HOST=localhost;PASSWORD=123456;USER ID=postgres;"
      },
      "SQLite": {
        "ConnectString": "Data Source=yw_repair.db;"
      }
    },
    "DataFolder": "Repair"
  }