From e72b3ab95aace19535fe596897822f0e334de5d6 Mon Sep 17 00:00:00 2001
From: “zhuo” <“zhuo@itcast.cn”>
Date: 星期五, 11 八月 2023 18:00:23 +0800
Subject: [PATCH] 8-11提交代码
---
cnas-server/src/main/java/com/yuanchu/limslaboratory/service/impl/CnasAnnualPlanServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/impl/CnasAnnualPlanServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/impl/CnasAnnualPlanServiceImpl.java
index c797363..397621f 100644
--- a/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/impl/CnasAnnualPlanServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/impl/CnasAnnualPlanServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,6 +12,7 @@
import com.yuanchu.limslaboratory.service.CnasAnnualPlanService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.util.Date;
@@ -31,19 +33,60 @@
/**
* 鏌ヨ瀹℃牳璁″垝
+ *
* @return
*/
@Override
- public IPage<CnasAnnualPlanVo> selectAllList(Page<Object> objectPage, Date beginTime, Date endTime) {
- IPage<CnasAnnualPlanVo> page = cnasAnnualPlanMapper.selectAllList(objectPage, beginTime, endTime);
+ public IPage<CnasAnnualPlanVo> selectAllList(Page<Object> objectPage, Date planTime) {
+ //鍒ゆ柇鏄惁鏈夋棩鏈�
+ Integer yearTime = null;
+ Integer monthTime = null;
+ if (planTime != null) {
+ yearTime = DateUtil.year(planTime);
+ monthTime = DateUtil.month(planTime) + 2;
+ }
+ IPage<CnasAnnualPlanVo> page = cnasAnnualPlanMapper.selectAllList(objectPage, yearTime, monthTime);
page.getRecords().forEach(cnasAnnualPlanVo -> {
//鑾峰彇璁″垝鏃堕棿
Date time = cnasAnnualPlanVo.getPlanTime();
- //娣诲姞骞�
+ //娣诲姞骞存湀
cnasAnnualPlanVo.setYear(DateUtil.year(time));
- //娣诲姞鏈�
cnasAnnualPlanVo.setMonth(DateUtil.month(time) + 1);
+ //鍒ゆ柇瀹℃牳鐘舵��
+ //鑾峰彇褰撳墠鏃堕棿
+ Date nowDate = new Date();
+ //鑾峰彇褰撳墠鐨勫勾鏈�
+ int year = DateUtil.year(nowDate);
+ int month = DateUtil.month(nowDate) + 1;
+ if (cnasAnnualPlanVo.getAuditTime() == null && month > cnasAnnualPlanVo.getMonth() || year > cnasAnnualPlanVo.getYear()) {
+ cnasAnnualPlanVo.setAuditState(2);
+ } else if (cnasAnnualPlanVo.getAuditTime() != null) {
+ cnasAnnualPlanVo.setAuditState(1);
+ } else {
+ cnasAnnualPlanVo.setAuditState(0);
+ }
});
return page;
}
+
+ /**
+ * 涓婁紶闄勪欢
+ */
+ @Override
+ public void addAccessory(String name, Date auditTime, MultipartFile file) {
+ //todo: 涓婁紶闄勪欢鏈畬鎴�
+ }
+
+ /**
+ * 鍒犻櫎骞村害璁″垝
+ *
+ * @return
+ */
+ @Override
+ public Integer deleteCnasAnnualPlan(Integer planId) {
+ LambdaUpdateWrapper<CnasAnnualPlan> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(CnasAnnualPlan::getId, planId);
+ updateWrapper.set(CnasAnnualPlan::getState, 0);
+ return cnasAnnualPlanMapper.update(new CnasAnnualPlan(), updateWrapper);
+ }
}
--
Gitblit v1.9.3