From 04b4676f4f8f2674a0fdd52624c417d600f6f06b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 05 十二月 2023 16:19:30 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 62 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index 7e1a226..32c2f3b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -10,17 +10,16 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import com.sun.org.apache.bcel.internal.generic.NEW;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
-import com.vci.ubcs.code.entity.CodeClassify;
-import com.vci.ubcs.code.entity.CodeClassifyTemplate;
+import com.vci.ubcs.code.entity.*;
import com.vci.ubcs.code.enumpack.FrameworkDataLCStatus;
-import com.vci.ubcs.code.mapper.CodeClassifyMapper;
-import com.vci.ubcs.code.mapper.CodeClassifyTemplateMapper;
-import com.vci.ubcs.code.mapper.CommonsMapper;
+import com.vci.ubcs.code.mapper.*;
import com.vci.ubcs.code.po.CodeClassifyPO;
import com.vci.ubcs.code.service.ICodeClassifyService;
import com.vci.ubcs.code.service.ICodeKeyAttrRepeatService;
import com.vci.ubcs.code.service.ICodeRuleService;
+import com.vci.ubcs.code.vo.pagemodel.CodeAllCodeVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
@@ -62,6 +61,7 @@
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -106,6 +106,15 @@
@Resource
private ICodeKeyAttrRepeatService iCodeKeyattrrepeatService;
+
+ @Resource
+ private CodeAllCodeMapper codeAllCodeMapper;
+
+ @Resource
+ private CodeSerialValueMapper codeSerialValueMapper;
+
+ @Resource
+ private CodeBasicSecMapper codeBasicSecMapper;
/**
* 涓婄骇鑺傜偣鐨勫睘鎬у悕绉�
*/
@@ -683,6 +692,49 @@
return oids;
}
+ /**
+ * 娴佹按渚濊禆鐢熸垚
+ */
+ @Override
+ public R flowingDependencyGen(String classifyOid) {
+
+ //鏌ヨ姝ゅ垎绫讳笅闈㈢殑鎵�鏈夊垎绫�
+ List<CodeClassify> codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(classifyOid,AuthUtil.getTenantId(),null);
+ //鏌ヨ鐮佸�艰〃锛岃幏鍙栨渶澶ф祦姘�
+ List<CodeAllCode> codeAllCodeVOS = codeAllCodeMapper.selectGroupByClassify("'" + codeClassifyList.stream()
+ .map(classfiy -> classfiy.getOid()).collect(Collectors.joining("','")) + "'","'${sav}'");
+ //寰�娴佹按琛ㄩ噷闈㈠姞鏁版嵁锛屾湁鍒欐洿鏂帮紝鏃犲垯娣诲姞鏁版嵁銆�
+ for (CodeAllCode codeAllCodeVO : codeAllCodeVOS) {
+ QueryWrapper<CodeBasicSec> secWrapper = new QueryWrapper<>();
+ secWrapper.eq("PKCODERULE",codeAllCodeVO.getCodeRuleOid());
+ secWrapper.eq("SECTYPE","codeserialsec");
+ CodeBasicSec codeBasicSec = codeBasicSecMapper.selectOne(secWrapper);
+ QueryWrapper<CodeSerialValue> wrapper = new QueryWrapper<>();
+ wrapper.eq("codeRuleOid",codeAllCodeVO.getCodeRuleOid());
+ wrapper.eq("serialUnit",codeAllCodeVO.getSerialUnit());
+ wrapper.eq("codeSecOid",codeBasicSec.getOid());
+ CodeSerialValue codeSerialValue = codeSerialValueMapper.selectOne(wrapper);
+ if(codeSerialValue == null){
+ CodeSerialValue newSerialValue = new CodeSerialValue();
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(newSerialValue,"codeserialvalue");
+ newSerialValue.setCodeRuleOid(codeAllCodeVO.getCodeRuleOid());
+ newSerialValue.setCodeSecOid(codeBasicSec.getOid());
+ newSerialValue.setSerialUnit(codeAllCodeVO.getSerialUnit());
+ newSerialValue.setMaxSerial(codeAllCodeVO.getUnFillSerial());
+ newSerialValue.setLctid("defaultLC");
+ newSerialValue.setLcStatus("Exist");
+ codeSerialValueMapper.insert(newSerialValue);
+ }else{
+ codeSerialValue.setMaxSerial(codeAllCodeVO.getUnFillSerial());
+ codeSerialValue.setLastModifyTime(new Date());
+ codeSerialValue.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
+ codeSerialValue.setTs(new Date());
+ codeSerialValueMapper.updateById(codeSerialValue);
+ }
+ }
+ return R.success("鎿嶄綔鎴愬姛锛�");
+ }
+
/***
* 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅
* @param desc
--
Gitblit v1.9.3