From a638cb450abb78346ecf19754b639fc945bc486b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 10 八月 2025 19:21:16 +0800
Subject: [PATCH] zip包判断修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java
index 38b9c52..e9d91e3 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java
@@ -1,7 +1,7 @@
package org.springblade.mdm.basesetting.producedivision.service;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -16,15 +16,45 @@
@Service
public class ProduceDivisionService extends BizServiceImpl<ProduceDivisionMapper, ProduceDivision> {
+ /**
+ * 鏂板鍒嗗伐琛�
+ * @param vo
+ */
@Transactional
- public void savePlan(ProduceDivisionVO vo){
- //TODO
+ public void saveDivision(ProduceDivisionVO vo){
+ if(drawingNoExists(vo.getDrawingNo(),null)){
+ throw new ServiceException("鍥惧彿宸插瓨鍦細"+vo.getDrawingNo());
+ }
ProduceDivision plan = new ProduceDivision();
BeanUtil.copyProperties(vo, plan);
this.save(plan);
}
- public boolean updatePlan(ProduceDivisionVO vo) {
+ /**
+ * 鍒ゆ柇鍥惧彿鏄惁宸插瓨鍦�
+ * @param drawingNo 鍥惧彿
+ * @param excludeId 鎺掗櫎id
+ * @return 鏄惁瀛樺湪
+ */
+ boolean drawingNoExists(String drawingNo,Long excludeId){
+ return this.lambdaQuery()
+ .eq(ProduceDivision::getDrawingNo, drawingNo)
+ .ne(excludeId!=null,ProduceDivision::getId,excludeId).count()>0;
+ }
+
+ /**
+ * 淇敼鍒嗗伐琛�
+ * @param vo 鏁版嵁VO
+ * @return 鏄惁鎴愬姛
+ */
+ public boolean updateDivision(ProduceDivisionVO vo) {
+ if(vo.getId() == null){
+ throw new ServiceException("id涓嶈兘鏈┖");
+ }
+ if(drawingNoExists(vo.getDrawingNo(),vo.getId())){
+ throw new ServiceException("鍥惧彿宸插瓨鍦細"+vo.getDrawingNo());
+ }
+
ProduceDivision plan = this.getById(vo.getId());
plan.setTeamLeaderId(vo.getTeamLeaderId());
@@ -39,11 +69,6 @@
* @return 鍒嗛〉鏁版嵁
*/
public IPage<ProduceDivisionViewVO> pageQuery(String name, Query query) {
-
- LambdaQueryWrapper<ProduceDivision> queryWrapper = new LambdaQueryWrapper<>();
-
-
-
return this.getBaseMapper().pageQuery(Condition.getPage(query),name);
}
}
--
Gitblit v1.9.3