From 58f820f804046e7fe82bef5a7b428b442a728e8a Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 17 八月 2023 08:54:13 +0800
Subject: [PATCH] 计量管理-》计量台账
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MeteringPlanServiceImpl.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 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..741d4a9 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,7 +1,12 @@
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.pojo.dto.SelectMeasurementLedgerDto;
import com.yuanchu.limslaboratory.service.MeteringPlanService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.utils.MyUtil;
@@ -11,6 +16,8 @@
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Map;
+import java.util.Objects;
/**
* <p>
@@ -28,14 +35,21 @@
@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","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(SelectMeasurementLedgerDto dto) {
+ return meteringPlanMapper.pagingQueryOfMeasurementLedger(new Page<>(dto.getCurrentPage(),dto.getPageSize(),true),dto);
}
}
--
Gitblit v1.9.3