From 8244adbb31a684de274a7b11a2e5293eb6dea46d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 25 九月 2024 14:24:53 +0800
Subject: [PATCH] 工单号生成修改

---
 ycl-common/src/main/java/constant/RedisConstant.java                             |    4 +
 ycl-server/src/main/java/com/ycl/task/ClearRedisTask.java                        |    7 ++
 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml                    |    6 +-
 ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml                      |    2 
 ycl-server/src/main/java/com/ycl/utils/redis/RedisCache.java                     |   32 ++++++++++
 ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java    |    2 
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java |  114 ++++++++++++++++++++++++++++++-------
 ycl-server/src/main/java/com/ycl/utils/uuid/IdUtils.java                         |    4 
 ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java         |    4 
 9 files changed, 142 insertions(+), 33 deletions(-)

diff --git a/ycl-common/src/main/java/constant/RedisConstant.java b/ycl-common/src/main/java/constant/RedisConstant.java
index 6e66eb4..2e1ccdf 100644
--- a/ycl-common/src/main/java/constant/RedisConstant.java
+++ b/ycl-common/src/main/java/constant/RedisConstant.java
@@ -10,4 +10,8 @@
     /** 鐐逛綅鍦ㄧ嚎锛宧ash鐨刱ey */
     public final static String ONLINE_KEY = "ONLINE_";
 
+    /** redis閿� */
+    public final static String WORKORDER_NUM_LOCK = "WORKORDER_NUM_LOCK";
+    /** 姣忔棩宸ュ崟鏁� */
+    public final static String WORKORDER_NUM = "WORKORDER_NUM";
 }
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
index 0249df5..84855dc 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
@@ -29,13 +29,13 @@
     /**
      * 杩愮淮澶勭悊鏃堕棿
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date start;
 
     /**
      * 杩愮淮澶勭悊鏃堕棿
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date end;
 
     /**
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
index d2067df..2a21f9f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -146,8 +146,6 @@
         return workOrderService.all();
     }
 
-
-
     @GetMapping("/detail/info/{workOrderNo}")
     @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
     @PreAuthorize("@ss.hasPermi('work:order:detail')")
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 1770465..c156006 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
@@ -37,6 +37,7 @@
 import com.ycl.utils.redis.RedisCache;
 import com.ycl.utils.uuid.IdUtils;
 import constant.Constants;
+import constant.RedisConstant;
 import enumeration.general.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -47,6 +48,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
@@ -80,7 +82,6 @@
     private final SysConfigMapper configMapper;
     private final ReportMapper reportMapper;
     private final WorkOrderCheckImgMapper workOrderCheckImgMapper;
-
     @Value("${rtsp.server:http://127.0.0.1:7788}")
     private String rtspServer;
 
@@ -92,6 +93,7 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    //TODO锛歊edis鍔犻攣锛屼粠Redis璇诲彇褰撴棩宸ュ崟鏁版嵁閲�
     public synchronized Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
         int total = workOrderList.size();
         workOrderList.stream().filter(item -> {
@@ -138,7 +140,7 @@
                     continue;
                 } else {
                     for (String errorType : errorTypes) {
-                        if (! errorNameList.contains(errorType)) {
+                        if (!errorNameList.contains(errorType)) {
                             // 閿欒绫诲瀷涓嶄竴鏍凤紝灏辨柊澧炰竴涓敊璇被鍨嬶紝骞朵笖閲嶇疆宸ュ崟鐘舵�佷负寰呭鐞�
                             WorkOrderErrorType workOrderErrorType = new WorkOrderErrorType();
                             workOrderErrorType.setWorkOrderNo(databaseWorkOrder.getWorkOrderNo());
@@ -196,13 +198,43 @@
         SysConfig normal = configMapper.checkConfigKeyUnique("normal.wordkorder.alarm.time");
         // 濡傛灉鍗冲皢鐢熸垚宸ュ崟锛屼絾鏄澶囧浗鏍囩爜鏌ヤ笉鍒扮偣浣嶏紝鍒欎笉娣诲姞锛�
         List<WorkOrder> notAddList = new ArrayList<>();
+        //鏌edis浠婃棩宸ュ崟鏁伴噺
+        int workOrderNum = 1;
+        //UUID浣滀负value锛屼繚璇佷笂閿佺殑绾跨▼鑷繁瑙i攣
+        String requestId = IdUtils.fastSimpleUUID();
+        try {
+            for (int i = 0; i < 3; i++) {
+                boolean result = redisCache.acquireLock(RedisConstant.WORKORDER_NUM_LOCK, requestId, 10000);
+                if (result) {
+                    //鏌ヤ粖鏃ュ伐鍗曢噺
+                    Object redisNum = redisCache.getCacheObject(RedisConstant.WORKORDER_NUM);
+                    workOrderNum = redisNum == null ? 1 : (Integer) redisNum;
+                    break;
+                } else {
+                    if (i == 2) {
+                        log.error("閿佽鍗犵敤");
+                        return Boolean.FALSE;
+                    }
+                    //绛夊緟涓�娈垫椂闂村悗缁х画
+                    Thread.sleep(3000);
+                }
+            }
+        } catch (InterruptedException e) {
+            log.error("鑾峰彇閿佸紓甯�");
+            return Boolean.FALSE;
+        } finally {
+            redisCache.releaseLock(RedisConstant.WORKORDER_NUM_LOCK, requestId);
+        }
+
         for (WorkOrder workOrder : waitAddList) {
             YwPoint point = pointMapping.get(workOrder.getSerialNumber());
             if (Objects.isNull(point)) {
                 notAddList.add(workOrder);
                 continue;
             }
-            workOrder.setWorkOrderNo(IdUtils.randomNO(now));
+            //鏁板瓧鍓嶉潰琛�0
+            workOrder.setWorkOrderNo(IdUtils.randomNO(now, String.format("%05d", workOrderNum)));
+            workOrderNum++;
             if (Objects.nonNull(point.getUnitId())) {
                 workOrder.setUnitId(Math.toIntExact(point.getUnitId()));
             }
@@ -225,9 +257,11 @@
         if (CollectionUtils.isEmpty(waitAddList)) {
             return Boolean.TRUE;
         }
+        //璁板綍宸ュ崟鏁�
+        redisCache.setCacheObject(RedisConstant.WORKORDER_NUM, workOrderNum);
         // 淇濆瓨宸ュ崟鍜屾晠闅滅被鍨�
         baseMapper.addMany(waitAddList);
-        if (! CollectionUtils.isEmpty(waitAddErrorTypeList)) {
+        if (!CollectionUtils.isEmpty(waitAddErrorTypeList)) {
             workOrderErrorTypeService.getBaseMapper().addMany(waitAddErrorTypeList);
         }
         // 濡傛灉鏄洿鎺ヤ笅鍙戯紝娣诲姞涓嬪彂璁板綍
@@ -253,22 +287,38 @@
 
     /**
      * 娣诲姞
+     *
      * @param form
      * @return
      */
     @Override
     public Result add(WorkOrderForm form) {
+        //鏌edis浠婃棩宸ュ崟鏁伴噺
+        int workOrderNum = 1;
+        //UUID浣滀负value锛屼繚璇佷笂閿佺殑绾跨▼鑷繁瑙i攣
+        String requestId = IdUtils.fastSimpleUUID();
+        boolean result = redisCache.acquireLock(RedisConstant.WORKORDER_NUM_LOCK, requestId, 10000);
+        if (result) {
+            //鏌ヤ粖鏃ュ伐鍗曢噺
+            Object redisNum = redisCache.getCacheObject(RedisConstant.WORKORDER_NUM);
+            workOrderNum = redisNum == null ? 1 : (Integer) redisNum;
+            redisCache.releaseLock(RedisConstant.WORKORDER_NUM_LOCK, requestId);
+        } else {
+            return Result.error("宸ュ崟姝e湪娣诲姞锛岃绋嶅悗鍐嶈瘯");
+        }
         WorkOrder entity = WorkOrderForm.getEntityByForm(form, null);
         entity.setCreateTime(DateUtils.getNowDate());
         entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
         Date now = new Date();
         entity.setCreateTime(now);
         entity.setUpdateTime(now);
-        entity.setWorkOrderNo(IdUtils.randomNO(now));
+        entity.setWorkOrderNo(IdUtils.randomNO(now, String.format("%05d", workOrderNum)));
+        workOrderNum++;
+        redisCache.setCacheObject(RedisConstant.WORKORDER_NUM, workOrderNum);
         entity.setErrorType(String.join(",", form.getErrorType()));
         List<WorkOrderErrorType> workOrderErrorTypes = form.getErrorType().stream().map(errorType -> new WorkOrderErrorType(entity.getWorkOrderNo(), errorType)).toList();
         workOrderErrorTypeService.getBaseMapper().insertWorkOrderErrorTypeList(workOrderErrorTypes);
-        if(baseMapper.insert(entity) > 0) {
+        if (baseMapper.insert(entity) > 0) {
             return Result.ok("娣诲姞鎴愬姛");
         }
         return Result.error("娣诲姞澶辫触");
@@ -276,6 +326,7 @@
 
     /**
      * 淇敼
+     *
      * @param form
      * @return
      */
@@ -406,9 +457,9 @@
     @Override
     public List<WorkOrderAuditingRecord> selectYwAuditingListByYwId(String workOrderNo) {
         return new LambdaQueryChainWrapper<>(workOrderAuditingRecordMapper)
-                        .eq(WorkOrderAuditingRecord::getWorkOrderNo, workOrderNo)
-                        .orderByAsc(WorkOrderAuditingRecord::getCreateTime)
-                        .list();
+                .eq(WorkOrderAuditingRecord::getWorkOrderNo, workOrderNo)
+                .orderByAsc(WorkOrderAuditingRecord::getCreateTime)
+                .list();
     }
 
     @Override
@@ -423,12 +474,13 @@
 
     /**
      * 鎵归噺鍒犻櫎
+     *
      * @param ids
      * @return
      */
     @Override
     public Result remove(List<String> ids) {
-        if(baseMapper.deleteBatchIds(ids) > 0) {
+        if (baseMapper.deleteBatchIds(ids) > 0) {
             return Result.ok("鍒犻櫎鎴愬姛");
         }
         return Result.error("鍒犻櫎澶辫触");
@@ -436,12 +488,13 @@
 
     /**
      * id鍒犻櫎
+     *
      * @param id
      * @return
      */
     @Override
     public Result removeById(String id) {
-        if(baseMapper.deleteById(id) > 0) {
+        if (baseMapper.deleteById(id) > 0) {
             return Result.ok("鍒犻櫎鎴愬姛");
         }
         return Result.error("鍒犻櫎澶辫触");
@@ -449,6 +502,7 @@
 
     /**
      * 鍒嗛〉鏌ヨ
+     *
      * @param query
      * @return
      */
@@ -456,8 +510,10 @@
     public Result page(WorkOrderQuery query) {
         IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
         query.setUnitId(SecurityUtils.getUnitId());
+        query.setStart(DateUtils.getDayStart(query.getStart()));
+        query.setEnd(DateUtils.getDayEnd(query.getEnd()));
         baseMapper.page(page, query);
-        if (! CollectionUtils.isEmpty(page.getRecords())) {
+        if (!CollectionUtils.isEmpty(page.getRecords())) {
             page.getRecords().stream().forEach(item -> {
                 if (StringUtils.hasText(item.getErrorType())) {
                     item.setErrorTypeList(List.of(item.getErrorType().split(",")));
@@ -488,14 +544,14 @@
                 data.setStart(now.minusHours(1));
                 break;
             case LAST_TWO_HOUR:
-               data.setStart(now.minusHours(2));
-               break;
+                data.setStart(now.minusHours(2));
+                break;
             case LAST_DAY:
                 data.setStart(now.minusDays(1));
                 break;
             default:
                 break;
-           }
+        }
         if (Objects.isNull(data.getStart())) {
             throw new RuntimeException("鏃犳硶鐢熸垚蹇�熶笅鍙戠殑鏃堕棿鑼冨洿锛岃閫夋嫨姝g‘鐨勫揩閫熶笅鍙戞柟寮�");
         }
@@ -512,8 +568,12 @@
         List<String> workOrderNoList = list.stream().map(WorkOrder::getWorkOrderNo).toList();
         List<String> serialNumberList = list.stream().map(WorkOrder::getSerialNumber).toList();
 
-        if (workOrderNoList.isEmpty()) { return Result.error("娌℃湁绗﹀悎鏉′欢鐨勫伐鍗�"); }
-        if (!getDistributeLock()) { return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�"); }
+        if (workOrderNoList.isEmpty()) {
+            return Result.error("娌℃湁绗﹀悎鏉′欢鐨勫伐鍗�");
+        }
+        if (!getDistributeLock()) {
+            return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�");
+        }
         try {
             new LambdaUpdateChainWrapper<>(baseMapper)
                     .set(WorkOrder::getStatus, WorkOrderStatusEnum.DISTRIBUTED)
@@ -534,7 +594,9 @@
     @Transactional
     public Result selectedIdsDistribute(DistributeWorkOrderQuery query) {
         WorkOrderDistributeWayEnum distributeWayEnum = WorkOrderDistributeWayEnum.SELECTED_DISTRIBUTE;
-        if (!getDistributeLock()) { return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�"); }
+        if (!getDistributeLock()) {
+            return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�");
+        }
         try {
             if (query.getWorkOrderNOList().isEmpty()) {
                 query.setWorkOrderNOList(new LambdaQueryChainWrapper<>(baseMapper)
@@ -547,7 +609,9 @@
                         .collect(Collectors.toList()));
                 distributeWayEnum = WorkOrderDistributeWayEnum.ALL_DISTRIBUTE;
             }
-            if (query.getWorkOrderNOList().isEmpty()) { return Result.error("娌℃湁宸ュ崟寰呬笅鍙�"); }
+            if (query.getWorkOrderNOList().isEmpty()) {
+                return Result.error("娌℃湁宸ュ崟寰呬笅鍙�");
+            }
             new LambdaUpdateChainWrapper<>(baseMapper)
                     .set(WorkOrder::getStatus, WorkOrderStatusEnum.DISTRIBUTED)
                     .in(WorkOrder::getWorkOrderNo, query.getWorkOrderNOList())
@@ -566,6 +630,7 @@
 
     /**
      * 鐢宠宸ュ崟涓嬪彂閿�
+     *
      * @return 宸ュ崟涓嬪彂閿佺敵璇风粨鏋�
      */
     public synchronized Boolean getDistributeLock() {
@@ -586,6 +651,7 @@
 
     /**
      * 娣诲姞宸ュ崟涓嬪彂璁板綍
+     *
      * @param workOrderNoList 宸ュ崟id
      */
     private void addDistributeRecord(List<String> workOrderNoList, WorkOrderDistributeWayEnum distributeWay) {
@@ -599,6 +665,7 @@
 
     /**
      * 鏍规嵁id鏌ユ壘
+     *
      * @param id
      * @return
      */
@@ -613,6 +680,7 @@
 
     /**
      * 鍒楄〃
+     *
      * @return
      */
     @Override
@@ -675,8 +743,8 @@
         for (WorkOrderRegionVO vo : vos) {
             for (WorkOrderRegionVO workOrder : workOrderRegionVOS) {
                 //璧嬪��
-                if(vo.getArea().equals(workOrder.getArea())){
-                    BeanUtils.copyProperties(workOrder,vo);
+                if (vo.getArea().equals(workOrder.getArea())) {
+                    BeanUtils.copyProperties(workOrder, vo);
                 }
             }
         }
@@ -837,7 +905,7 @@
         if (Objects.nonNull(beforeRecord)) {
             if (now.before(beforeRecord.getBeginCreateTime())) {
                 process.setBeforeReportMsg("浜嬪墠鎶ュ宸插け鏁�");
-            } else if (now.after(beforeRecord.getEndCreateTime())){
+            } else if (now.after(beforeRecord.getEndCreateTime())) {
                 process.setBeforeReportMsg("浜嬪墠鎶ュ鏈敓鏁�");
             } else {
                 process.setBeforeReportMsg("宸蹭簨鍓嶆姤澶�");
@@ -846,7 +914,7 @@
         if (Objects.nonNull(afterRecord)) {
             if (now.before(afterRecord.getBeginCreateTime())) {
                 process.setAfterReportMsg("浜嬪悗鎶ュ宸插け鏁�");
-            } else if (now.after(afterRecord.getEndCreateTime())){
+            } else if (now.after(afterRecord.getEndCreateTime())) {
                 process.setAfterReportMsg("浜嬪悗鎶ュ鏈敓鏁�");
             } else {
                 process.setAfterReportMsg("宸蹭簨鍚庢姤澶�");
diff --git a/ycl-server/src/main/java/com/ycl/task/ClearRedisTask.java b/ycl-server/src/main/java/com/ycl/task/ClearRedisTask.java
index 37b16cd..2b0c71c 100644
--- a/ycl-server/src/main/java/com/ycl/task/ClearRedisTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/ClearRedisTask.java
@@ -25,4 +25,11 @@
         redisTemplate.delete(RedisConstant.ONLINE_KEY);
     }
 
+    /**
+     * 娓呴櫎redis姣忔棩宸ュ崟鏁�
+     *
+     */
+    public void clearWorkOrderNum() {
+        redisTemplate.delete(RedisConstant.WORKORDER_NUM);
+    }
 }
diff --git a/ycl-server/src/main/java/com/ycl/utils/redis/RedisCache.java b/ycl-server/src/main/java/com/ycl/utils/redis/RedisCache.java
index b30193b..5a6f3d2 100644
--- a/ycl-server/src/main/java/com/ycl/utils/redis/RedisCache.java
+++ b/ycl-server/src/main/java/com/ycl/utils/redis/RedisCache.java
@@ -262,4 +262,36 @@
     {
         return redisTemplate.keys(pattern);
     }
+
+    /**
+     * 灏濊瘯鑾峰彇閿�
+     *
+     * @param lockKey    閿佺殑閿�
+     * @param requestId  璇锋眰鏍囪瘑锛岀敤浜庡尯鍒嗕笉鍚岀殑閿佹寔鏈夎��
+     * @param expireTime 閿佺殑杩囨湡鏃堕棿锛屽崟浣嶄负姣
+     * @return 濡傛灉鎴愬姛鑾峰彇閿侊紝杩斿洖 true锛涘惁鍒欒繑鍥� false
+     */
+    public boolean acquireLock(String lockKey, String requestId, long expireTime) {
+        // 浣跨敤 setIfAbsent 鏂规硶灏濊瘯璁剧疆閿�煎锛屽鏋滈敭涓嶅瓨鍦ㄥ垯璁剧疆鎴愬姛骞惰繑鍥� true锛屽惁鍒欒繑鍥� false
+        Boolean result = redisTemplate.opsForValue().setIfAbsent(lockKey, requestId, expireTime, TimeUnit.MILLISECONDS);
+        return result != null && result;
+    }
+
+    /**
+     * 閲婃斁閿�
+     *
+     * @param lockKey   閿佺殑閿�
+     * @param requestId 璇锋眰鏍囪瘑锛岀敤浜庣‘淇濆彧鏈夐攣鐨勬寔鏈夎�呮墠鑳介噴鏀鹃攣
+     * @return 濡傛灉鎴愬姛閲婃斁閿侊紝杩斿洖 true锛涘惁鍒欒繑鍥� false
+     */
+    public boolean releaseLock(String lockKey, String requestId) {
+        // 鑾峰彇褰撳墠閿佺殑鍊�
+        String currentValue = (String) redisTemplate.opsForValue().get(lockKey);
+        // 妫�鏌ュ綋鍓嶉攣鐨勫�兼槸鍚︾瓑浜庤姹傛爣璇嗭紝纭繚鍙湁閿佺殑鎸佹湁鑰呮墠鑳介噴鏀鹃攣
+        if (currentValue != null && currentValue.equals(requestId)) {
+            // 鍒犻櫎閿侀敭
+            return Boolean.TRUE.equals(redisTemplate.delete(lockKey));
+        }
+        return false;
+    }
 }
diff --git a/ycl-server/src/main/java/com/ycl/utils/uuid/IdUtils.java b/ycl-server/src/main/java/com/ycl/utils/uuid/IdUtils.java
index 29c88bf..4591d9c 100644
--- a/ycl-server/src/main/java/com/ycl/utils/uuid/IdUtils.java
+++ b/ycl-server/src/main/java/com/ycl/utils/uuid/IdUtils.java
@@ -59,8 +59,8 @@
      *
      * @return 缂栧彿
      */
-    public static String randomNO(Date now)
+    public static String randomNO(Date now,String orderNumber)
     {
-        return DAY_FORMAT.format(now) + UUID.randomUUID().toString().replaceAll("-","").substring(0, 18);
+        return DAY_FORMAT.format(now) + orderNumber;
     }
 }
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 57d8df7..10b5140 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -68,14 +68,14 @@
         <if test="query.status != null and query.status != ''">
             AND wo.status = #{query.status}
         </if>
-        <if test="query.start != null">
-            AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end}
+        <if test="query.start != null and query.end != null">
+            AND wo.create_time BETWEEN #{query.start} AND #{query.end}
         </if>
         GROUP BY
         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
+        ORDER BY wo.work_order_no DESC
     </select>
 
     <select id="distributePage" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 946239a..ce49da5 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -55,7 +55,7 @@
         </where>
     </select>
 
-    <select id="dataCenterPage">
+    <select id="dataCenterPage" resultType="com.ycl.platform.domain.vo.PointDetailVO">
         SELECT
                m.*
         FROM

--
Gitblit v1.8.0