From e39bddf535c89c9a7fe5789c01a17f92d4e596e7 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 04 八月 2026 16:46:13 +0800
Subject: [PATCH] fix: 车间主任查看修改
---
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
index 4a68ce8..062c27e 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -7,19 +7,22 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
-import com.deepoove.poi.config.Configure;
import com.deepoove.poi.data.PictureRenderData;
import com.deepoove.poi.data.Pictures;
-import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.MatrixToImageWriter;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.production.dto.ProductWorkOrderDto;
import com.ruoyi.production.mapper.ProductWorkOrderFileMapper;
import com.ruoyi.production.mapper.ProductWorkOrderMapper;
import com.ruoyi.production.pojo.ProductWorkOrder;
import com.ruoyi.production.pojo.ProductWorkOrderFile;
import com.ruoyi.production.service.ProductWorkOrderService;
-import com.ruoyi.quality.pojo.QualityInspectParam;
-import lombok.AllArgsConstructor;
+import com.ruoyi.project.system.domain.SysPost;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.mapper.SysPostMapper;
+import com.ruoyi.project.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -46,16 +49,54 @@
@Value("${file.temp-dir}")
private String tempDir;
+ @Autowired
+ private SysUserMapper sysUserMapper;
+
+ @Autowired
+ private SysPostMapper sysPostMapper;
+
@Override
public IPage<ProductWorkOrderDto> listPage(Page<ProductWorkOrderDto> page, ProductWorkOrderDto productWorkOrder) {
+ Long userId = SecurityUtils.getUserId();
+ if (!SecurityUtils.isAdmin(userId) && !SecurityUtils.hasRole(Constants.WORKSHOP_DEPUTY_DIRECTOR)) {
+ List<SysPost> posts = sysPostMapper.selectPostsByUserName(SecurityUtils.getUsername());
+ boolean isWorkshopDirector = CollectionUtils.isNotEmpty(posts)
+ && posts.stream().anyMatch(post -> Constants.WORKSHOP_DIRECTOR_POST.equals(post.getPostCode()));
+ if (!isWorkshopDirector) {
+ productWorkOrder.setCurrentUserId(userId);
+ }
+ }
return productWorkOrdermapper.pageProductWorkOrder(page, productWorkOrder);
}
@Override
- public int updateProductWorkOrder(ProductWorkOrderDto productWorkOrderDto) {
- return productWorkOrdermapper.updateById(productWorkOrderDto);
- }
+ @Transactional(rollbackFor = Exception.class)
+ public int updateProductWorkOrder(ProductWorkOrderDto dto) {
+ if (dto == null) {
+ throw new ServiceException("鎸囨淳澶辫触,鏁版嵁涓嶈兘涓虹┖");
+ }
+ if (dto.getWorkerId() == null) {
+ throw new ServiceException("鎸囨淳澶辫触,鎸囨淳宸ヤ汉涓嶈兘涓虹┖");
+ }
+ SysUser worker = sysUserMapper.selectUserById(dto.getWorkerId());
+ if (worker == null) {
+ throw new ServiceException("鎸囨淳澶辫触,鎸囨淳宸ヤ汉涓嶅瓨鍦�");
+ }
+ if (dto.getHandoverUserId() != null) {
+ if (dto.getWorkerId().equals(dto.getHandoverUserId())) {
+ throw new ServiceException("浜ゆ帴澶辫触,浜ゆ帴浜轰笉鑳戒笌鎸囨淳宸ヤ汉鐩稿悓");
+ }
+ SysUser handoverUser = sysUserMapper.selectUserById(dto.getHandoverUserId());
+ if (handoverUser == null) {
+ throw new ServiceException("浜ゆ帴澶辫触,浜ゆ帴浜哄憳涓嶅瓨鍦�");
+ }
+ dto.setHandoverUserName(handoverUser.getNickName());
+ }
+ dto.setWorkerName(worker.getNickName());
+
+ return productWorkOrdermapper.updateById(dto);
+ }
@Override
public void down(HttpServletResponse response, ProductWorkOrder productWorkOrder) {
ProductWorkOrderDto productWorkOrderDto = productWorkOrdermapper.getProductWorkOrderFlowCard(productWorkOrder.getId());
--
Gitblit v1.9.3