From 93c7226d536d312fc083a57619629192ba076413 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 01 十二月 2023 12:36:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyProcessTempController.java | 103 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 73 insertions(+), 30 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyProcessTempController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyProcessTempController.java
index 98cf7d8..6134e2c 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyProcessTempController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyProcessTempController.java
@@ -1,17 +1,28 @@
package com.vci.ubcs.code.controller;
-import com.vci.ubcs.code.service.CodeClassifyProcessTempServiceI;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.VciBaseUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.vci.ubcs.code.dto.CodeClassifyProcessTempDTO;
+import com.vci.ubcs.code.entity.CodeClassifyProcessTemp;
+import com.vci.ubcs.code.service.ICodeClassifyProcessTempService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyProcessTempVO;
+import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
+import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
+import com.vci.ubcs.starter.web.pagemodel.DataGrid;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import com.vci.ubcs.starter.web.wrapper.VciQueryWrapperForDO;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanMap;
import org.springframework.web.bind.annotation.*;
-import java.util.Collection;
-import java.util.List;
+import javax.validation.Valid;
+import java.util.*;
+import java.util.stream.Collectors;
+
/**
* 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎帶鍒跺櫒
@@ -21,12 +32,15 @@
*/
@RestController
@RequestMapping("/codeClsProcessTempController")
+@AllArgsConstructor
+@Api(value = "缂栫爜搴撳畾涔�-娴佺▼妯℃澘", tags = "缂栫爜搴撳畾涔�-娴佺▼妯℃澘鎺ュ彛")
public class CodeClassifyProcessTempController {
+
/**
* 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉� 鏈嶅姟
*/
@Autowired
- private CodeClassifyProcessTempServiceI codeClassifyProcessTempService;
+ private ICodeClassifyProcessTempService codeClassifyProcessTempService;
/**
* 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉垮垪琛�
@@ -34,21 +48,22 @@
* @return 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎樉绀哄璞″垪琛�
*/
@GetMapping("/gridCodeClassifyProcessTemp")
- public DataGrid<CodeClassifyProcessTempVO> gridCodeClassifyProcessTemp(BaseQueryObject baseQueryObject){
+ public R<IPage<CodeClassifyProcessTempVO>> gridCodeClassifyProcessTemp(BaseQueryObject baseQueryObject){
if(baseQueryObject == null){
baseQueryObject = new BaseQueryObject();
}
- return codeClassifyProcessTempService.gridCodeClassifyProcessTemp(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
+ return R.data(codeClassifyProcessTempService.gridCodeClassifyProcessTemp(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()));
}
+
/**
* 澧炲姞 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
* @param codeClassifyProcessTempDTO 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹紶杈撳璞�
* @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
*/
@PostMapping( "/addSave")
- public BaseResult<CodeClassifyProcessTempVO> addSave(@RequestBody CodeClassifyProcessTempDTO codeClassifyProcessTempDTO){
+ public R<CodeClassifyProcessTempVO> addSave(@RequestBody CodeClassifyProcessTempDTO codeClassifyProcessTempDTO){
CodeClassifyProcessTempVO codeClassifyProcessTempVO = codeClassifyProcessTempService.addSave(codeClassifyProcessTempDTO);
- return BaseResult.success(codeClassifyProcessTempVO);
+ return R.data(codeClassifyProcessTempVO);
}
/**
@@ -57,11 +72,10 @@
* @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
*/
@PutMapping("/editSave")
- public BaseResult<CodeClassifyProcessTempVO> editSave(@RequestBody CodeClassifyProcessTempDTO codeClassifyProcessTempDTO){
+ public R<CodeClassifyProcessTempVO> editSave(@RequestBody CodeClassifyProcessTempDTO codeClassifyProcessTempDTO){
CodeClassifyProcessTempVO codeClassifyProcessTempVO = codeClassifyProcessTempService.editSave(codeClassifyProcessTempDTO);
- return BaseResult.success(codeClassifyProcessTempVO);
+ return R.data(codeClassifyProcessTempVO);
}
-
/**
* 鍒犻櫎鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
@@ -69,7 +83,7 @@
* @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
*/
@DeleteMapping( "/deleteData")
- public BaseResult delCodeClassifyProcessTemp( CodeClassifyProcessTempDTO codeClassifyProcessTempDTO) {
+ public R delCodeClassifyProcessTemp(@Valid @RequestBody CodeClassifyProcessTempDTO codeClassifyProcessTempDTO) {
return codeClassifyProcessTempService.deleteCodeClassifyProcessTemp(codeClassifyProcessTempDTO);
}
@@ -79,9 +93,9 @@
* @return 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎樉绀哄璞�
*/
@GetMapping("/getObjectByOid")
- public BaseResult<CodeClassifyProcessTempVO> getObjectByOid(String oid){
+ public R<CodeClassifyProcessTempVO> getObjectByOid(String oid){
CodeClassifyProcessTempVO codeClassifyProcessTempVO = codeClassifyProcessTempService.getObjectByOid(oid);
- return BaseResult.success(codeClassifyProcessTempVO);
+ return R.data(codeClassifyProcessTempVO);
}
/**
@@ -90,14 +104,10 @@
* @return 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎樉绀哄璞�
*/
@GetMapping("/listDataByOids")
- public BaseResult<CodeClassifyProcessTempVO> listCodeClassifyProcessTempByOids(String oids){
+ public R<Collection<CodeClassifyProcessTempVO>> listCodeClassifyProcessTempByOids(String oids){
Collection<CodeClassifyProcessTempVO> voCollection = codeClassifyProcessTempService.listCodeClassifyProcessTempByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
+ return R.data(voCollection);
}
-
-
/**
* 鍙傜収鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉垮垪琛�
@@ -105,11 +115,11 @@
* @return 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
*/
@GetMapping("/refDataGrid")
- public DataGrid<CodeClassifyProcessTempVO> refDataGridCodeClassifyProcessTemp(BaseQueryObject baseQueryObject){
+ public R<IPage<CodeClassifyProcessTempVO>> refDataGridCodeClassifyProcessTemp(BaseQueryObject baseQueryObject){
if(baseQueryObject == null){
baseQueryObject = new BaseQueryObject();
}
- return codeClassifyProcessTempService.refDataGridCodeClassifyProcessTemp(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
+ return R.data(codeClassifyProcessTempService.refDataGridCodeClassifyProcessTemp(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()));
}
/**
@@ -119,11 +129,44 @@
* @return 娴佺▼妯℃澘鐨勪俊鎭�
*/
@GetMapping("/listProcessTemplate")
- public BaseResult<CodeClassifyProcessTempVO> listProcessTemplate(String codeTemplateOid,String processUse){
+ public R<List<CodeClassifyProcessTempVO>> listProcessTemplate(String codeTemplateOid,String processUse){
List<CodeClassifyProcessTempVO> processTempVOList = codeClassifyProcessTempService.listProcessTemplate(codeTemplateOid,processUse);
- BaseResult result = BaseResult.success();
- result.setData(processTempVOList);
- return result;
+ return R.data(processTempVOList);
+ }
+
+ /**
+ * 浣跨敤妯℃澘鑾峰彇浣跨敤鐨勬祦绋嬫ā鏉�
+ * @param codeTemplateOid 妯℃澘鐨勪富閿�
+ * @param processUse 娴佺▼鐨勭敤閫�
+ * @return 娴佺▼妯℃澘鐨勪俊鎭�
+ */
+ @GetMapping("/listSameProcessTemplate")
+ public R<CodeClassifyProcessTempVO> listSameProcessTemplate(String codeTemplateOid,String processUse){
+ VciBaseUtil.alertNotNull(codeTemplateOid,"鎵�閫夋嫨鐨勬暟鎹ā鏉夸富閿�");
+ String s3 = VciBaseUtil.toInSql(codeTemplateOid);
+ /*Map<String,String> conditionMap=new HashMap<>();
+ conditionMap.put("classifyTemplateOid", QueryOptionConstant.IN + VciBaseUtil.toInSql(codeTemplateOid));
+ conditionMap.put("codeprocessuse",processUse);*/
+ LambdaQueryWrapper<CodeClassifyProcessTemp> LambdaQueryWrapper = Wrappers.<CodeClassifyProcessTemp>query()
+ .lambda().in(CodeClassifyProcessTemp::getClassifyTemplateOid, codeTemplateOid.split(","))
+ .eq(CodeClassifyProcessTemp::getCodeProcessUse, processUse);
+
+ List<CodeClassifyProcessTempVO> codeClassifyProcessTempVOS = codeClassifyProcessTempService.selectByWrapper(LambdaQueryWrapper);
+ //鏍规嵁妯℃澘灏嗘暟鎹暣鍚堝湪涓�璧凤紝鍘绘牎楠�
+ Map<String/**妯℃澘oid**/, List<CodeClassifyProcessTempVO>/**鏁版嵁瀵硅薄**/> templateProcessTempateVOMap =
+ codeClassifyProcessTempVOS.stream().collect(Collectors.toMap(CodeClassifyProcessTempVO::getId, s->{
+ List<CodeClassifyProcessTempVO> l=new ArrayList<>();
+ l.add(s);
+ return l;
+ },(List<CodeClassifyProcessTempVO> s1,List<CodeClassifyProcessTempVO> s2)->{
+ s1.addAll(s2);
+ return s1;
+ }));
+ if(templateProcessTempateVOMap.size()>1){
+ return R.fail("娴佺▼妯℃澘涓嶇粺涓�锛屼笉鍏佽鍙戣捣娴佺▼");
+ }else {
+ return R.data(codeClassifyProcessTempVOS.get(0));
+ }
}
}
--
Gitblit v1.9.3