ZhongRui/ALDbanyunxiangmu.git

			@@ -1,5 +1,10 @@
			ï»¿using WIDESEA_Core.BaseRepository;
			ï»¿using AutoMapper;
			using Microsoft.Extensions.Logging;
			using System.Transactions;
			using WIDESEA_Core;
			using WIDESEA_Core.BaseRepository;
			using WIDESEA_Core.BaseServices;
			using WIDESEA_Core.Enums;
			using WIDESEA_ITaskInfoService;
			using WIDESEA_Model.Models;

			@@ -7,7 +12,63 @@

			public class Task_HtyService : ServiceBase<Dt_Task_Hty, IRepository<Dt_Task_Hty>>, ITask_HtyService
			{
			public Task_HtyService(IRepository<Dt_Task_Hty> BaseDal) : base(BaseDal)
			private readonly ILogger<Task_HtyService> _logger;
			private readonly IRepository<Dt_Task> _taskRepository;
			private readonly IMapper _mapper; // AutoMapperå®ä¾
			public Task_HtyService(IRepository<Dt_Task_Hty> BaseDal, IMapper mapper, ILogger<Task_HtyService> logger, IRepository<Dt_Task> taskRepository) : base(BaseDal)
			{
			_mapper = mapper;
			_logger = logger;
			_taskRepository = taskRepository;
			}
			public bool DeleteAndMoveIntoHty(Dt_Task task, OperateTypeEnum operateType)
			{
			// using var transaction = Db.Ado.UseTran();
			try
			{
			_taskRepository.DeleteAndMoveIntoHty(task, operateType);

			return true;

			//var historyEntity = _mapper.Map<Dt_Task_Hty>(task);

			// // 2. å¡«ååå²å®ä½æ ¸å¿åæ®µ
			// historyEntity.SourceId = task.TaskId;
			// historyEntity.OperateType = App.User?.UserName != null ? OperateTypeEnum.èªå¨å®æ.ToString() : OperateTypeEnum.äººå·¥å®æ.ToString();
			// historyEntity.Creater = App.User?.UserName != null ? App.User.UserName : "System";

			// // è¦çä¿®æ¹äºº/ä¿®æ¹æ¶é´ï¼ä¼åçº§é«äºæ å°ï¼
			//// historyEntity.Modifier = App.User?.UserId > 0 ? App.User?.UserName : "System";
			//// historyEntity.ModifyDate = DateTime.Now;

			// // 3. æå¥åå²è¡¨ï¼ç±»åå®å¨ï¼æ åå°æ¼æ¥è¡¨åï¼

			// int insertCount = Db.Insertable(historyEntity).ExecuteCommand();

			// if (insertCount <= 0)
			// {
			// _logger.LogError($"ä»»å¡åå²è¡¨Dt_Task_Hty [{task.TaskNum}]æå¥å¤±è´¥ï¼å½±åè¡æ°ä¸º0");
			// // transaction.RollbackTran();
			// return false;
			// }

			// // 4. å é¤åå®ä½ï¼ç±»åå®å¨ï¼
			// int deleteCount = Db.Deleteable(task).ExecuteCommand();
			// if (deleteCount <= 0)
			// {
			// _logger.LogError("ä»»å¡ä¸å¡å®ä½[{0}]å é¤å¤±è´¥ï¼å½±åè¡æ°ä¸º0", task.TaskNum);
			// // transaction.RollbackTran();
			// return false;
			// }
			// //transaction.CommitTran();
			// _logger.LogInformation("ä»»å¡å®ä½[{0}]å·²æåç§»å¥åå²è¡¨[{1}]å¹¶å é¤åæ°æ®", task.TaskNum);
			// return true;
			}
			catch (Exception ex)
			{
			// transaction.RollbackTran();
			_logger.LogError(ex, "ä»»å¡å é¤å®ä½[{0}]å¹¶ç§»å¥åå²è¡¨å¤±è´¥", task.TaskNum);
			return false;
			}
			}
			}