From 241ec43730b25164b9b1ee9c7e53fe41654907f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= Date: Thu, 23 Oct 2025 17:06:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=87=BA=E5=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/bmw/controller/AppController.java | 26 +++++++++---------- .../com/bonus/bmw/service/AppService.java | 2 ++ .../bmw/service/impl/AppServiceImpl.java | 20 +++++++++++++- .../mapper/bmw/PmWorkerExitMapper.xml | 4 +-- 4 files changed, 35 insertions(+), 17 deletions(-) diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/AppController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/AppController.java index dee132f..e73be8c 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/AppController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/AppController.java @@ -1,21 +1,11 @@ package com.bonus.bmw.controller; -import com.bonus.bmw.domain.dto.FileBasicMsgDto; import com.bonus.bmw.domain.dto.PmWorkerDto; -import com.bonus.bmw.domain.dto.WebFileDto; -import com.bonus.bmw.domain.po.BmSubContract; -import com.bonus.bmw.domain.po.PmSubCompany; -import com.bonus.bmw.domain.vo.BmSubContractVo; import com.bonus.bmw.domain.vo.PmWorker; import com.bonus.bmw.domain.vo.TreeVo; import com.bonus.bmw.service.AppService; -import com.bonus.bmw.service.BmSubContractService; -import com.bonus.common.core.utils.encryption.Sm4Utils; -import com.bonus.common.core.utils.json.FastJsonHelper; -import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; -import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; import com.bonus.common.security.annotation.InnerAuth; @@ -28,10 +18,6 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; /** * app部分接口 @@ -136,4 +122,16 @@ public class AppController extends BaseController { return error("系统异常,请联系管理员"); } + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:ein:edit")) + @PostMapping("/appWorkerExitFile") + @SysLog(title = "人员出场", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员出场", details = "人员出场") + public AjaxResult appWorkerExitFile(@Validated @RequestBody PmWorkerDto workerDto) { + try { + return service.appWorkerExitFile(workerDto); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return error("系统异常,请联系管理员"); + } + } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/AppService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/AppService.java index 78f7c13..a9c478d 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/AppService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/AppService.java @@ -54,4 +54,6 @@ public interface AppService { * @return */ AjaxResult appWorkerExit(PmWorkerDto workerDto) throws Exception; + + AjaxResult appWorkerExitFile(PmWorkerDto workerDto); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/AppServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/AppServiceImpl.java index 54e5bd0..24d015f 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/AppServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/AppServiceImpl.java @@ -241,7 +241,7 @@ public class AppServiceImpl implements AppService { String[] split = record.getPhotoIds().split(","); for (int x = 0; x < split.length; x++) { int i = mapper.updateFileMsg(split[x], Constants.FILE_UPLOAD_WORKER_EXIT, record.getId()); - log.error("app更新人员出场:第{}条，{}", x, i > 0 ? "更新成功" : "更新失败"); + log.error("app人员出场-图片遍历:第{}条，{}", x, i > 0 ? "更新成功" : "更新失败"); } isUploadFile = 1; } @@ -261,6 +261,24 @@ public class AppServiceImpl implements AppService { } } + @Override + public AjaxResult appWorkerExitFile(PmWorkerDto record) { + //修改在场记录表状态 + int einStatus = 2; + //是否上传文件 + int isUploadFile = 0; + if(!StringUtils.isEmpty(record.getPhotoIds())){ + String[] split = record.getPhotoIds().split(","); + for (int x = 0; x < split.length; x++) { + int i = mapper.updateFileMsg(split[x], Constants.FILE_UPLOAD_WORKER_EXIT, record.getId()); + log.error("app人员出场-补-图片遍历:第{}条，{}", x, i > 0 ? "更新成功" : "更新失败"); + } + isUploadFile = 1; + } + int k = pmWorkerExitMapper.updateEinProRecordStatus(record.getId(),einStatus,isUploadFile,record.getExitWay(),""); + return k>0 ? AjaxResult.success() :AjaxResult.error("离场失败"); + } + static void delUrkUser(PmWorkerDto record, UrkSendService urkSendService) throws Exception { int workerId = record.getWorkerId()==null?0:record.getWorkerId(); int proId = record.getProId()==null?0:record.getProId(); diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerExitMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerExitMapper.xml index 05d0562..0032475 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerExitMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerExitMapper.xml @@ -214,7 +214,7 @@