From f77a9d8f16bae6b4cf809891f037c038070e81ed Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 17:12:50 +0800
Subject: [PATCH] 工单，数据中心用户查看数据的权限，合同考核每日，以及导出每日和按月
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index d557e97..cf248f7 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -27,10 +27,12 @@
import com.ycl.platform.wvp.WVPResult;
import com.ycl.system.Result;
import com.ycl.system.domain.SysConfig;
+import com.ycl.system.entity.SysDept;
import com.ycl.system.entity.SysDictData;
import com.ycl.system.mapper.SysConfigMapper;
import com.ycl.system.model.LoginUser;
import com.ycl.system.page.PageUtil;
+import com.ycl.system.service.ISysDeptService;
import com.ycl.task.DeleteWorkOrderImgTask;
import com.ycl.utils.DateUtils;
import com.ycl.utils.SecurityUtils;
@@ -591,6 +593,37 @@
return Result.ok("鎿嶄綔鎴愬姛");
}
+ @Override
+ public Result ywConditionList(WorkOrderYWConditionsForm form) {
+ List<WorkOrder> workOrderList = new LambdaQueryChainWrapper<>(baseMapper)
+ .in(WorkOrder::getWorkOrderNo,form.getWorkOrderNumbers())
+ .list();
+ System.out.println("--------------");
+ System.out.println(workOrderList);
+ if (CollectionUtils.isEmpty(workOrderList)) {
+ throw new ServiceException("宸ュ崟涓嶅瓨鍦�");
+ }
+ // 宸ュ崟鐘舵��
+ for (WorkOrder workOrder : workOrderList) {
+ workOrder.setStatus(WorkOrderStatusEnum.YW_HANDLE);
+ workOrder.setYwHandleTime(LocalDateTime.now());
+ }
+ baseMapper.updateMany(workOrderList);
+ // 娣诲姞涓�鏉¤繍缁存儏鍐佃褰�
+ for (WorkOrder workOrder : workOrderList) {
+ WorkOrderYwConditionRecord workOrderYwConditionRecord = new WorkOrderYwConditionRecord();
+ workOrderYwConditionRecord.setWorkOrderNo(workOrder.getWorkOrderNo());
+ workOrderYwConditionRecord.setCommitUser(SecurityUtils.getLoginUser().getUserId().intValue());
+ workOrderYwConditionRecord.setYwCondition(form.getYwCondition());
+ workOrderYwConditionRecord.setYwProofMaterials(form.getYwProofMaterials());
+ workOrderYwConditionRecord.setSysMsg(Boolean.FALSE);
+ workOrderYwConditionRecordMapper.insert(workOrderYwConditionRecord);
+ WorkOrderServiceImpl self = applicationContext.getBean(WorkOrderServiceImpl.class);
+ self.getImage(workOrder);
+ }
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
+
@Async("threadPoolTaskExecutor")
public void getImage(WorkOrder workOrder) {
List<DeviceInfo> gbDevices = new LambdaQueryChainWrapper<>(deviceInfoMapper)
@@ -756,7 +789,7 @@
-
+ private final ISysDeptService deptService;
/**
* 鍒嗛〉鏌ヨ
*
@@ -765,6 +798,24 @@
*/
@Override
public Result page(WorkOrderQuery query) {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ SysDept sysDept = null;
+ Long deptId =null;
+ if (loginUser.getDeptId() != null){
+ deptId = loginUser.getDeptId();
+ sysDept = deptService.selectDeptById(deptId);
+ }
+ //鏌ヨ鎸囧畾鍖烘暟鎹�
+ // 鐧诲綍璐﹀彿鐨勫瓨鍦ㄩ儴闂� 涓嶅湪閮ㄩ棬鍐呭氨涓嶄紶鍊硷紝榛樿鏌ヨ鍏ㄩ儴
+ if (sysDept !=null){
+ //鏇村叿閮ㄩ棬id鑾峰緱瀵瑰簲鏋氫妇 閮ㄩ棬code
+ AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+ if (areaDeptEnum != null){
+ query.setDept(areaDeptEnum.getCode());
+ }
+ }
+
+
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
if (query.getUnitId() == null) {
query.setUnitId(SecurityUtils.getUnitId());
--
Gitblit v1.8.0