From 2aaea69282eec3126283be339ec1e4a011fa09c1 Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Thu, 20 Mar 2025 17:29:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/common}/AnnexController.java   | 45 +++++++++++++------
 .../service/impl/BgtMessageServiceImpl.java   |  5 +--
 2 files changed, 33 insertions(+), 17 deletions(-)
 rename {ruoyi-system/src/main/java/com/ruoyi/common/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/common}/AnnexController.java (84%)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/common/controller/AnnexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AnnexController.java
similarity index 84%
rename from ruoyi-system/src/main/java/com/ruoyi/common/controller/AnnexController.java
rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AnnexController.java
index a396289..52ea95d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/common/controller/AnnexController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AnnexController.java
@@ -1,26 +1,30 @@
-package com.ruoyi.common.controller;
+package com.ruoyi.web.controller.common;
 
-import java.util.List;
-import java.util.Arrays;
-
-import com.ruoyi.common.domain.Annex;
-import lombok.RequiredArgsConstructor;
-import javax.validation.constraints.*;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.bo.AnnexQueryBo;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.domain.Annex;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.bo.AnnexQueryBo;
 import com.ruoyi.common.service.IAnnexService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+import static com.ruoyi.common.constant.Constants.WGZ;
 
 /**
  * 附件Controller
@@ -105,4 +109,17 @@ public class AnnexController extends BaseController {
                                        @PathVariable String[] ids) {
         return toAjax(iAnnexService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
+
+
+	@ApiOperation("包工头获取务工者附件")
+	@GetMapping("/getWgzAnnex")
+	public AjaxResult<List<Annex>> getWgzAnnex(Long recruitId,Long userId,String annexType) {
+		List<Annex> list = iAnnexService.list(Wrappers.<Annex>lambdaQuery()
+			.eq(Annex::getRecruitId, recruitId)
+			.eq(Annex::getUserId, userId)
+			.eq(Annex::getUserType, WGZ)
+			.eq(Annex::getAnnexType, annexType)
+		);
+		return AjaxResult.success(list);
+	}
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java
index b76c7e5..1b765b7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java
@@ -35,7 +35,6 @@ import com.ruoyi.wgz.domain.WgzReissueacard;
 import com.ruoyi.wgz.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -47,6 +46,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import static com.ruoyi.common.constants.BgtMessageConstant.*;
+import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.OPERATION_ALREADY;
 import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.OPERATION_NEED;
 
 /**
@@ -265,7 +265,6 @@ public class BgtMessageServiceImpl extends ServicePlusImpl<BgtMessageMapper, Bgt
 	}
 
 	@Override
-	@Async
 	public void operation(String senderType,Long senderId,String recipientType,Long recipientId,Long tableId,String tableName) {
 		LambdaUpdateWrapper<BgtMessage> wrapper = new LambdaUpdateWrapper<>();
 		wrapper.eq(BgtMessage::getRecipientId, recipientId);
@@ -274,7 +273,7 @@ public class BgtMessageServiceImpl extends ServicePlusImpl<BgtMessageMapper, Bgt
 		wrapper.eq(BgtMessage::getSenderType, senderType);
 		wrapper.eq(BgtMessage::getTableId, tableId);
 		wrapper.eq(BgtMessage::getTableName, tableName);
-		wrapper.set(BgtMessage::getIsOperation, OPERATION_NEED);
+		wrapper.set(BgtMessage::getIsOperation, OPERATION_ALREADY);
 		update(wrapper);
 	}
 }