From 13b22edeb1c60505be93e7af1903f7c5e00bbc6d Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 22 五月 2023 18:08:30 +0800
Subject: [PATCH] 对使用分类的主键获取表单的定义、根据模板的主键获取表格的定义、标记流程中业务数据是否通过、使用分类的主键获取业务数据等接口的移植工作，其中对以前查询平台数据的方式使用的QueryWrapper实现数据的查询
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeWupin.java | 3
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeWupinMapper.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeWupinWrapper.java | 6
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeWupinService.java | 5
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeWupinServiceImpl.java | 4
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeWupinVO.java | 5
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeWupinDTO.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java | 10 -
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/ICodeWupinClient.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeWupinClient.java | 7
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 132 ++++++++++++---------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeWupinController.java | 17 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java | 22 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeWupinMapper.xml | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeButtonVO.java | 48 ++++----
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java | 18 +-
Source/UBCS-WEB/src/const/code/codebutton.js | 8
18 files changed, 156 insertions(+), 147 deletions(-)
diff --git a/Source/UBCS-WEB/src/const/code/codebutton.js b/Source/UBCS-WEB/src/const/code/codebutton.js
index b9ded2d..e68d4a7 100644
--- a/Source/UBCS-WEB/src/const/code/codebutton.js
+++ b/Source/UBCS-WEB/src/const/code/codebutton.js
@@ -271,13 +271,13 @@
},
{
label: "鎸夐挳鐨勫浘鏍囨牱寮�",
- prop: "iconcls",
+ prop: "iconCls",
type: "input",
search: true,
},
{
label: "鎵ц鐨刯s璺緞",
- prop: "executejs",
+ prop: "executeJs",
type: "input",
search: true,
},
@@ -289,7 +289,7 @@
// },
{
label: "鎸夐挳鐨勪綅缃�",
- prop: "usedpositiontypeText",
+ prop: "usedPositionTypeText",
slot: true,
display: false
},
@@ -306,7 +306,7 @@
search: true,
hide: true,
display: true,
- prop: "usedpositiontype",
+ prop: "usedPositionType",
rules: [{
required: true,
message: "璇烽�夋嫨鎸夐挳鐨勪綅缃�",
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeWupinDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeWupinDTO.java
index 5b6f264..fefe7bd 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeWupinDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeWupinDTO.java
@@ -16,7 +16,7 @@
*/
package com.vci.ubcs.code.dto;
-import com.vci.ubcs.code.entity.CodeWupinEntity;
+import com.vci.ubcs.code.entity.CodeWupin;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -28,7 +28,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = true)
-public class CodeWupinDTO extends CodeWupinEntity {
+public class CodeWupinDTO extends CodeWupin {
private static final long serialVersionUID = 1L;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeWupinEntity.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeWupin.java
similarity index 98%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeWupinEntity.java
rename to Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeWupin.java
index 82e50b4..2d98fbf 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeWupinEntity.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeWupin.java
@@ -24,7 +24,6 @@
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
/**
* 缂栫爜淇℃伅 瀹炰綋绫�
@@ -36,7 +35,7 @@
@TableName("PL_CODE_WUPIN")
@ApiModel(value = "CodeWupin瀵硅薄", description = "缂栫爜淇℃伅")
@EqualsAndHashCode(callSuper = true)
-public class CodeWupinEntity extends BaseModel {
+public class CodeWupin extends BaseModel {
/**
*
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeWupinVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeWupinVO.java
index 94a1859..8f51794 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeWupinVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeWupinVO.java
@@ -16,8 +16,7 @@
*/
package com.vci.ubcs.code.vo;
-import com.vci.ubcs.code.entity.CodeWupinEntity;
-import org.springblade.core.tool.node.INode;
+import com.vci.ubcs.code.entity.CodeWupin;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -29,7 +28,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = true)
-public class CodeWupinVO extends CodeWupinEntity {
+public class CodeWupinVO extends CodeWupin {
private static final long serialVersionUID = 1L;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeButtonVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeButtonVO.java
index fcfe7c4..4e33692 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeButtonVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeButtonVO.java
@@ -18,81 +18,81 @@
/**
* 鎸夐挳鐨勫浘鏍囨牱寮�
*/
- private String iconcls;
+ private String iconCls;
/**
* 鎵ц鐨刯s鍐呭
*/
- private String executejs;
+ private String executeJs;
/**
* 鎸夐挳鐨勪綅缃�
*/
- private String usedpositiontype;
+ private String usedPositionType;
/**
* 鎸夐挳鐨勪綅缃樉绀烘枃鏈�
*/
- private String usedpositiontypeText;
+ private String usedPositionTypeText;
/**
* 鑾峰彇 鎸夐挳鐨勫浘鏍囨牱寮�
*/
- public String getIconcls (){
- return iconcls;
+ public String getIconCls (){
+ return iconCls;
}
/**
* 璁剧疆 鎸夐挳鐨勫浘鏍囨牱寮�
*/
- public void setIconcls (String iconcls){
- this.iconcls = iconcls;
+ public void setIconcls (String iconCls){
+ this.iconCls = iconCls;
}
/**
* 鑾峰彇 鎵ц鐨刯s鍐呭
*/
- public String getExecutejs (){
- return executejs;
+ public String getExecuteJs (){
+ return executeJs;
}
/**
* 璁剧疆 鎵ц鐨刯s鍐呭
*/
- public void setExecutejs (String executejs){
- this.executejs = executejs;
+ public void setExecuteJs (String executejs){
+ this.executeJs = executejs;
}
/**
* 鑾峰彇 鎸夐挳鐨勪綅缃�
*/
- public String getUsedpositiontype (){
- return usedpositiontype;
+ public String getUsedPositionType (){
+ return usedPositionType;
}
/**
* 璁剧疆 鎸夐挳鐨勪綅缃�
*/
- public void setUsedpositiontype (String usedpositiontype){
- this.usedpositiontype = usedpositiontype;
+ public void setUsedPositionType (String usedPositionType){
+ this.usedPositionType = usedPositionType;
}
- public String getUsedpositiontypeText() {
- return usedpositiontypeText;
+ public String getUsedPositionTypeText() {
+ return usedPositionTypeText;
}
- public void setUsedpositiontypeText(String usedpositiontypeText) {
- this.usedpositiontypeText = usedpositiontypeText;
+ public void setUsedpositiontypeText(String usedPositionTypeText) {
+ this.usedPositionTypeText = usedPositionTypeText;
}
@Override
public String toString() {
return "CodeButtonVO{" +
- "iconcls='" + iconcls + '\'' +
- ", executejs='" + executejs + '\'' +
- ", usedpositiontype='" + usedpositiontype + '\'' +
- ", usedpositiontypeText='" + usedpositiontypeText + '\'' +
+ "iconcls='" + iconCls + '\'' +
+ ", executejs='" + executeJs + '\'' +
+ ", usedpositiontype='" + usedPositionType + '\'' +
+ ", usedpositiontypeText='" + usedPositionTypeText + '\'' +
"} " + super.toString();
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeWupinController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeWupinController.java
index 8dd1a53..a41ba68 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeWupinController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeWupinController.java
@@ -23,14 +23,13 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;
-import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.vci.ubcs.code.entity.CodeWupinEntity;
+import com.vci.ubcs.code.entity.CodeWupin;
import com.vci.ubcs.code.vo.CodeWupinVO;
import com.vci.ubcs.code.wrapper.CodeWupinWrapper;
import com.vci.ubcs.code.service.ICodeWupinService;
@@ -56,8 +55,8 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "璇︽儏", notes = "浼犲叆codeWupin")
- public R<CodeWupinVO> detail(CodeWupinEntity codeWupin) {
- CodeWupinEntity detail = codeWupinService.getOne(Condition.getQueryWrapper(codeWupin));
+ public R<CodeWupinVO> detail(CodeWupin codeWupin) {
+ CodeWupin detail = codeWupinService.getOne(Condition.getQueryWrapper(codeWupin));
return R.data(CodeWupinWrapper.build().entityVO(detail));
}
/**
@@ -66,8 +65,8 @@
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆codeWupin")
- public R<IPage<CodeWupinVO>> list(CodeWupinEntity codeWupin, Query query) {
- IPage<CodeWupinEntity> pages = codeWupinService.page(Condition.getPage(query), Condition.getQueryWrapper(codeWupin));
+ public R<IPage<CodeWupinVO>> list(CodeWupin codeWupin, Query query) {
+ IPage<CodeWupin> pages = codeWupinService.page(Condition.getPage(query), Condition.getQueryWrapper(codeWupin));
return R.data(CodeWupinWrapper.build().pageVO(pages));
}
@@ -88,7 +87,7 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "鏂板", notes = "浼犲叆codeWupin")
- public R save(@Valid @RequestBody CodeWupinEntity codeWupin) {
+ public R save(@Valid @RequestBody CodeWupin codeWupin) {
return R.status(codeWupinService.save(codeWupin));
}
@@ -98,7 +97,7 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "淇敼", notes = "浼犲叆codeWupin")
- public R update(@Valid @RequestBody CodeWupinEntity codeWupin) {
+ public R update(@Valid @RequestBody CodeWupin codeWupin) {
return R.status(codeWupinService.updateById(codeWupin));
}
@@ -108,7 +107,7 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆codeWupin")
- public R submit(@Valid @RequestBody CodeWupinEntity codeWupin) {
+ public R submit(@Valid @RequestBody CodeWupin codeWupin) {
return R.status(codeWupinService.saveOrUpdate(codeWupin));
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
index fb97efc..e99c9da 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
@@ -64,17 +64,17 @@
@GetMapping("/downloadImportExcel")
@VciBusinessLog(operateName = "涓嬭浇鎵归噺鐢宠缂栫爜鐨勫鍏ユā鏉�")
public void downloadImportExcel(String codeClassifyOid, HttpServletResponse response) throws IOException{
-// String excelName = mdmIOService.createImportExcel(codeClassifyOid,false);
-// try {
-// ControllerUtil.writeFileToResponse(response,excelName);
-// } catch (Throwable e) {
-// //濡傛灉鍑洪敊,鎶婇敊璇俊鎭啓鍒皌ext
-// String msg = LangBaseUtil.getErrorMsg(e);
-// if(StringUtils.isBlank(msg)){
-// msg = "鏈煡閿欒";
-// }
-// ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
-// }
+ String excelName = mdmIOService.createImportExcel(codeClassifyOid,false);
+ try {
+ ControllerUtil.writeFileToResponse(response,excelName);
+ } catch (Throwable e) {
+ //濡傛灉鍑洪敊,鎶婇敊璇俊鎭啓鍒皌ext
+ String msg = LangBaseUtil.getErrorMsg(e);
+ if(StringUtils.isBlank(msg)){
+ msg = "鏈煡閿欒";
+ }
+ ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
+ }
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeWupinClient.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeWupinClient.java
index b786560..ad9a7f7 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeWupinClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeWupinClient.java
@@ -23,8 +23,7 @@
import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
-import com.vci.ubcs.code.entity.CodeWupinEntity;
-import com.vci.ubcs.code.service.ICodeWupinService;
+import com.vci.ubcs.code.entity.CodeWupin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@@ -44,11 +43,11 @@
@Override
@GetMapping(TOP)
- public BladePage<CodeWupinEntity> top(Integer current, Integer size) {
+ public BladePage<CodeWupin> top(Integer current, Integer size) {
Query query = new Query();
query.setCurrent(current);
query.setSize(size);
- IPage<CodeWupinEntity> page = codeWupinMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper());//service.page(Condition.getPage(query));
+ IPage<CodeWupin> page = codeWupinMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper());//service.page(Condition.getPage(query));
return BladePage.of(page);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/ICodeWupinClient.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/ICodeWupinClient.java
index 45d1801..a88a5f2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/ICodeWupinClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/ICodeWupinClient.java
@@ -17,7 +17,7 @@
package com.vci.ubcs.code.feign;
import org.springblade.core.mp.support.BladePage;
-import com.vci.ubcs.code.entity.CodeWupinEntity;
+import com.vci.ubcs.code.entity.CodeWupin;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -44,6 +44,6 @@
* @return BladePage
*/
@GetMapping(TOP)
- BladePage<CodeWupinEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+ BladePage<CodeWupin> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeWupinMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeWupinMapper.java
index 7376138..e8eb4b0 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeWupinMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeWupinMapper.java
@@ -16,7 +16,7 @@
*/
package com.vci.ubcs.code.mapper;
-import com.vci.ubcs.code.entity.CodeWupinEntity;
+import com.vci.ubcs.code.entity.CodeWupin;
import com.vci.ubcs.code.vo.CodeWupinVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -28,7 +28,7 @@
* @author yuxc
* @since 2023-05-05
*/
-public interface CodeWupinMapper extends BaseMapper<CodeWupinEntity> {
+public interface CodeWupinMapper extends BaseMapper<CodeWupin> {
/**
* 鑷畾涔夊垎椤�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeWupinService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeWupinService.java
index 3eb30ee..0b9c26b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeWupinService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeWupinService.java
@@ -17,9 +17,8 @@
package com.vci.ubcs.code.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.vci.ubcs.code.entity.CodeWupinEntity;
+import com.vci.ubcs.code.entity.CodeWupin;
import com.vci.ubcs.code.vo.CodeWupinVO;
-import org.springblade.core.mp.base.BaseService;
import com.baomidou.mybatisplus.core.metadata.IPage;
/**
@@ -28,7 +27,7 @@
* @author yuxc
* @since 2023-05-05
*/
-public interface ICodeWupinService extends IService<CodeWupinEntity> {
+public interface ICodeWupinService extends IService<CodeWupin> {
/**
* 鑷畾涔夊垎椤�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
index 44f60a6..36a3acf 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
@@ -7,25 +7,21 @@
import com.vci.ubcs.code.dto.CodeDeleteBatchDTO;
import com.vci.ubcs.code.dto.CodeOrderDTO;
import com.vci.ubcs.code.dto.datapush.BaseModelDTO;
-import com.vci.ubcs.code.entity.CodeAllCode;
-import com.vci.ubcs.code.entity.CodeKeyAttrRepeat;
-import com.vci.ubcs.code.entity.CodeWupinEntity;
+import com.vci.ubcs.code.entity.CodeWupin;
import com.vci.ubcs.code.vo.CodeKeyAttrRepeatVO;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.vo.pagemodel.UITableFieldVO;
import com.vci.ubcs.starter.web.pagemodel.*;
import org.springblade.core.tool.api.R;
-import org.springframework.util.CollectionUtils;
import java.util.*;
-import java.util.stream.Collectors;
/**
* 涓绘暟鎹紩鎿庢湇鍔�
* @author weidy
* @date 2022-2-21
*/
-public interface MdmEngineService extends IService<CodeWupinEntity> {
+public interface MdmEngineService extends IService<CodeWupin> {
/**
* 浣跨敤鍒嗙被鐨勪富閿幏鍙栧彲浠ヤ娇鐢ㄧ殑妯℃澘瀵硅薄
* @param codeClassifyOid 鍒嗙被鐨勪富閿�
@@ -90,7 +86,7 @@
* @param btmName 涓氬姟绫诲瀷鐨勫悕绉帮紝浼氳嚜鍔ㄥ彉鎴愬皬鍐�
* @return CodeWupinEntity
*/
- CodeWupinEntity createCBOByBtmName(String btmName);
+ CodeWupin createCBOByBtmName(String btmName);
/**
* 淇濆瓨鍙緭鍙�夌殑淇℃伅
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java
index ff57988..d912ffb 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java
@@ -2,7 +2,7 @@
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.dto.CodeOrderSecDTO;
-import com.vci.ubcs.code.entity.CodeWupinEntity;
+import com.vci.ubcs.code.entity.CodeWupin;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
@@ -19,7 +19,7 @@
* @param dataCBOList 涓氬姟鏁版嵁
*/
List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO,
- CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<CodeWupinEntity> dataCBOList);
+ CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<CodeWupin> dataCBOList);
/**
* 鍥炴敹鐮佸��
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeWupinServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeWupinServiceImpl.java
index f192429..a0b06ec 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeWupinServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeWupinServiceImpl.java
@@ -17,7 +17,7 @@
package com.vci.ubcs.code.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vci.ubcs.code.entity.CodeWupinEntity;
+import com.vci.ubcs.code.entity.CodeWupin;
import com.vci.ubcs.code.vo.CodeWupinVO;
import com.vci.ubcs.code.mapper.CodeWupinMapper;
import com.vci.ubcs.code.service.ICodeWupinService;
@@ -31,7 +31,7 @@
* @since 2023-05-05
*/
@Service
-public class CodeWupinServiceImpl extends ServiceImpl<CodeWupinMapper, CodeWupinEntity> implements ICodeWupinService {
+public class CodeWupinServiceImpl extends ServiceImpl<CodeWupinMapper, CodeWupin> implements ICodeWupinService {
@Override
public IPage<CodeWupinVO> selectCodeWupinPage(IPage<CodeWupinVO> page, CodeWupinVO codeWupin) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index b938916..08960e7 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant;
@@ -12,7 +13,6 @@
import com.vci.ubcs.code.dto.datapush.BaseModelDTO;
import com.vci.ubcs.code.entity.*;
import com.vci.ubcs.code.enumpack.*;
-import com.vci.ubcs.code.mapper.CodeAllCodeMapper;
import com.vci.ubcs.code.mapper.CodeOsbtmtypeMapper;
import com.vci.ubcs.code.mapper.CodeWupinMapper;
import com.vci.ubcs.code.mapper.CommonsMapper;
@@ -48,7 +48,6 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
-import java.io.Serializable;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
@@ -64,7 +63,7 @@
* @date 2022-2-22
*/
@Service
-public class MdmEngineServiceImpl extends ServiceImpl<CodeWupinMapper, CodeWupinEntity> implements MdmEngineService {
+public class MdmEngineServiceImpl extends ServiceImpl<CodeWupinMapper, CodeWupin> implements MdmEngineService {
/**
@@ -149,6 +148,9 @@
*/
@Autowired
private ICodeClassifyTemplateButtonService templateButtonService;
+
+ @Autowired
+ private ICodeClassifyTemplateAttrService codeClassifyTemplateAttrService;
// /**
// * 鐢ㄦ埛鏌ヨ鐨勬湇鍔�,闇�瑕侀棶涓�涓嬫槸鍚﹂渶瑕侀噸鍐欙紝浣跨敤鏌ヨ姝ゅ钩鍙扮殑鐢ㄦ埛琛�
// */
@@ -329,14 +331,14 @@
switchDateAttrOnOrder(templateVO, orderDTO);
//9.鐢熸垚缂栫爜鐨勪俊鎭�
// ClientBusinessObject cbo = boService.createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmtypeid());
- CodeWupinEntity cbo = createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmtypeid());
+ CodeWupin cbo = createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmtypeid());
// //榛樿鐨勫睘鎬ч兘涓嶇敤浠庡墠绔嫹璐�
// //璁剧疆缂栫爜闇�瑕佺殑榛樿灞炴�х殑鍐呭
copyValueToCBO(classifyFullInfo, cbo, orderDTO, templateVO, false);
// //TODO:鍥犱负榛樿鐨勫睘鎬ч兘涓嶆嫹璐濓紝鐩墠闆嗗洟鐮佸彨name锛屽苟娌℃湁浠嶥TO鎷疯礉鍒癱bo閲屻�傚鍔犱竴涓崟鐙鐞嗭紝浠ュ悗鍐嶇湅瑕佷笉瑕佽皟鏁�
cbo.setName(orderDTO.getName() == null ? "" : orderDTO.getName());
// //end -- modify by lihang @20220407
- List<CodeWupinEntity> cboList = new ArrayList<>();
+ List<CodeWupin> cboList = new ArrayList<>();
//澶囨敞
cbo.setDescription(orderDTO.getDescription());
@@ -347,7 +349,7 @@
List<String> charList = new ArrayList<>();
- for (CodeWupinEntity wupinEntity : cboList) {
+ for (CodeWupin wupinEntity : cboList) {
charList.add(wupinEntity.getId());
}
batchSaveSelectChar(templateVO, charList);
@@ -696,7 +698,7 @@
* @param templateVO 妯℃澘鐨勬樉绀哄璞�
* @param edit 鏄惁涓轰慨鏀�
*/
- private void copyValueToCBO(CodeClassifyFullInfoBO classifyFullInfo, CodeWupinEntity cbo,
+ private void copyValueToCBO(CodeClassifyFullInfoBO classifyFullInfo, CodeWupin cbo,
CodeOrderDTO orderDTO, CodeClassifyTemplateVO templateVO,
boolean edit) {
String fullPath = "";
@@ -768,7 +770,7 @@
* @throws VciBaseException 鍒濆鍖栧嚭閿欑殑鏄細鎶涘嚭寮傚父
*/
@Override
- public CodeWupinEntity createCBOByBtmName(String btmName)
+ public CodeWupin createCBOByBtmName(String btmName)
throws VciBaseException {
if(btmName!=null){
btmName = btmName.trim().toLowerCase();
@@ -792,7 +794,7 @@
CodeOsbtmtypeEntity btmTypeVO = codeOsbtmtypeMapper.selectOne(btmWrapper);
// OsBtmTypeVO btmTypeVO = btmService.getBtmById(boName);
String userName = AuthUtil.getUser().getUserName();
- CodeWupinEntity wupinEntity = new CodeWupinEntity();
+ CodeWupin wupinEntity = new CodeWupin();
wupinEntity.setOid(null);
// bo.setRevisionid((new ObjectUtility()).getNewObjectID36());
// bo.setNameoid((new ObjectUtility()).getNewObjectID36());
@@ -1842,9 +1844,9 @@
//鎵句笟鍔＄被鍨嬶紝鐒跺悗浣跨敤涓婚敭鍘昏幏鍙栨暟鎹簱閲岀殑鏁版嵁
// List<ClientBusinessObject> cbos = boService.queryCBO(classifyFullInfo.getTopClassifyVO().getBtmtypeid(), WebUtil.getOidQuery(orderDTO.getOid()));
- QueryWrapper<CodeWupinEntity> btmWrapper = new QueryWrapper<>();
+ QueryWrapper<CodeWupin> btmWrapper = new QueryWrapper<>();
btmWrapper.eq("OID",orderDTO.getOid());
- CodeWupinEntity cbo = codeWupinMapper.selectOne(btmWrapper);
+ CodeWupin cbo = codeWupinMapper.selectOne(btmWrapper);
// CodeClstemplateVO templateVO = templateService.getObjectHasAttrByOid(orderDTO.getTemplateOid());
// CodeRuleVO ruleVO = ruleService.getObjectHasSecByOid(orderDTO.getCodeRuleOid());
@@ -1939,7 +1941,7 @@
oidCollection.addAll(strings);
}
- List<CodeWupinEntity> cboList = codeWupinMapper.selectBatchIds(oidCollection);
+ List<CodeWupin> cboList = codeWupinMapper.selectBatchIds(oidCollection);
// List<ClientBusinessObject> cboList = new ArrayList<>();
// oidCollection.stream().forEach(oids -> {
// Map<String, String> conditionMap = new HashMap<>();
@@ -1950,15 +1952,15 @@
if (CollectionUtils.isEmpty(cboList)) {
throw new VciBaseException("鏁版嵁鍏ㄩ儴鍦ㄧ郴缁熶腑涓嶅瓨鍦�");
}
- List<CodeWupinEntity> editCBOs = cboList.stream().filter(s -> !CodeDefaultLC.EDITING.getValue().equalsIgnoreCase(s.getLcStatus())).collect(Collectors.toList());
+ List<CodeWupin> editCBOs = cboList.stream().filter(s -> !CodeDefaultLC.EDITING.getValue().equalsIgnoreCase(s.getLcStatus())).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(editCBOs)) {
- CodeWupinEntity cbo = editCBOs.get(0);
+ CodeWupin cbo = editCBOs.get(0);
throw new VciBaseException("缂栫爜涓簕0}绛夊叡{1}鏉℃暟鎹殑鐘舵�佷笉鏄痆{2}]锛屼笉鍏佽鍒犻櫎", new String[]{cbo.getId(), String.valueOf(editCBOs.size()), CodeDefaultLC.EDITING.getText()});
}
//鍙兘鍒犻櫎鑷繁鍒涘缓鐨勬暟鎹�
String userId = AuthUtil.getUser().getUserName();
- for (CodeWupinEntity clientBusinessObject:cboList){
+ for (CodeWupin clientBusinessObject:cboList){
String creator = clientBusinessObject.getCreator();
if(!userId.equalsIgnoreCase(creator)){
throw new VciBaseException("缂栫爜涓�"+clientBusinessObject.getId()+"鐨勬暟鎹笉鏄綋鍓嶇敤鎴峰垱寤猴紝涓嶈兘鍒犻櫎锛�");
@@ -2160,17 +2162,21 @@
public R markDataPassing(String oid, String btmName, Boolean pass) {
VciBaseUtil.alertNotNull(oid, "涓氬姟鏁版嵁涓婚敭", btmName, "涓氬姟绫诲瀷", pass, "鏍囪绫诲瀷");
boolean flag = false;
-// try {
-// ClientBusinessObjectOperation operation = new ClientBusinessObjectOperation();
+ try {
+// QueryWrapper<CodeWupinEntity> wrapper = new QueryWrapper<>();
+// wrapper.eq("oid",oid);
+ CodeWupin data = baseMapper.selectById(oid);
+ // ClientBusinessObjectOperation operation = new ClientBusinessObjectOperation();
// ClientBusinessObject data = operation.readBusinessObjectById(oid, btmName);
-// if (data == null || StringUtils.isBlank(data.getOid())) {
-// return BaseResult.fail(DATA_OID_NOT_EXIST);
-// }
-// data.setAttributeValue("passing", String.valueOf(pass));
+ if (data == null || StringUtils.isBlank(data.getOid())) {
+ return R.fail(DATA_OID_NOT_EXIST);
+ }
+ data.setPassing(String.valueOf(pass));
+ flag = SqlHelper.retBool(baseMapper.updateById(data));
// flag = operation.updateBuinessObject(data);
-// } catch (VCIError e) {
-// e.printStackTrace();
-// }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
if (flag) {
return R.success("鏍囪鎴愬姛锛�");
} else {
@@ -2464,51 +2470,63 @@
}
List<String> oidList = VciBaseUtil.str2List(conditionMap.get("oid"));
Map<String, String> oidMap = new HashMap<>();
+ QueryWrapper<CodeWupin> wrapper = new QueryWrapper();
if (conditionMap.get("oid").contains(",")) {
- oidMap.put("oid", QueryOptionConstant.IN +"("+ VciBaseUtil.toInSql(oidList.toArray(new String[0])) + ")");
+// oidMap.put("oid", QueryOptionConstant.IN +"("+ VciBaseUtil.toInSql(oidList.toArray(new String[0])) + ")");
+ wrapper.in("oid",oidList);
} else {
- oidMap.put("oid", conditionMap.get("oid"));
+// oidMap.put("oid", conditionMap.get("oid"));
+ wrapper.in("oid",conditionMap.get("oid"));
}
if (CollectionUtils.isEmpty(oidMap)) {
throw new VciBaseException("涓氬姟鏁版嵁涓婚敭涓嶈兘涓虹┖");
}
// List<ClientBusinessObject> cbos = boService.queryCBO(btmType, oidMap);
-// if (CollectionUtils.isEmpty(cbos)) {
-// throw new VciBaseException("鏈壘鍒颁笟鍔℃暟鎹�");
-// }
-// ClientBusinessObject cbo = cbos.get(0);
-// String templateOid = cbo.getAttributeValue("CODETEMPLATEOID");
+ List<CodeWupin> cbos = baseMapper.selectList(wrapper);
+ if (CollectionUtils.isEmpty(cbos)) {
+ throw new VciBaseException("鏈壘鍒颁笟鍔℃暟鎹�");
+ }
+ CodeWupin cbo = cbos.get(0);
+ String templateOid = cbo.getCodetemplateoid();
// Map<String, String> templateOidMap = new HashMap<>();
// templateOidMap.put("oid", templateOid);
+
+ QueryWrapper<CodeClassifyTemplate> codeClassifyTemplateWrapper = new QueryWrapper<>();
+ codeClassifyTemplateWrapper.eq("oid", templateOid);
+ List<CodeClassifyTemplate> templateDOList = templateService.list(codeClassifyTemplateWrapper);
+
// List<CodeClassifyTemplate> templateDOList = boService.queryObject(CodeClassifyTemplate.class, templateOidMap);
+ QueryWrapper<CodeClassifyTemplateAttr> codeClassifyTemplateAttrWrapper = new QueryWrapper<>();
+ codeClassifyTemplateAttrWrapper.eq("CLASSIFYTEMPLATEOID", templateOid);
// templateOidMap.clear();
// templateOidMap.put("CLASSIFYTEMPLATEOID",templateOid);
-// List<CodeClassifyTemplateAttr> attrDOList = boService.queryObject(CodeClassifyTemplateAttr.class, templateOidMap);
-// if (CollectionUtils.isEmpty(templateDOList)) {
-// logger.error("鎵句笉鍒颁笟鍔℃暟鎹叧鑱旂殑妯℃澘锛屾ā鏉夸富閿細" + templateOid);
-// throw new VciBaseException("鎵句笉鍒颁笟鍔℃暟鎹叧鑱旂殑妯℃澘");
-// }
-// CodeClassifyTemplateVO templateVO = templateService.codeClassifyTemplateDO2VO(templateDOList.get(0));
-// templateVO.setAttributes(templateAttrService.codeClassifyTemplateAttrDO2VOs(attrDOList));
-// try {
-// if (oidList.size() > 1){
-// DataGrid<Map<String,String>> allDataGrid = new DataGrid<>();
-// List<Map<String,String>> allData = new ArrayList<>();
-// oidList.forEach(oid -> {
-// Map<String,String> condition = new HashMap<>();
-// condition.put("oid",oid);
-// DataGrid<Map<String, String>> dataGrid = queryGrid(btmType, templateVO, condition, pageHelper);
-// allData.addAll(dataGrid.getData());
-// });
-// allDataGrid.setData(allData);
-// return allDataGrid;
-// }else {
-// return queryGrid(btmType, templateVO, conditionMap, pageHelper);
-// }
-// } catch (Exception e) {
-// System.out.println(e.getMessage());
+ List<CodeClassifyTemplateAttr> attrDOList = codeClassifyTemplateAttrService.list(codeClassifyTemplateAttrWrapper);
+// boService.queryObject(CodeClassifyTemplateAttr.class, templateOidMap);
+ if (CollectionUtils.isEmpty(templateDOList)) {
+ logger.error("鎵句笉鍒颁笟鍔℃暟鎹叧鑱旂殑妯℃澘锛屾ā鏉夸富閿細" + templateOid);
+ throw new VciBaseException("鎵句笉鍒颁笟鍔℃暟鎹叧鑱旂殑妯℃澘");
+ }
+ CodeClassifyTemplateVO templateVO = templateService.codeClassifyTemplateDO2VO(templateDOList.get(0));
+ templateVO.setAttributes(codeClassifyTemplateAttrService.codeClassifyTemplateAttrDO2VOs(attrDOList));
+ try {
+ if (oidList.size() > 1){
+ DataGrid<Map<String,String>> allDataGrid = new DataGrid<>();
+ List<Map<String,String>> allData = new ArrayList<>();
+ oidList.forEach(oid -> {
+ Map<String,String> condition = new HashMap<>();
+ condition.put("oid",oid);
+ DataGrid<Map<String, String>> dataGrid = queryGrid(btmType, templateVO, condition, pageHelper);
+ allData.addAll(dataGrid.getData());
+ });
+ allDataGrid.setData(allData);
+ return allDataGrid;
+ }else {
+ return queryGrid(btmType, templateVO, conditionMap, pageHelper);
+ }
+ } catch (Exception e) {
+ System.out.println(e.getMessage());
return null;
-// }
+ }
}
/**
* 浣跨敤鍒嗙被鐨勪富閿幏鍙栬〃鏍肩殑瀹氫箟
@@ -2752,7 +2770,7 @@
kv.setValue(buttonVO.getClassifyButtonOidName());
kv.setAttributes(VciBaseUtil.objectToMap(buttonVO));
buttons.add(kv);
- optionJsMap.put(buttonVO.getId(), buttonVO.getButtonVO().getExecutejs());
+ optionJsMap.put(buttonVO.getId(), buttonVO.getButtonVO().getExecuteJs());
});
optionFieldVO.setOptionJsMap(optionJsMap);
uiInfoVO.getTableDefineVO().getCols().get(0).add(optionFieldVO);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
index 2ebd73a..396b6f0 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
@@ -6,7 +6,7 @@
import com.vci.ubcs.code.dto.CodeOrderSecDTO;
import com.vci.ubcs.code.entity.CodeAllCode;
import com.vci.ubcs.code.entity.CodeSerialValue;
-import com.vci.ubcs.code.entity.CodeWupinEntity;
+import com.vci.ubcs.code.entity.CodeWupin;
import com.vci.ubcs.code.enumpack.CodeCutTypeEnum;
import com.vci.ubcs.code.enumpack.CodeGetValueTypeEnum;
import com.vci.ubcs.code.enumpack.CodeLevelTypeEnum;
@@ -56,7 +56,7 @@
private ICodeWupinService iCodeWupinService;
@Override
- public List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO, CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<CodeWupinEntity> dataCBOList) {
+ public List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO, CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<CodeWupin> dataCBOList) {
// BatchCBO batchCBO = new BatchCBO();
// WebUtil.setPersistence(false);
// dataCBOList = dataCBOList.stream().sorted(((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime()))).collect(Collectors.toList());
@@ -265,7 +265,7 @@
Map<String/**鐮佹鐨勪富閿�**/, Map<String, CodeSerialValue>> maxSerialValueMap = new HashMap<>();
for (int i = 0; i < dataCBOList.size(); i++) {
- CodeWupinEntity cbo = dataCBOList.get(i);
+ CodeWupin cbo = dataCBOList.get(i);
List<String> thisSecValueList = new LinkedList<>();
for (int j = 0; j < secValueList.size(); j++) {
thisSecValueList.add(secValueList.get(j));
@@ -328,9 +328,9 @@
* @param serialUnitList 娴佹按渚濇嵁鐨勫唴瀹�
* 杩橀渶瑕佸悗缁殑涓�涓Щ妞嶅皢浼氭秹鍙婂埌鍏朵粬鐨勬湇鍔�
*/
- private void switchAttrSecValue(List<CodeBasicSecVO> attrSecVOList,CodeWupinEntity cbo,
- List<String> thisSecValueList,boolean attrSevIsSerialDepend,
- List<String> serialUnitList){
+ private void switchAttrSecValue(List<CodeBasicSecVO> attrSecVOList, CodeWupin cbo,
+ List<String> thisSecValueList, boolean attrSevIsSerialDepend,
+ List<String> serialUnitList){
if (!CollectionUtils.isEmpty(attrSecVOList)) {
attrSecVOList.stream().forEach(attrSevVO -> {
String value = "";
@@ -586,9 +586,9 @@
* @param templateVO 妯℃澘鐨勪俊鎭�
* @param allCodeDOList 鎵�鏈夌殑鐮佸�肩殑瀵硅薄鍒楄〃
*/
- private void wrapperAllCode(CodeClassifyFullInfoBO classifyFullInfoBO,CodeRuleVO ruleVO,
- CodeWupinEntity cbo,CodeClassifyTemplateVO templateVO,
- List<CodeAllCode> allCodeDOList,String serialUnitString,String serialValueString){
+ private void wrapperAllCode(CodeClassifyFullInfoBO classifyFullInfoBO, CodeRuleVO ruleVO,
+ CodeWupin cbo, CodeClassifyTemplateVO templateVO,
+ List<CodeAllCode> allCodeDOList, String serialUnitString, String serialValueString){
CodeAllCode allCodeDO = new CodeAllCode();
allCodeDO.setCodeClassifyOid(classifyFullInfoBO.getCurrentClassifyVO().getOid());
allCodeDO.setCodeRuleOid(ruleVO.getOid());
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeWupinWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeWupinWrapper.java
index e40a0dc..39bdf6f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeWupinWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeWupinWrapper.java
@@ -18,7 +18,7 @@
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
-import com.vci.ubcs.code.entity.CodeWupinEntity;
+import com.vci.ubcs.code.entity.CodeWupin;
import com.vci.ubcs.code.vo.CodeWupinVO;
import java.util.Objects;
@@ -28,14 +28,14 @@
* @author yuxc
* @since 2023-05-05
*/
-public class CodeWupinWrapper extends BaseEntityWrapper<CodeWupinEntity, CodeWupinVO> {
+public class CodeWupinWrapper extends BaseEntityWrapper<CodeWupin, CodeWupinVO> {
public static CodeWupinWrapper build() {
return new CodeWupinWrapper();
}
@Override
- public CodeWupinVO entityVO(CodeWupinEntity codeWupin) {
+ public CodeWupinVO entityVO(CodeWupin codeWupin) {
CodeWupinVO codeWupinVO = Objects.requireNonNull(BeanUtil.copy(codeWupin, CodeWupinVO.class));
//User createUser = UserCache.getUser(codeWupin.getCreateUser());
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeWupinMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeWupinMapper.xml
index c7e7714..83592ad 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeWupinMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeWupinMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.vci.ubcs.code.mapper.CodeWupinMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="codeWupinResultMap" type="com.vci.ubcs.code.entity.CodeWupinEntity">
+ <resultMap id="codeWupinResultMap" type="com.vci.ubcs.code.entity.CodeWupin">
<result column="OID" property="oid"/>
<result column="REVISIONOID" property="revisionOid"/>
<result column="NAMEOID" property="nameOid"/>
--
Gitblit v1.9.3