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 | 116 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 91 insertions(+), 25 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 e022a25..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
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.util.StringUtil;
import com.ycl.config.PlatformConfig;
import com.ycl.exception.ServiceException;
import com.ycl.platform.domain.entity.*;
@@ -26,10 +27,13 @@
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;
import com.ycl.utils.http.HttpUtils;
@@ -106,6 +110,8 @@
@Autowired
private RedisCache redisCache;
+ @Autowired
+ private DeleteWorkOrderImgTask deleteWorkOrderImgTask;
@Override
public synchronized Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
@@ -587,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)
@@ -609,33 +646,41 @@
img.setWorkOrderNo(workOrder.getWorkOrderNo());
img.setImgUrl(frameImg);
img.setCreateTime(new Date());
- //鍒ゆ柇璇ュ伐鍗曠殑鍥剧墖鏄惁宸茬粡澶т簬5寮犱簡
- LambdaQueryChainWrapper<WorkOrderCheckImg> qw = new LambdaQueryChainWrapper<>(workOrderCheckImgMapper);
-
- //鎸夌収鍒涘缓鏃ユ湡闄嶅簭鎺掑垪
- List<WorkOrderCheckImg> workOrderList = workOrderCheckImgMapper.selectList(
- new LambdaQueryChainWrapper<>(workOrderCheckImgMapper)
- .eq(WorkOrderCheckImg::getWorkOrderNo, workOrder.getWorkOrderNo())
- .orderByDesc(WorkOrderCheckImg::getCreateTime)
- );
//淇濈暀鏈�鏂扮殑5寮�
- if (workOrderList.size()>=5){
- List<String> imgList = workOrderList.subList(4,workOrderList.size()).stream().map(WorkOrderCheckImg::getImgUrl).collect(Collectors.toList());
- List<Integer> idList = workOrderList.subList(4, workOrderList.size()).stream().map(WorkOrderCheckImg::getId).collect(Collectors.toList());
- //鍒犻櫎鐓х墖 锛屽苟涓旂墿鐞嗗垹闄ゆ湇鍔″櫒鍐呭搴旂収鐗囩殑鍚嶅瓧
-
-// /profile/2024-11-18_1d8e6d37-a4d0-4bba-8473-ff4e50eda83d.png
- for (String filePath: imgList){
- delImgFormClient(filePath);
- }
- workOrderCheckImgMapper.deleteBatchIds(idList);
-
- }
-
-
workOrderCheckImgMapper.insert(img);
}
}
+
+ /**
+ * 娓呯悊宸ュ崟鍥剧墖
+ * */
+ public void clearWorkOrderImg(String workOrderNo) {
+ //鍒ゆ柇璇ュ伐鍗曠殑鍥剧墖鏄惁宸茬粡澶т簬5寮犱簡
+ //鎸夌収鍒涘缓鏃ユ湡闄嶅簭鎺掑垪
+ if (StringUtil.isEmpty(workOrderNo)) {
+ return;
+ }
+ List<WorkOrderCheckImg> workOrderList = new LambdaQueryChainWrapper<WorkOrderCheckImg>(workOrderCheckImgMapper)
+ .select()
+ .eq(WorkOrderCheckImg::getWorkOrderNo, workOrderNo)
+ .orderByDesc(WorkOrderCheckImg::getCreateTime)
+ .list();
+ if (workOrderList.size()>=5){
+ List<String> imgList = workOrderList.subList(4,workOrderList.size()).stream().map(WorkOrderCheckImg::getImgUrl).collect(Collectors.toList());
+ List<Integer> idList = workOrderList.subList(4, workOrderList.size()).stream().map(WorkOrderCheckImg::getId).collect(Collectors.toList());
+ //鍒犻櫎鐓х墖 锛屽苟涓旂墿鐞嗗垹闄ゆ湇鍔″櫒鍐呭搴旂収鐗囩殑鍚嶅瓧
+
+// /profile/2024-11-18_1d8e6d37-a4d0-4bba-8473-ff4e50eda83d.png
+ log.error("鍒犻櫎宸ュ崟鐓х墖闆嗗悎url:{}",imgList);
+ log.error("鍒犻櫎宸ュ崟瀛樺偍鏁版嵁闆嗗悎id:{}",idList);
+ for (String filePath: imgList){
+ delImgFormClient(filePath);
+ }
+ workOrderCheckImgMapper.deleteBatchIds(idList);
+ }
+
+ }
+
@Override
public List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(String workOrderNo) {
@@ -697,7 +742,8 @@
log.error("url閿欒锛歿}",imgPath);
}else{
//鎻愬彇鏃ユ湡閮ㄥ垎 缁勮鐩綍 : /opt/zgyw/uploadPath + / + yyyy-MM-dd +
- String pathName = PlatformConfig.getUploadPath() + "/" + FileUtils.extractDateFromString(url);
+ String pathName = DeleteWorkOrderImgTask.imgSaveBasePath + "/" + FileUtils.extractDateFromString(url);
+ log.error("鍒犻櫎宸ュ崟鍥剧墖闆嗗悎{}",pathName+"/" + imgPath);
FileUtils.deleteFile(pathName+"/" + imgPath);
}
}
@@ -743,7 +789,7 @@
-
+ private final ISysDeptService deptService;
/**
* 鍒嗛〉鏌ヨ
*
@@ -752,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());
@@ -1231,6 +1295,8 @@
List<SysDictData> errorList = workOrderErrorTypeService.getBaseMapper().getErrorList(workOrder.getWorkOrderNo());
List<String> errList = errorList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList());
workOrder.setErrorTypeList(errList);
+ //璇︽儏鏃跺啀娆℃竻鐞�
+ clearWorkOrderImg(workOrderNo);
// 妫�娴嬪浘鐗�
List<WorkOrderCheckImg> imgList = new LambdaQueryChainWrapper<>(workOrderCheckImgMapper)
.eq(WorkOrderCheckImg::getWorkOrderNo, workOrderNo)
--
Gitblit v1.8.0