From 8c4ef7df21fec046ee65cd654de7b6456a7ccc15 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 05:23:52 +0800
Subject: [PATCH] bug
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 4 ++--
ycl-server/src/main/java/com/ycl/task/UYTask.java | 8 ++++----
ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java | 2 +-
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 18 ++++++++++--------
4 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
index 62fb564..a4e0441 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -68,10 +68,11 @@
if (Objects.isNull(form.getPointId())) {
throw new RuntimeException("鐐逛綅涓嶈兘涓虹┖");
}
- Long userId = SecurityUtils.getUserId();
- YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one();
- form.setPeopleId(people.getId());
- form.setUnitId(people.getBelongUnit());
+ Integer unitId = SecurityUtils.getUnitId();
+ if (Objects.isNull(unitId)) {
+ throw new RuntimeException("闈炶繍缁村崟浣嶆殏鏃舵棤娉曟姤澶�");
+ }
+ form.setUnitId(unitId);
if ("浜嬪墠鎶ュ".equals(form.getReportType())) {
// 濡傛灉鏄簨鍓嶆姤澶囬渶瑕佹楠屾槸鍚﹀凡缁忕敓鎴愪笅鍙戝伐鍗�
YwPointVO point = ywpointMapper.countNotFinishedWorkOrderByGb(form.getPointId());
@@ -116,10 +117,11 @@
@SneakyThrows
@Transactional
public Result importData(ReportForm form) {
- Long userId = SecurityUtils.getUserId();
- YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one();
- form.setPeopleId(people.getId());
- form.setUnitId(people.getBelongUnit());
+ Integer unitId = SecurityUtils.getUnitId();
+ if (Objects.isNull(unitId)) {
+ throw new RuntimeException("闈炶繍缁村崟浣嶆殏鏃舵棤娉曟姤澶�");
+ }
+ form.setUnitId(unitId);
form.setBeginCreateTime(DateUtils.parseDate(form.getBeginCreateTimeStr()));
form.setEndCreateTime(DateUtils.parseDate(form.getEndCreateTimeStr()));
// 璇诲彇excel鏁版嵁
diff --git a/ycl-server/src/main/java/com/ycl/task/UYTask.java b/ycl-server/src/main/java/com/ycl/task/UYTask.java
index 8946da9..0554404 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -96,8 +96,8 @@
log.error("鍥惧儚鐩戞祴鏁版嵁涓虹┖");
}
// 鏈湴娴嬭瘯
- Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
- uyErrorTypeCheckService.imageDetectionCheck(mongoTemplate.find(query, ImageDetectionResult.class));
+// Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
+// uyErrorTypeCheckService.imageDetectionCheck(mongoTemplate.find(query, ImageDetectionResult.class));
log.info("缁撴潫鎵ц鍥惧儚鐩戞祴鏁版嵁鍚屾");
}
@@ -217,8 +217,8 @@
}
}
// 鏈湴娴嬭瘯
- Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
- uyErrorTypeCheckService.recordMetaDSumCheck(mongoTemplate.find(query, RecordMetaDSumResult.class));
+// Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
+// uyErrorTypeCheckService.recordMetaDSumCheck(mongoTemplate.find(query, RecordMetaDSumResult.class));
log.info("缁撴潫鎵ц褰曞儚鍙敤鏁版嵁鍚屾");
}
diff --git a/ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java b/ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java
index c1af0d8..18ab60d 100644
--- a/ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java
+++ b/ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java
@@ -46,7 +46,7 @@
try {
if (isAdmin(getUserId())) {
return null;
- } else if (hasRole("yw_admin")) {
+ } else if (hasRole("zg_city")) {
return null;
}
return getLoginUser().getUser().getUnitId();
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 9cbbbda..4717be2 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -32,7 +32,7 @@
<select id="page" resultMap="BaseResultMap">
SELECT
- wo.id,wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
+ wo.id,wo.status, wo.work_order_no, wo.serial_number,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
u.unit_name,
p.yw_person_name,
tm.name as source,
@@ -65,7 +65,7 @@
AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end}
</if>
GROUP BY
- wo.id, wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id,tm.name, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
+ wo.id, wo.status, wo.work_order_no, wo.serial_number,wo.create_time, wo.unit_id, wo.yw_people_id,tm.name, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
u.unit_name,
p.yw_person_name
ORDER BY wo.create_time DESC
--
Gitblit v1.8.0