From 2c86a8bd60deed0dd0e044bad6fb83f75d19a332 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 26 十月 2025 15:05:50 +0800
Subject: [PATCH] Merge branch 'feature-task'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java | 1058 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 1,058 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java
new file mode 100644
index 0000000..ac521d2
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java
@@ -0,0 +1,1058 @@
+package com.ruoyi.system.service.impl;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.stream.Collectors;
+import java.io.File;
+import java.io.IOException;
+
+import com.ruoyi.system.utils.TaskCodeGenerator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.GpsDistanceUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.system.domain.SysTask;
+import com.ruoyi.system.domain.SysTaskVehicle;
+import com.ruoyi.system.domain.SysTaskAttachment;
+import com.ruoyi.system.domain.SysTaskLog;
+import com.ruoyi.system.domain.SysTaskEmergency;
+import com.ruoyi.system.domain.SysTaskWelfare;
+import com.ruoyi.system.domain.SysTaskAssignee;
+import com.ruoyi.system.domain.vo.TaskQueryVO;
+import com.ruoyi.system.domain.vo.TaskCreateVO;
+import com.ruoyi.system.domain.vo.TaskUpdateVO;
+import com.ruoyi.system.domain.vo.TaskStatisticsVO;
+import com.ruoyi.system.domain.enums.TaskStatus;
+import com.ruoyi.system.mapper.SysTaskMapper;
+import com.ruoyi.system.mapper.SysTaskVehicleMapper;
+import com.ruoyi.system.mapper.SysTaskAttachmentMapper;
+import com.ruoyi.system.mapper.SysTaskLogMapper;
+import com.ruoyi.system.mapper.SysTaskEmergencyMapper;
+import com.ruoyi.system.mapper.SysTaskWelfareMapper;
+import com.ruoyi.system.mapper.SysTaskAssigneeMapper;
+import com.ruoyi.system.mapper.VehicleInfoMapper;
+import com.ruoyi.system.domain.VehicleInfo;
+import com.ruoyi.system.service.ISysTaskService;
+import com.ruoyi.system.service.ILegacySystemSyncService;
+import com.ruoyi.system.event.TaskCreatedEvent;
+import com.ruoyi.system.event.TaskAssignedEvent;
+import com.ruoyi.system.event.TaskStatusChangedEvent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
+
+/**
+ * 浠诲姟绠＄悊Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2024-01-15
+ */
+@Service
+public class SysTaskServiceImpl implements ISysTaskService {
+
+ @Autowired
+ private SysTaskMapper sysTaskMapper;
+
+ @Autowired
+ private SysTaskVehicleMapper sysTaskVehicleMapper;
+
+ @Autowired
+ private SysTaskAttachmentMapper sysTaskAttachmentMapper;
+
+ @Autowired
+ private SysTaskLogMapper sysTaskLogMapper;
+
+ @Autowired
+ private SysTaskEmergencyMapper sysTaskEmergencyMapper;
+
+ @Autowired
+ private SysTaskWelfareMapper sysTaskWelfareMapper;
+
+ @Autowired
+ private SysTaskAssigneeMapper sysTaskAssigneeMapper;
+
+ @Autowired
+ private VehicleInfoMapper vehicleInfoMapper;
+
+ @Autowired(required = false)
+ private ILegacySystemSyncService legacySystemSyncService;
+
+ @Autowired
+ private ApplicationEventPublisher eventPublisher;
+
+ /**
+ * 鏌ヨ浠诲姟绠＄悊
+ *
+ * @param taskId 浠诲姟绠＄悊涓婚敭
+ * @return 浠诲姟绠＄悊
+ */
+ @Override
+ public SysTask selectSysTaskByTaskId(Long taskId) {
+ SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
+ if (task != null) {
+ // 鍔犺浇鎬ユ晳杞繍鎵╁睍淇℃伅
+ if ("EMERGENCY_TRANSFER".equals(task.getTaskType())) {
+ SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
+ task.setEmergencyInfo(emergencyInfo);
+ }
+ // 鍔犺浇绂忕杞︽墿灞曚俊鎭�
+ else if ("WELFARE".equals(task.getTaskType())) {
+ SysTaskWelfare welfareInfo = sysTaskWelfareMapper.selectSysTaskWelfareByTaskId(taskId);
+ task.setWelfareInfo(welfareInfo);
+ }
+ }
+ return task;
+ }
+
+ /**
+ * 鏌ヨ浠诲姟绠＄悊鍒楄〃
+ *
+ * @param queryVO 浠诲姟鏌ヨ瀵硅薄
+ * @return 浠诲姟绠＄悊
+ */
+ @Override
+ public List<SysTask> selectSysTaskList(TaskQueryVO queryVO) {
+ return sysTaskMapper.selectSysTaskList(queryVO);
+ }
+
+ /**
+ * 鏂板浠诲姟绠＄悊
+ *
+ * @param createVO 浠诲姟鍒涘缓瀵硅薄
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public int insertSysTask(TaskCreateVO createVO) {
+ SysTask task = new SysTask();
+ task.setTaskCode(generateTaskCode());
+ task.setTaskType(createVO.getTaskType());
+ task.setTaskStatus(TaskStatus.PENDING.getCode());
+ task.setTaskDescription(createVO.getTaskDescription());
+ task.setPlannedStartTime(createVO.getPlannedStartTime());
+ task.setPlannedEndTime(createVO.getPlannedEndTime());
+ task.setAssigneeId(createVO.getAssigneeId());
+ task.setCreatorId(SecurityUtils.getUserId());
+ // 浼樺厛浣跨敤鍓嶇浼犲叆鐨勯儴闂↖D锛屽鏋滄病鏈夊垯浣跨敤褰撳墠鐢ㄦ埛鐨勯儴闂↖D
+ task.setDeptId(createVO.getDeptId() != null ? createVO.getDeptId() : SecurityUtils.getDeptId());
+ task.setCreateBy(SecurityUtils.getUsername());
+ task.setCreateTime(DateUtils.getNowDate());
+ task.setUpdateBy(SecurityUtils.getUsername());
+ task.setUpdateTime(DateUtils.getNowDate());
+ task.setRemark(createVO.getRemark());
+ task.setDelFlag("0");
+
+ // 璁剧疆閫氱敤鍦板潃鍜屽潗鏍囦俊鎭�
+ if (createVO.getDepartureAddress() != null) {
+ task.setDepartureAddress(createVO.getDepartureAddress());
+ }
+ if (createVO.getDestinationAddress() != null) {
+ task.setDestinationAddress(createVO.getDestinationAddress());
+ }
+ if (createVO.getDepartureLongitude() != null) {
+ task.setDepartureLongitude(createVO.getDepartureLongitude());
+ }
+ if (createVO.getDepartureLatitude() != null) {
+ task.setDepartureLatitude(createVO.getDepartureLatitude());
+ }
+ if (createVO.getDestinationLongitude() != null) {
+ task.setDestinationLongitude(createVO.getDestinationLongitude());
+ }
+ if (createVO.getDestinationLatitude() != null) {
+ task.setDestinationLatitude(createVO.getDestinationLatitude());
+ }
+ if (createVO.getEstimatedDistance() != null) {
+ task.setEstimatedDistance(createVO.getEstimatedDistance());
+ }
+
+ // 璁剧疆鎬ユ晳杞繍鐗瑰畾淇℃伅
+ if (createVO.getTransferTime() != null) {
+ task.setPlannedStartTime(createVO.getTransferTime());
+ }
+ if (createVO.getTransferDistance() != null) {
+ task.setEstimatedDistance(createVO.getTransferDistance());
+ }
+
+ // 璁剧疆绂忕杞︾壒瀹氫俊鎭�
+ if (createVO.getServiceTime() != null) {
+ task.setPlannedStartTime(createVO.getServiceTime());
+ }
+ if (createVO.getStartAddress() != null) {
+ task.setDepartureAddress(createVO.getStartAddress());
+ }
+ if (createVO.getEndAddress() != null) {
+ task.setDestinationAddress(createVO.getEndAddress());
+ }
+ // 璁剧疆绂忕杞﹀叕閲屾暟
+ if (createVO.getDistance() != null) {
+ task.setEstimatedDistance(createVO.getDistance());
+ }
+
+ int result = sysTaskMapper.insertSysTask(task);
+
+ // 淇濆瓨杞﹁締鍏宠仈淇℃伅
+ if (result > 0 && createVO.getVehicleIds() != null && !createVO.getVehicleIds().isEmpty()) {
+ for (Long vehicleId : createVO.getVehicleIds()) {
+ SysTaskVehicle taskVehicle = new SysTaskVehicle();
+ taskVehicle.setTaskId(task.getTaskId());
+ taskVehicle.setVehicleId(vehicleId);
+ taskVehicle.setAssignTime(DateUtils.getNowDate());
+ taskVehicle.setAssignBy(SecurityUtils.getUsername());
+ taskVehicle.setStatus("ASSIGNED");
+ taskVehicle.setCreateBy(SecurityUtils.getUsername());
+ taskVehicle.setCreateTime(DateUtils.getNowDate());
+ taskVehicle.setUpdateBy(SecurityUtils.getUsername());
+ taskVehicle.setUpdateTime(DateUtils.getNowDate());
+
+ sysTaskVehicleMapper.insertSysTaskVehicle(taskVehicle);
+ }
+ }
+
+ // 淇濆瓨鎵ц浜哄憳淇℃伅锛堝寘鍚鑹茬被鍨嬶級
+ if (result > 0 && createVO.getAssignees() != null && !createVO.getAssignees().isEmpty()) {
+ saveTaskAssignees(task.getTaskId(), createVO.getAssignees());
+ }
+
+ // 淇濆瓨鎬ユ晳杞繍鎵╁睍淇℃伅
+ if (result > 0 && "EMERGENCY_TRANSFER".equals(createVO.getTaskType())) {
+ saveEmergencyInfo(task.getTaskId(), createVO);
+ }
+
+ // 淇濆瓨绂忕杞︽墿灞曚俊鎭�
+ if (result > 0 && "WELFARE".equals(createVO.getTaskType())) {
+ saveWelfareInfo(task.getTaskId(), createVO);
+ }
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ recordTaskLog(task.getTaskId(), "CREATE", "鍒涘缓浠诲姟", null,
+ "浠诲姟绫诲瀷锛�" + createVO.getTaskType(), SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ }
+
+ // 鍙戝竷浠诲姟鍒涘缓浜嬩欢
+ if (result > 0) {
+ eventPublisher.publishEvent(new TaskCreatedEvent(
+ this,
+ task.getTaskId(),
+ task.getTaskCode(),
+ task.getTaskType(),
+ task.getCreatorId(),
+ SecurityUtils.getUsername()
+ ));
+ }
+
+ // 鍙戝竷浠诲姟鍒嗛厤浜嬩欢
+ if (result > 0 && createVO.getAssignees() != null && !createVO.getAssignees().isEmpty()) {
+ List<Long> assigneeIds = createVO.getAssignees().stream()
+ .map(assignee -> assignee.getUserId())
+ .collect(Collectors.toList());
+ List<String> assigneeNames = createVO.getAssignees().stream()
+ .map(assignee -> assignee.getUserName())
+ .collect(Collectors.toList());
+
+ eventPublisher.publishEvent(new TaskAssignedEvent(
+ this,
+ task.getTaskId(),
+ task.getTaskCode(),
+ assigneeIds,
+ assigneeNames,
+ SecurityUtils.getUserId(),
+ SecurityUtils.getUsername()
+ ));
+ }
+
+ // 寮傛鍚屾鎬ユ晳杞繍浠诲姟鍒版棫绯荤粺
+ if (result > 0 && "EMERGENCY_TRANSFER".equals(createVO.getTaskType()) && legacySystemSyncService != null) {
+ final Long finalTaskId = task.getTaskId();
+ new Thread(() -> {
+ try {
+ Thread.sleep(2000); // 绛夊緟2绉掞紝纭繚浜嬪姟宸叉彁浜�
+ legacySystemSyncService.syncEmergencyTaskToLegacy(finalTaskId);
+ } catch (Exception e) {
+ // 鍚屾澶辫触涓嶅奖鍝嶄富娴佺▼锛屼粎璁板綍鏃ュ織
+ }
+ }).start();
+ }
+
+ return result;
+ }
+
+ /**
+ * 淇敼浠诲姟绠＄悊
+ *
+ * @param updateVO 浠诲姟鏇存柊瀵硅薄
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public int updateSysTask(TaskUpdateVO updateVO) {
+ SysTask oldTask = sysTaskMapper.selectSysTaskByTaskId(updateVO.getTaskId());
+ if (oldTask == null) {
+ throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
+ }
+
+ SysTask task = new SysTask();
+ task.setTaskId(updateVO.getTaskId());
+ task.setTaskDescription(updateVO.getTaskDescription());
+ task.setDepartureAddress(updateVO.getDepartureAddress());
+ task.setDestinationAddress(updateVO.getDestinationAddress());
+ task.setDepartureLongitude(updateVO.getDepartureLongitude());
+ task.setDepartureLatitude(updateVO.getDepartureLatitude());
+ task.setDestinationLongitude(updateVO.getDestinationLongitude());
+ task.setDestinationLatitude(updateVO.getDestinationLatitude());
+ task.setPlannedStartTime(updateVO.getPlannedStartTime());
+ task.setPlannedEndTime(updateVO.getPlannedEndTime());
+ task.setAssigneeId(updateVO.getAssigneeId());
+ task.setUpdateBy(SecurityUtils.getUsername());
+ task.setUpdateTime(DateUtils.getNowDate());
+ task.setRemark(updateVO.getRemark());
+
+ // 閲嶆柊璁＄畻棰勮鍏噷鏁�
+ calculateEstimatedDistance(task);
+
+ int result = sysTaskMapper.updateSysTask(task);
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ recordTaskLog(updateVO.getTaskId(), "UPDATE", "鏇存柊浠诲姟",
+ buildTaskDescription(oldTask), buildTaskDescription(task),
+ SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ }
+
+ return result;
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎浠诲姟绠＄悊
+ *
+ * @param taskIds 闇�瑕佸垹闄ょ殑浠诲姟绠＄悊涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public int deleteSysTaskByTaskIds(Long[] taskIds) {
+ int result = 0;
+ for (Long taskId : taskIds) {
+ // 璁板綍鍒犻櫎鏃ュ織
+ recordTaskLog(taskId, "DELETE", "鍒犻櫎浠诲姟", null, null,
+ SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ result += sysTaskMapper.deleteSysTaskByTaskId(taskId);
+ }
+ return result;
+ }
+
+ /**
+ * 鍒嗛厤浠诲姟
+ *
+ * @param taskId 浠诲姟ID
+ * @param assigneeId 鎵ц浜篒D
+ * @param remark 澶囨敞
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public int assignTask(Long taskId, Long assigneeId, String remark) {
+ SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
+ if (task == null) {
+ throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
+ }
+
+ SysTask updateTask = new SysTask();
+ updateTask.setTaskId(taskId);
+ updateTask.setAssigneeId(assigneeId);
+ updateTask.setUpdateBy(SecurityUtils.getUsername());
+ updateTask.setUpdateTime(DateUtils.getNowDate());
+
+ int result = sysTaskMapper.assignTask(updateTask);
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ recordTaskLog(taskId, "ASSIGN", "鍒嗛厤浠诲姟", null,
+ "鍒嗛厤缁欑敤鎴稩D锛�" + assigneeId + "锛屽娉細" + remark,
+ SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ }
+
+ // 鍙戝竷浠诲姟鍒嗛厤浜嬩欢
+ if (result > 0) {
+ List<Long> assigneeIds = new ArrayList<>();
+ assigneeIds.add(assigneeId);
+
+ eventPublisher.publishEvent(new TaskAssignedEvent(
+ this,
+ task.getTaskId(),
+ task.getTaskCode(),
+ assigneeIds,
+ null, // 濮撳悕鍒楄〃鍦ㄧ洃鍚櫒涓煡璇�
+ SecurityUtils.getUserId(),
+ SecurityUtils.getUsername()
+ ));
+ }
+
+ return result;
+ }
+
+ /**
+ * 鍙樻洿浠诲姟鐘舵��
+ *
+ * @param taskId 浠诲姟ID
+ * @param newStatus 鏂扮姸鎬�
+ * @param remark 澶囨敞
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public int changeTaskStatus(Long taskId, TaskStatus newStatus, String remark) {
+ return changeTaskStatusWithLocation(taskId, newStatus, remark, null);
+ }
+
+ /**
+ * 鍙樻洿浠诲姟鐘舵�侊紙鍚獹PS浣嶇疆淇℃伅锛�
+ *
+ * @param taskId 浠诲姟ID
+ * @param newStatus 鏂扮姸鎬�
+ * @param remark 澶囨敞
+ * @param locationLog GPS浣嶇疆淇℃伅鏃ュ織瀵硅薄
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public int changeTaskStatusWithLocation(Long taskId, TaskStatus newStatus, String remark, SysTaskLog locationLog) {
+ SysTask oldTask = sysTaskMapper.selectSysTaskByTaskId(taskId);
+ if (oldTask == null) {
+ throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
+ }
+
+ // 楠岃瘉鐘舵�佹祦杞槸鍚﹀悎娉�
+ TaskStatus oldTaskStatus = TaskStatus.getByCode(oldTask.getTaskStatus());
+ if (!oldTask.canChangeStatus(newStatus)) {
+ throw new RuntimeException("鐘舵�佹祦杞笉鍚堟硶锛氫粠 " + oldTaskStatus.getInfo() + " 鍒� " + newStatus.getInfo());
+ }
+
+ SysTask task = new SysTask();
+ task.setTaskId(taskId);
+ task.setTaskStatus(newStatus.getCode());
+ task.setUpdateBy(SecurityUtils.getUsername());
+ task.setUpdateTime(DateUtils.getNowDate());
+
+ // 鏍规嵁鐘舵�佽缃浉搴旂殑鏃堕棿
+ if (newStatus == TaskStatus.DEPARTING && oldTask.getActualStartTime() == null) {
+ // 鍑哄彂涓細璁剧疆瀹為檯寮�濮嬫椂闂�
+ task.setActualStartTime(DateUtils.getNowDate());
+ } else if (newStatus == TaskStatus.IN_PROGRESS && oldTask.getActualStartTime() == null) {
+ // 鍏煎鏃ф暟鎹細浠诲姟涓姸鎬佷篃璁剧疆瀹為檯寮�濮嬫椂闂�
+ task.setActualStartTime(DateUtils.getNowDate());
+ } else if (newStatus == TaskStatus.COMPLETED) {
+ // 宸插畬鎴愶細璁剧疆瀹為檯缁撴潫鏃堕棿
+ task.setActualEndTime(DateUtils.getNowDate());
+ }
+
+ int result = sysTaskMapper.updateTaskStatus(task);
+
+ // 璁板綍鎿嶄綔鏃ュ織锛堝惈GPS浣嶇疆淇℃伅锛�
+ if (result > 0) {
+ recordTaskLog(taskId, "STATUS_CHANGE", "鐘舵�佸彉鏇�",
+ "鐘舵�侊細" + oldTaskStatus.getInfo(),
+ "鐘舵�侊細" + newStatus.getInfo() + "锛屽娉細" + remark,
+ SecurityUtils.getUserId(), SecurityUtils.getUsername(),
+ locationLog);
+ }
+
+ // 鍙戝竷浠诲姟鐘舵�佸彉鏇翠簨浠�
+ if (result > 0) {
+ // 鏌ヨ浠诲姟鐨勬墍鏈夋墽琛屼汉
+ List<SysTaskAssignee> assignees = sysTaskAssigneeMapper.selectSysTaskAssigneeByTaskId(taskId);
+ List<Long> assigneeIds = null;
+ if (assignees != null && !assignees.isEmpty()) {
+ assigneeIds = assignees.stream()
+ .map(SysTaskAssignee::getUserId)
+ .collect(Collectors.toList());
+ }
+
+ eventPublisher.publishEvent(new TaskStatusChangedEvent(
+ this,
+ oldTask.getTaskId(),
+ oldTask.getTaskCode(),
+ oldTaskStatus.getCode(),
+ newStatus.getCode(),
+ oldTaskStatus.getInfo(),
+ newStatus.getInfo(),
+ assigneeIds,
+ oldTask.getCreatorId()
+ ));
+ }
+
+ return result;
+ }
+
+ /**
+ * 涓婁紶浠诲姟闄勪欢
+ *
+ * @param taskId 浠诲姟ID
+ * @param file 鏂囦欢
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public int uploadAttachment(Long taskId, MultipartFile file) {
+ try {
+ // 涓婁紶鏂囦欢
+ String fileName = FileUploadUtils.upload("/task", file);
+ String filePath = FileUploadUtils.getDefaultBaseDir() + fileName;
+
+ SysTaskAttachment attachment = new SysTaskAttachment();
+ attachment.setTaskId(taskId);
+ attachment.setFileName(file.getOriginalFilename());
+ attachment.setFilePath(filePath);
+ attachment.setFileSize(file.getSize());
+ attachment.setFileType(getFileType(file.getOriginalFilename()));
+ attachment.setUploadTime(DateUtils.getNowDate());
+ attachment.setUploadBy(SecurityUtils.getUsername());
+
+ int result = sysTaskAttachmentMapper.insertSysTaskAttachment(attachment);
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ recordTaskLog(taskId, "UPDATE", "涓婁紶闄勪欢", null,
+ "涓婁紶鏂囦欢锛�" + file.getOriginalFilename(),
+ SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ }
+
+ return result;
+ } catch (IOException e) {
+ throw new RuntimeException("鏂囦欢涓婁紶澶辫触锛�" + e.getMessage());
+ }
+ }
+
+ /**
+ * 鍒犻櫎浠诲姟闄勪欢
+ *
+ * @param attachmentId 闄勪欢ID
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public int deleteAttachment(Long attachmentId) {
+ SysTaskAttachment attachment = sysTaskAttachmentMapper.selectSysTaskAttachmentByAttachmentId(attachmentId);
+ if (attachment == null) {
+ throw new RuntimeException("闄勪欢涓嶅瓨鍦�");
+ }
+
+ // 鍒犻櫎鐗╃悊鏂囦欢
+ try {
+ FileUtils.deleteFile(attachment.getFilePath());
+ } catch (Exception e) {
+ // 蹇界暐鏂囦欢鍒犻櫎澶辫触
+ }
+
+ int result = sysTaskAttachmentMapper.deleteSysTaskAttachmentByAttachmentId(attachmentId);
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ recordTaskLog(attachment.getTaskId(), "UPDATE", "鍒犻櫎闄勪欢",
+ "鍒犻櫎鏂囦欢锛�" + attachment.getFileName(), null,
+ SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ }
+
+ return result;
+ }
+
+ /**
+ * 鍒嗛厤杞﹁締缁欎换鍔�
+ *
+ * @param taskId 浠诲姟ID
+ * @param vehicleId 杞﹁締ID
+ * @param remark 澶囨敞
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public int assignVehicleToTask(Long taskId, Long vehicleId, String remark) {
+ // 妫�鏌ユ槸鍚﹀凡缁忓垎閰�
+ int exists = sysTaskVehicleMapper.checkTaskVehicleExists(taskId, vehicleId);
+ if (exists > 0) {
+ throw new RuntimeException("杞﹁締宸茬粡鍒嗛厤缁欒浠诲姟");
+ }
+
+ SysTaskVehicle taskVehicle = new SysTaskVehicle();
+ taskVehicle.setTaskId(taskId);
+ taskVehicle.setVehicleId(vehicleId);
+ taskVehicle.setAssignTime(DateUtils.getNowDate());
+ taskVehicle.setAssignBy(SecurityUtils.getUsername());
+ taskVehicle.setStatus("ASSIGNED");
+ taskVehicle.setRemark(remark);
+
+ int result = sysTaskVehicleMapper.insertSysTaskVehicle(taskVehicle);
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ recordTaskLog(taskId, "ASSIGN", "鍒嗛厤杞﹁締", null,
+ "鍒嗛厤杞﹁締ID锛�" + vehicleId + "锛屽娉細" + remark,
+ SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ }
+
+ return result;
+ }
+
+ /**
+ * 鍙栨秷浠诲姟杞﹁締鍒嗛厤
+ *
+ * @param taskId 浠诲姟ID
+ * @param vehicleId 杞﹁締ID
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public int unassignVehicleFromTask(Long taskId, Long vehicleId) {
+ int result = sysTaskVehicleMapper.deleteSysTaskVehicleByTaskIdAndVehicleId(taskId, vehicleId);
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ recordTaskLog(taskId, "ASSIGN", "鍙栨秷杞﹁締鍒嗛厤",
+ "鍙栨秷杞﹁締ID锛�" + vehicleId, null,
+ SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ }
+
+ return result;
+ }
+
+ /**
+ * 鎵归噺鍒嗛厤杞﹁締缁欎换鍔�
+ *
+ * @param taskId 浠诲姟ID
+ * @param vehicleIds 杞﹁締ID鍒楄〃
+ * @param remark 澶囨敞
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public int assignMultipleVehiclesToTask(Long taskId, List<Long> vehicleIds, String remark) {
+ List<SysTaskVehicle> taskVehicles = new ArrayList<>();
+ Date now = DateUtils.getNowDate();
+ String assignBy = SecurityUtils.getUsername();
+
+ for (Long vehicleId : vehicleIds) {
+ // 妫�鏌ユ槸鍚﹀凡缁忓垎閰�
+ int exists = sysTaskVehicleMapper.checkTaskVehicleExists(taskId, vehicleId);
+ if (exists == 0) {
+ SysTaskVehicle taskVehicle = new SysTaskVehicle();
+ taskVehicle.setTaskId(taskId);
+ taskVehicle.setVehicleId(vehicleId);
+ taskVehicle.setAssignTime(now);
+ taskVehicle.setAssignBy(assignBy);
+ taskVehicle.setStatus("ASSIGNED");
+ taskVehicle.setRemark(remark);
+ taskVehicles.add(taskVehicle);
+ }
+ }
+
+ int result = 0;
+ if (!taskVehicles.isEmpty()) {
+ result = sysTaskVehicleMapper.batchInsertSysTaskVehicle(taskVehicles);
+ }
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ recordTaskLog(taskId, "ASSIGN", "鎵归噺鍒嗛厤杞﹁締", null,
+ "鍒嗛厤杞﹁締鏁伴噺锛�" + result + "锛屽娉細" + remark,
+ SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ }
+
+ return result;
+ }
+
+ /**
+ * 鏌ヨ浠诲姟鍏宠仈鐨勮溅杈�
+ *
+ * @param taskId 浠诲姟ID
+ * @return 浠诲姟杞﹁締鍏宠仈鍒楄〃
+ */
+ @Override
+ public List<SysTaskVehicle> getTaskVehicles(Long taskId) {
+ return sysTaskVehicleMapper.selectSysTaskVehicleByTaskId(taskId);
+ }
+
+ /**
+ * 鏌ヨ鍙敤杞﹁締
+ *
+ * @param deptId 閮ㄩ棬ID
+ * @param taskType 浠诲姟绫诲瀷
+ * @return 鍙敤杞﹁締鍒楄〃
+ */
+ @Override
+ public List<SysTaskVehicle> getAvailableVehicles(Long deptId, String taskType) {
+ List<SysTaskVehicle> availableVehicles = new ArrayList<>();
+
+ try {
+ // 鏌ヨ鎵�鏈夌姸鎬佷负姝ｅ父鐨勮溅杈嗭紙涓嶉檺鍒堕儴闂級
+ VehicleInfo queryParam = new VehicleInfo();
+ queryParam.setStatus("0"); // 0琛ㄧず姝ｅ父鐘舵��
+ // 涓嶈缃甦eptId锛屾煡璇㈡墍鏈夐儴闂ㄧ殑杞﹁締
+ queryParam.setDeptId(deptId);
+
+ List<VehicleInfo> vehicles = vehicleInfoMapper.selectVehicleInfoList(queryParam);
+
+ // 杞崲涓篠ysTaskVehicle瀵硅薄
+ for (VehicleInfo vehicle : vehicles) {
+ SysTaskVehicle taskVehicle = new SysTaskVehicle();
+ taskVehicle.setVehicleId(vehicle.getVehicleId());
+ taskVehicle.setVehicleNo(vehicle.getVehicleNo());
+ taskVehicle.setVehicleType(vehicle.getVehicleType());
+ taskVehicle.setVehicleBrand(vehicle.getVehicleBrand());
+ taskVehicle.setVehicleModel(vehicle.getVehicleModel());
+ taskVehicle.setDeptName(vehicle.getDeptName()); // 娣诲姞閮ㄩ棬鍚嶇О
+ availableVehicles.add(taskVehicle);
+ }
+ } catch (Exception e) {
+ // 濡傛灉鏌ヨ澶辫触锛岃褰曟棩蹇楀苟杩斿洖绌哄垪琛�
+ System.err.println("鏌ヨ鍙敤杞﹁締澶辫触: " + e.getMessage());
+ }
+
+ return availableVehicles;
+ }
+
+ /**
+ * 鏌ヨ浠诲姟缁熻淇℃伅
+ *
+ * @return 浠诲姟缁熻淇℃伅
+ */
+ @Override
+ public TaskStatisticsVO getTaskStatistics() {
+ return sysTaskMapper.selectTaskStatistics();
+ }
+
+ /**
+ * 鏌ヨ瓒呮椂浠诲姟鍒楄〃
+ *
+ * @return 瓒呮椂浠诲姟鍒楄〃
+ */
+ @Override
+ public List<SysTask> selectOverdueTasks() {
+ return sysTaskMapper.selectOverdueTasks();
+ }
+
+ /**
+ * 鏌ヨ鎴戠殑浠诲姟鍒楄〃
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @return 鎴戠殑浠诲姟鍒楄〃
+ */
+ @Override
+ public List<SysTask> selectMyTasks(Long userId) {
+ return sysTaskMapper.selectMyTasks(userId);
+ }
+
+ /**
+ * 鑾峰彇浠诲姟璇︽儏锛堝寘鍚叧鑱旀暟鎹級
+ *
+ * @param taskId 浠诲姟ID
+ * @return 浠诲姟璇︽儏
+ */
+ @Override
+ public SysTask getTaskDetail(Long taskId) {
+ SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
+ if (task != null) {
+ // 鏌ヨ鍏宠仈杞﹁締
+ task.setAssignedVehicles(sysTaskVehicleMapper.selectSysTaskVehicleByTaskId(taskId));
+ // 鏌ヨ闄勪欢
+ task.setAttachments(sysTaskAttachmentMapper.selectSysTaskAttachmentByTaskId(taskId));
+ // 鏌ヨ鎿嶄綔鏃ュ織
+ task.setOperationLogs(sysTaskLogMapper.selectSysTaskLogByTaskId(taskId));
+ // 鍔犺浇鎬ユ晳杞繍鎵╁睍淇℃伅
+ if ("EMERGENCY_TRANSFER".equals(task.getTaskType())) {
+ SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
+ task.setEmergencyInfo(emergencyInfo);
+ }
+ // 鍔犺浇绂忕杞︽墿灞曚俊鎭�
+ else if ("WELFARE".equals(task.getTaskType())) {
+ SysTaskWelfare welfareInfo = sysTaskWelfareMapper.selectSysTaskWelfareByTaskId(taskId);
+ task.setWelfareInfo(welfareInfo);
+ }
+ }
+ return task;
+ }
+
+ @Autowired
+ private TaskCodeGenerator taskCodeGenerator;
+
+ /**
+ * 鐢熸垚浠诲姟缂栧彿
+ *
+ * @return 浠诲姟缂栧彿
+ */
+ private String generateTaskCode() {
+ return taskCodeGenerator.generateTaskCode();
+ }
+
+ /**
+ * 璁板綍浠诲姟鎿嶄綔鏃ュ織
+ *
+ * @param taskId 浠诲姟ID
+ * @param operationType 鎿嶄綔绫诲瀷
+ * @param operationDesc 鎿嶄綔鎻忚堪
+ * @param oldValue 鎿嶄綔鍓嶅��
+ * @param newValue 鎿嶄綔鍚庡��
+ * @param operatorId 鎿嶄綔浜篒D
+ * @param operatorName 鎿嶄綔浜哄鍚�
+ */
+ private void recordTaskLog(Long taskId, String operationType, String operationDesc,
+ String oldValue, String newValue, Long operatorId, String operatorName) {
+ recordTaskLog(taskId, operationType, operationDesc, oldValue, newValue,
+ operatorId, operatorName, null);
+ }
+
+ /**
+ * 璁板綍浠诲姟鎿嶄綔鏃ュ織锛堝惈GPS浣嶇疆淇℃伅锛�
+ *
+ * @param taskId 浠诲姟ID
+ * @param operationType 鎿嶄綔绫诲瀷
+ * @param operationDesc 鎿嶄綔鎻忚堪
+ * @param oldValue 鎿嶄綔鍓嶅��
+ * @param newValue 鎿嶄綔鍚庡��
+ * @param operatorId 鎿嶄綔浜篒D
+ * @param operatorName 鎿嶄綔浜哄鍚�
+ * @param log GPS浣嶇疆淇℃伅鏃ュ織瀵硅薄锛堝彲涓簄ull锛�
+ */
+ private void recordTaskLog(Long taskId, String operationType, String operationDesc,
+ String oldValue, String newValue, Long operatorId, String operatorName,
+ SysTaskLog log) {
+ if (log == null) {
+ log = new SysTaskLog();
+ }
+
+ log.setTaskId(taskId);
+ log.setOperationType(operationType);
+ log.setOperationDesc(operationDesc);
+ log.setOldValue(oldValue);
+ log.setNewValue(newValue);
+ log.setOperatorId(operatorId);
+ log.setOperatorName(operatorName);
+ log.setOperationTime(DateUtils.getNowDate());
+ // 杩欓噷鍙互鑾峰彇IP鍦板潃
+ log.setIpAddress("127.0.0.1");
+
+ sysTaskLogMapper.insertSysTaskLog(log);
+ }
+
+ /**
+ * 鏋勫缓浠诲姟鎻忚堪
+ *
+ * @param task 浠诲姟瀵硅薄
+ * @return 浠诲姟鎻忚堪
+ */
+ private String buildTaskDescription(SysTask task) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("浠诲姟缂栧彿锛�").append(task.getTaskCode()).append("锛�");
+ sb.append("浠诲姟绫诲瀷锛�").append(task.getTaskType()).append("锛�");
+ sb.append("浠诲姟鐘舵�侊細").append(task.getTaskStatus()).append("锛�");
+ if (StringUtils.isNotEmpty(task.getTaskDescription())) {
+ sb.append("浠诲姟鎻忚堪锛�").append(task.getTaskDescription()).append("锛�");
+ }
+ return sb.toString();
+ }
+
+ /**
+ * 鑾峰彇鏂囦欢绫诲瀷
+ *
+ * @param fileName 鏂囦欢鍚�
+ * @return 鏂囦欢绫诲瀷
+ */
+ private String getFileType(String fileName) {
+ if (StringUtils.isEmpty(fileName)) {
+ return "";
+ }
+ int lastDotIndex = fileName.lastIndexOf(".");
+ if (lastDotIndex > 0 && lastDotIndex < fileName.length() - 1) {
+ return fileName.substring(lastDotIndex + 1).toLowerCase();
+ }
+ return "";
+ }
+
+ /**
+ * 璁＄畻棰勮鍏噷鏁�
+ *
+ * @param task 浠诲姟瀵硅薄
+ */
+ private void calculateEstimatedDistance(SysTask task) {
+ if (task.getDepartureLongitude() != null && task.getDepartureLatitude() != null &&
+ task.getDestinationLongitude() != null && task.getDestinationLatitude() != null) {
+
+ // 楠岃瘉GPS鍧愭爣鏄惁鏈夋晥
+ if (GpsDistanceUtils.isValidCoordinate(task.getDepartureLatitude(), task.getDepartureLongitude()) &&
+ GpsDistanceUtils.isValidCoordinate(task.getDestinationLatitude(), task.getDestinationLongitude())) {
+
+ // 璁＄畻璺濈
+ java.math.BigDecimal distance = GpsDistanceUtils.calculateDistance(
+ task.getDepartureLatitude(), task.getDepartureLongitude(),
+ task.getDestinationLatitude(), task.getDestinationLongitude()
+ );
+
+ task.setEstimatedDistance(distance);
+ } else {
+ // 鍧愭爣鏃犳晥锛岃缃负0
+ task.setEstimatedDistance(java.math.BigDecimal.ZERO);
+ }
+ } else {
+ // 鍧愭爣涓嶅畬鏁达紝璁剧疆涓�0
+ task.setEstimatedDistance(java.math.BigDecimal.ZERO);
+ }
+ }
+
+ /**
+ * 淇濆瓨浠诲姟鎵ц浜哄憳淇℃伅锛堝寘鍚鑹茬被鍨嬶級
+ *
+ * @param taskId 浠诲姟ID
+ * @param assignees 鎵ц浜哄憳淇℃伅鍒楄〃
+ */
+ private void saveTaskAssignees(Long taskId, java.util.List<TaskCreateVO.AssigneeInfo> assignees) {
+ if (assignees == null || assignees.isEmpty()) {
+ return;
+ }
+
+ java.util.List<SysTaskAssignee> taskAssignees = new java.util.ArrayList<>();
+ Date now = DateUtils.getNowDate();
+ String currentUser = SecurityUtils.getUsername();
+
+ for (int i = 0; i < assignees.size(); i++) {
+ TaskCreateVO.AssigneeInfo assigneeInfo = assignees.get(i);
+
+ SysTaskAssignee taskAssignee = new SysTaskAssignee();
+ taskAssignee.setTaskId(taskId);
+ taskAssignee.setUserId(assigneeInfo.getUserId());
+ taskAssignee.setUserName(assigneeInfo.getUserName());
+ taskAssignee.setUserType(assigneeInfo.getUserType());
+ // 绗竴涓墽琛屼汉鍛樹负涓昏鎵ц浜�
+ taskAssignee.setIsPrimary(i == 0 ? "1" : "0");
+ taskAssignee.setSortOrder(i);
+ taskAssignee.setCreateTime(now);
+ taskAssignee.setCreateBy(currentUser);
+ taskAssignee.setUpdateTime(now);
+ taskAssignee.setUpdateBy(currentUser);
+
+ taskAssignees.add(taskAssignee);
+ }
+
+ // 鎵归噺淇濆瓨
+ if (!taskAssignees.isEmpty()) {
+ sysTaskAssigneeMapper.batchInsertSysTaskAssignee(taskAssignees);
+ }
+ }
+
+ /**
+ * 淇濆瓨鎬ユ晳杞繍浠诲姟鎵╁睍淇℃伅
+ *
+ * @param taskId 浠诲姟ID
+ * @param createVO 浠诲姟鍒涘缓瀵硅薄
+ */
+ private void saveEmergencyInfo(Long taskId, TaskCreateVO createVO) {
+ SysTaskEmergency emergencyInfo = new SysTaskEmergency();
+ emergencyInfo.setTaskId(taskId);
+
+ // 璁剧疆鎮ｈ�呬俊鎭�
+ if (createVO.getPatient() != null) {
+ emergencyInfo.setPatientContact(createVO.getPatient().getContact());
+ emergencyInfo.setPatientPhone(createVO.getPatient().getPhone());
+ emergencyInfo.setPatientName(createVO.getPatient().getName());
+ emergencyInfo.setPatientGender(createVO.getPatient().getGender());
+ emergencyInfo.setPatientIdCard(createVO.getPatient().getIdCard());
+ emergencyInfo.setPatientCondition(createVO.getPatient().getCondition());
+ }
+
+ // 璁剧疆杞嚭鍖婚櫌淇℃伅
+ if (createVO.getHospitalOut() != null) {
+ emergencyInfo.setHospitalOutId(createVO.getHospitalOut().getId());
+ emergencyInfo.setHospitalOutName(createVO.getHospitalOut().getName());
+ emergencyInfo.setHospitalOutDepartment(createVO.getHospitalOut().getDepartment());
+ emergencyInfo.setHospitalOutDepartmentId(createVO.getHospitalOut().getDepartmentId());
+ emergencyInfo.setHospitalOutBedNumber(createVO.getHospitalOut().getBedNumber());
+ emergencyInfo.setHospitalOutAddress(createVO.getHospitalOut().getAddress());
+ emergencyInfo.setHospitalOutLongitude(createVO.getHospitalOut().getLongitude());
+ emergencyInfo.setHospitalOutLatitude(createVO.getHospitalOut().getLatitude());
+ }
+
+ // 璁剧疆杞叆鍖婚櫌淇℃伅
+ if (createVO.getHospitalIn() != null) {
+ emergencyInfo.setHospitalInId(createVO.getHospitalIn().getId());
+ emergencyInfo.setHospitalInName(createVO.getHospitalIn().getName());
+ emergencyInfo.setHospitalInDepartment(createVO.getHospitalIn().getDepartment());
+ emergencyInfo.setHospitalInDepartmentId(createVO.getHospitalIn().getDepartmentId());
+ emergencyInfo.setHospitalInBedNumber(createVO.getHospitalIn().getBedNumber());
+ emergencyInfo.setHospitalInAddress(createVO.getHospitalIn().getAddress());
+ emergencyInfo.setHospitalInLongitude(createVO.getHospitalIn().getLongitude());
+ emergencyInfo.setHospitalInLatitude(createVO.getHospitalIn().getLatitude());
+ }
+
+ // 璁剧疆璐圭敤淇℃伅
+ emergencyInfo.setTransferDistance(createVO.getTransferDistance());
+ emergencyInfo.setTransferPrice(createVO.getPrice());
+
+ // 璁剧疆鍗曟嵁绫诲瀷ID
+ emergencyInfo.setDocumentTypeId(createVO.getDocumentTypeId());
+
+ // 璁剧疆浠诲姟绫诲瀷ID
+ emergencyInfo.setTaskTypeId(createVO.getTaskTypeId());
+
+ // 璁剧疆鐥呮儏ID鍒楄〃锛堝皢List<Long>杞崲涓洪�楀彿鍒嗛殧鐨勫瓧绗︿覆锛�
+ if (createVO.getDiseaseIds() != null && !createVO.getDiseaseIds().isEmpty()) {
+ String diseaseIdsStr = createVO.getDiseaseIds().stream()
+ .map(String::valueOf)
+ .collect(Collectors.joining(","));
+ emergencyInfo.setDiseaseIds(diseaseIdsStr);
+ }
+
+ // 绯荤粺瀛楁
+ emergencyInfo.setCreateTime(DateUtils.getNowDate());
+ emergencyInfo.setUpdateTime(DateUtils.getNowDate());
+ emergencyInfo.setCreateBy(SecurityUtils.getUsername());
+ emergencyInfo.setUpdateBy(SecurityUtils.getUsername());
+
+ sysTaskEmergencyMapper.insertSysTaskEmergency(emergencyInfo);
+ }
+
+ /**
+ * 淇濆瓨绂忕杞︿换鍔℃墿灞曚俊鎭�
+ *
+ * @param taskId 浠诲姟ID
+ * @param createVO 浠诲姟鍒涘缓瀵硅薄
+ */
+ private void saveWelfareInfo(Long taskId, TaskCreateVO createVO) {
+ SysTaskWelfare welfareInfo = new SysTaskWelfare();
+ welfareInfo.setTaskId(taskId);
+
+ // 璁剧疆涔樺淇℃伅
+ if (createVO.getPassenger() != null) {
+ welfareInfo.setPassengerContact(createVO.getPassenger().getContact());
+ welfareInfo.setPassengerPhone(createVO.getPassenger().getPhone());
+ }
+
+ // 璁剧疆鍦板潃淇℃伅
+ welfareInfo.setPickupAddress(createVO.getStartAddress());
+ welfareInfo.setDestinationAddress(createVO.getEndAddress());
+
+ // 璁剧疆GPS鍧愭爣
+ welfareInfo.setPickupLongitude(createVO.getDepartureLongitude());
+ welfareInfo.setPickupLatitude(createVO.getDepartureLatitude());
+ welfareInfo.setDestinationLongitude(createVO.getDestinationLongitude());
+ welfareInfo.setDestinationLatitude(createVO.getDestinationLatitude());
+
+ // 璁剧疆璺濈鍜岃垂鐢�
+ // 浼樺厛浣跨敤绂忕杞︿笓鐢ㄧ殑distance瀛楁锛屽鏋滄病鏈夊垯浣跨敤閫氱敤鐨別stimatedDistance
+ BigDecimal serviceDistance = createVO.getDistance() != null ? createVO.getDistance() : createVO.getEstimatedDistance();
+ welfareInfo.setServiceDistance(serviceDistance);
+ welfareInfo.setServicePrice(createVO.getPrice());
+
+ // 绯荤粺瀛楁
+ welfareInfo.setCreateTime(DateUtils.getNowDate());
+ welfareInfo.setUpdateTime(DateUtils.getNowDate());
+ welfareInfo.setCreateBy(SecurityUtils.getUsername());
+ welfareInfo.setUpdateBy(SecurityUtils.getUsername());
+
+ sysTaskWelfareMapper.insertSysTaskWelfare(welfareInfo);
+ }
+}
--
Gitblit v1.9.1