From fbba4ea24430b14eee18b190b7e08f1a58a8e504 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 03 八月 2023 13:48:38 +0800
Subject: [PATCH] LIMS管理系统框架-开发8-3

---
 laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MeteringPlanServiceImpl.java |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MeteringPlanServiceImpl.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MeteringPlanServiceImpl.java
index 7befcaa..1a5f4a8 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MeteringPlanServiceImpl.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MeteringPlanServiceImpl.java
@@ -1,5 +1,9 @@
 package com.yuanchu.limslaboratory.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.pojo.Instrument;
 import com.yuanchu.limslaboratory.pojo.MeteringPlan;
 import com.yuanchu.limslaboratory.mapper.MeteringPlanMapper;
 import com.yuanchu.limslaboratory.service.MeteringPlanService;
@@ -11,6 +15,8 @@
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * <p>
@@ -28,14 +34,18 @@
 
     @Override
     public Integer addMeteringPlanInformation(MeteringPlan meteringPlan) {
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        String format = simpleDateFormat.format(new Date());
-        String replace = format.replace("-", "");
-        MyUtil.PrintLog("P" + replace);
-        long num = RedisUtil.incr("num", 1);
-        
-        MyUtil.PrintLog(String.valueOf(num));
-//        return meteringPlanMapper.insert(meteringPlan);
-        return 1;
+        String timeSixNumber = MyUtil.getTimeSixNumberCode("P");
+        meteringPlan.setPlannedOrderNumber(timeSixNumber);
+        return meteringPlanMapper.insert(meteringPlan);
+    }
+
+    @Override
+    public IPage<Map<String, Object>> pagingQueryOfMeteringPlan(String measureCodeOrNameOrUnit, Page<Objects> page) {
+        return null;
+    }
+
+    @Override
+    public IPage<Map<String, Object>> pagingQueryOfMeasurementLedger(Page<Objects> page) {
+        return meteringPlanMapper.pagingQueryOfMeasurementLedger(page);
     }
 }

--
Gitblit v1.9.3