From 86a5afa396913c426dc03850430a97e0a237de55 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 13 九月 2023 08:57:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/page/login/index.vue | 2
Source/UBCS/ubcs-codeApply/pom.xml | 18 +
Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/IPage.java | 85 ++++----
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410ActionListener.java | 36 +++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java | 11 +
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 7
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchProvider.java | 15
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/Page.java | 37 ++--
Source/UBCS/ubcs-codeApply/src/main/resources/properties/conf.properties | 3
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java | 8
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java | 15 +
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/OrderItem.java | 16 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 24 ++
Source/UBCS-WEB/src/page/index/logo.vue | 4
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java | 106 +++++++++--
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410Dialog.java | 33 +++
Source/UBCS-WEB/src/views/modeling/originalAdd.vue | 38 +++
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialogActionListener.java | 8
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java | 23 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java | 8
21 files changed, 364 insertions(+), 135 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
index 9fe3956..652907c 100644
--- a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
+++ b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
@@ -4,7 +4,7 @@
<!-- 闆嗘垚鏃ュ織 浠诲姟 鏁版嵁鍏ㄩ儴鍏敤-->
<el-form-item label="闆嗘垚鏌ヨ:" size="small">
<el-select v-model="formInline.type" placeholder="璇烽�夋嫨鍒嗙被" @change="SelectChange">
- <el-option :label="item.label" :value="item.value" v-for="item in SearchObject.searchData" ></el-option>
+ <el-option :label="item.label" :value="item.value" :key="item.value" v-for="(item,index) in SearchObject.searchData"></el-option>
</el-select>
</el-form-item>
<!-- 闆嗘垚鏃ュ織 鏄惁鎴愬姛-->
diff --git a/Source/UBCS-WEB/src/page/index/logo.vue b/Source/UBCS-WEB/src/page/index/logo.vue
index 3bc5957..c5226c7 100644
--- a/Source/UBCS-WEB/src/page/index/logo.vue
+++ b/Source/UBCS-WEB/src/page/index/logo.vue
@@ -16,7 +16,7 @@
<span>
<img class="imgSpan" :src=imgurl>
</span>
- <span> {{ website.indexTitle }}</span>
+ <span style="font-size: 17px;margin-left: 27px">缂栫爜璧勬簮绠＄悊绯荤粺</span>
</span>
</template>
</transition-group>
@@ -91,7 +91,7 @@
.imgSpan {
position: absolute;
top: 15px;
- left: 37px;
+ left: 26px;
}
.logimg{
position: absolute;
diff --git a/Source/UBCS-WEB/src/page/login/index.vue b/Source/UBCS-WEB/src/page/login/index.vue
index fbbfdc4..97f7c74 100644
--- a/Source/UBCS-WEB/src/page/login/index.vue
+++ b/Source/UBCS-WEB/src/page/login/index.vue
@@ -20,7 +20,7 @@
<div class="login-border">
<div class="login-main">
<h4 class="login-title">
- {{ $t('login.title') }}{{website.title}}
+ {{ $t('login.title') }}
<top-lang></top-lang>
</h4>
<userLogin v-if="activeName==='user'"></userLogin>
diff --git a/Source/UBCS-WEB/src/views/modeling/originalAdd.vue b/Source/UBCS-WEB/src/views/modeling/originalAdd.vue
index 6b06bb8..c6b6974 100644
--- a/Source/UBCS-WEB/src/views/modeling/originalAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/originalAdd.vue
@@ -111,6 +111,19 @@
<!-- 閫夋嫨鏋氫妇鏃剁殑寮圭獥 -->
<el-dialog title="鏋氫妇鍒楄〃" :visible.sync="enumRefer.show" append-to-body @close="closeEnumDialog" width="70%"
style="height: 115vh;">
+ <div>
+ <el-form :inline="true" :model="form" class="demo-form-inline" size="small">
+ <el-form-item label="鏋氫妇浠ｅ彿">
+ <el-input v-model="form.name" placeholder="鏋氫妇浠ｅ彿"></el-input>
+ </el-form-item>
+ <el-form-item label="鏋氫妇鍚嶇О">
+ <el-input v-model="form.label" placeholder="鏋氫妇鍚嶇О"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="onSubmit">鏌ヨ</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
<avue-crud ref="eunmTable" :option="enumRefer.option" @on-load="enumOnLoad" :data="enumRefer.data" class="enumTable"
@row-click="enumReferClick" :page.sync="enumRefer.enumPage">
<template slot="radio" slot-scope="{row}">
@@ -141,6 +154,10 @@
},
data() {
return {
+ form:{
+ name:'',
+ label:''
+ },
showSubmitDialog: false,
// 榛樿鐨勯〉绛�
activeName: 'referTab',
@@ -229,7 +246,8 @@
border: true,
reserveSelection: true,
searchMenuSpan: 32,
- searchShowBtn: false,
+ // searchShowBtn: false,
+ // search:true,
highlightCurrentRow: true,
column: [{
label: '',
@@ -241,13 +259,13 @@
prop: 'name',
align: 'center',
searchSpan: 8,
- search: true,
+ // search: true,
}, {
label: '鏋氫妇鍚嶇О',
prop: 'label',
align: 'center',
searchSpan: 8,
- search: true,
+ // search: true,
}]
},
// 鏋氫妇鍙傜収琛ㄦ牸鏁版嵁
@@ -281,6 +299,20 @@
this.initAttributeReferTypeList();
},
methods: {
+ onSubmit() {
+ const conditionMap = {};
+ if (this.form.name) {
+ conditionMap[`conditionMap['name_like']`] = this.form.name;
+ }
+ if (this.form.label) {
+ conditionMap[`conditionMap['label_like']`] = this.form.label;
+ }
+ getParentList(this.enumRefer.enumPage.currentPage, this.enumRefer.enumPage.pageSize, conditionMap)
+ .then((res) => {
+ this.enumRefer.enumPage.total = res.data.data.total;
+ this.enumRefer.data = res.data.data.records;
+ });
+ },
enumOnLoad(){
getParentList(this.enumRefer.enumPage.currentPage, this.enumRefer.enumPage.pageSize).then(res => {
this.enumRefer.enumPage.total = res.data.data.total;
diff --git a/Source/UBCS/ubcs-codeApply/pom.xml b/Source/UBCS/ubcs-codeApply/pom.xml
index 28cb216..54e1c4c 100644
--- a/Source/UBCS/ubcs-codeApply/pom.xml
+++ b/Source/UBCS/ubcs-codeApply/pom.xml
@@ -12,7 +12,9 @@
<vciplt.version>2022.RELEASE</vciplt.version>
<old.spring.version>3.2.0.RELEASE</old.spring.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>1.8</java.version>
+ <java.version>1.7</java.version>
+ <maven.compiler.source>7</maven.compiler.source>
+ <maven.compiler.target>7</maven.compiler.target>
</properties>
<artifactId>ubcs-codeApply</artifactId>
<dependencies>
@@ -66,4 +68,18 @@
<url>http://nexus.vci-tech.com:9000/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>
+<!-- <build>-->
+<!-- <plugins>-->
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-compiler-plugin</artifactId>-->
+<!-- <version>3.10.1</version>-->
+<!-- <configuration>-->
+<!-- <source>1.7</source>-->
+<!-- <target>1.7</target>-->
+<!-- </configuration>-->
+<!-- </plugin>-->
+<!-- </plugins>-->
+<!-- </build>-->
+
</project>
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410Dialog.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410Dialog.java
index 1e32400..f69c4b8 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410Dialog.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410Dialog.java
@@ -32,7 +32,7 @@
private Map<String, String> attrNameAndValMap = new LinkedHashMap();//瀛樺偍灞炴�у悕绉帮紙鍖呭惈鍐呴儴鍚嶇О鍜屽閮ㄥ悕绉帮級鍜屽搴旂殑鍊�
private String tokenUrl= ConfigUtils.getConfigValue("410.code.token.url","http://127.0.0.1:37000/ubcs-auth/oauth/token");
private String[] fields;
- private String[] Values;
+ private String[] values;
/**
* 瀛樺偍鍒嗙被鐨凪ap,key:鍒嗙被鍚嶇О锛寁alue锛氬垎绫诲��
*/
@@ -50,6 +50,9 @@
public CodeApplyFor410Dialog(JDialog dialog, String clsfName, String deptName) {
this(dialog, "pdmUser", clsfName, deptName,new String[]{});
}
+ public CodeApplyFor410Dialog(JDialog dialog, String clsfName, String deptName,String[] fields,String[] values) {
+ this(dialog, "pdmUser", clsfName, deptName,new String[]{},fields,values);
+ }
public CodeApplyFor410Dialog(Frame frame, String clsfName, String deptName,String[] fields,String[] values){
this.setModal(true);
parentComponet = frame;
@@ -57,7 +60,7 @@
this.clsfName = clsfName;
this.deptName = deptName;
this.fields=fields;
- this.Values=values;
+ this.values=values;
//this.libName = libName;
init();
@@ -89,6 +92,23 @@
this.deptName = deptName;
// this.libName = libName;
+ init();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public CodeApplyFor410Dialog(JDialog dialog, String userName, String clsfName, String deptName, String[] libName,String[] fields,String[] values) {
+ super(dialog, true);
+ VCISwingUtil.setClientMainFrame(new Frame());
+ try {
+ this.setModal(true);
+ parentComponet = dialog;
+ this.userName = userName;
+ this.clsfName = clsfName;
+ this.deptName = deptName;
+ this.fields = fields;
+ this.values = values;
init();
} catch (Exception e) {
e.printStackTrace();
@@ -152,7 +172,14 @@
private void bulidPal() throws Exception {
this.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
this.setTitle("浠ｇ爜鐢宠");
- mainPal = new CodeApplyPanelFor410(this,tokenUserObject, true, clsfName, deptName,libName);
+ Map<String , String> displayValues = new HashMap<>();
+ if(fields != null && fields.length > 0 && values !=null && values.length > 0){
+ for (int i = 0; i < fields.length; i++) {
+ displayValues.put(fields[i] , values[i]);
+ }
+ }
+
+ mainPal = new CodeApplyPanelFor410(this,tokenUserObject, true, clsfName, deptName,libName,displayValues);
VCIJPanel btnPal = new VCIJPanel();
btnPal.add(okBtn);
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java
index c648cc4..f2bcbb8 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java
@@ -32,7 +32,6 @@
import java.util.*;
import java.util.List;
import java.util.regex.Pattern;
-import java.util.stream.Collectors;
public class CodeApplyFor410MainPanel extends VCIJPanel {
@@ -87,6 +86,10 @@
private RMDataTransmitObject transmitForRMData = null;
private CodeRuleVO codeRuleVO=null;
/**
+ * 瀛樺偍灞炴�у拰鍊肩殑Map,key,鐢ㄤ簬榛樿鍊肩殑鏄剧ず
+ */
+ private Map<String,String> displayValues = new HashMap<>();
+ /**
* 灞炴�D涓庡睘鎬у搴旂殑鎺т欢涔嬮棿鐨勬槧灏凪AP
*/
private LinkedHashMap<String, JComponent> attrIdToCtrlMaps = new LinkedHashMap<String, JComponent>();
@@ -117,11 +120,12 @@
this.currentCodeClassifyTemplateVO=currentCodeClassifyTemplateVO;
}
- public CodeApplyFor410MainPanel(TransmitTreeObject transTreeObject,TokenUserObject tokenUserObject,String deptName,CodeClassifyTemplateVO currentCodeClassifyTemplateVO) {
+ public CodeApplyFor410MainPanel(TransmitTreeObject transTreeObject,TokenUserObject tokenUserObject,String deptName,CodeClassifyTemplateVO currentCodeClassifyTemplateVO,Map displayValues) {
this.transTreeObject = transTreeObject;
this.tokenUserObject = tokenUserObject;
this.deptName = deptName;
this.currentCodeClassifyTemplateVO=currentCodeClassifyTemplateVO;
+ this.displayValues = displayValues;
}
/**
@@ -590,10 +594,10 @@
if(codeClassifyValueList.size()>1) {
secCombo.addItem(new CodeClassifyValue());
}
- codeClassifyValueList.stream().forEach(codeClassifyValue -> {
+ for (CodeClassifyValue codeClassifyValue : codeClassifyValueList) {
secCombo.addItem(codeClassifyValue);
valueOidList.add(codeClassifyValue.getOid());
- });
+ }
}
secIdTOListValueOidMap.put(secObj.getOid(),valueOidList);
/**浠ｇ爜椤逛笅鎷変簨浠�**/
@@ -632,11 +636,11 @@
if(fixedValueVOList.size() >1) {
secCombo.addItem(new CodeFixedValue());
}
- fixedValueVOList.stream().forEach(codeFixedValueVO -> {
+ for (CodeFixedValueVO codeFixedValueVO : fixedValueVOList) {
CodeFixedValue codeFixedValue=new CodeFixedValue();
BeanUtilForVCI.copyPropertiesIgnoreCase(codeFixedValueVO,codeFixedValue);
secCombo.addItem(codeFixedValue);
- });
+ }
/**褰撶郴缁熼�夋嫨鐨勬槸鎸囧畾鐮佹鍊兼椂锛岀粍鍒唬鍙风殑鐮佹绯荤粺涓嶆樉绀� Begin**/
/*FixCodeValObject selObj = (FixCodeValObject) secCombo.getSelectedItem();
if(isSpecialRuleFlag && (secObj.getName().equals(specialControlSecName) && secValMap.containsKey(selObj.getValue())) || secValMap.containsKey(getControlSecSelectValue())) {
@@ -742,10 +746,16 @@
transmit.setRmTypeObject(codeClassify);
if(currentCodeClassifyTemplateVO!=null) {
transmit.setTemplateId(templateId);
- Map<String, CodeClassifyTemplateAttrVO> tempPropObjMapsByInnerName = currentCodeClassifyTemplateVO.getAttributes().stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
+ Map<String, CodeClassifyTemplateAttrVO> tempPropObjMapsByInnerName = new HashMap<>();
+ for (CodeClassifyTemplateAttrVO attribute : currentCodeClassifyTemplateVO.getAttributes()) {
+ tempPropObjMapsByInnerName.put(attribute.getId().toLowerCase(Locale.ROOT),attribute);
+ }
transmit.setClassifyCode(codeClassify.getId());
transmit.setTempPropObjMapsByInnerName(tempPropObjMapsByInnerName);
- Map<String, CodeClassifyTemplateAttrVO> tempPropObjsMap = currentCodeClassifyTemplateVO.getAttributes().stream().collect(Collectors.toMap(s -> s.getOid().toLowerCase(Locale.ROOT), t -> t));
+ Map<String, CodeClassifyTemplateAttrVO> tempPropObjsMap = new HashMap<>();
+ for (CodeClassifyTemplateAttrVO attribute : currentCodeClassifyTemplateVO.getAttributes()) {
+ tempPropObjsMap.put(attribute.getOid().toLowerCase(Locale.ROOT),attribute);
+ }
transmit.setTempPropObjsMap(tempPropObjsMap);
transmit.setTemplateObject(currentCodeClassifyTemplateVO);
transmit.setTempPropObjsList(this.currentCodeClassifyTemplateVO.getAttributes());
@@ -785,7 +795,7 @@
if (index >= realAttrs.length) {
break;
}
- CodeClassifyTemplateAttrVO attrObj = realAttrs[index];
+ final CodeClassifyTemplateAttrVO attrObj = realAttrs[index];
/***濡傛灉妯℃澘閰嶇疆浜嗗紩鐢ㄦā鏉匡紝灞炴�у悕绉板垪琛ㄦ坊鍔犻摼鎺ヨ繘琛屽鐞� BEGIN**/
//ADD BY liujw
@@ -951,10 +961,19 @@
for (int i = 0; i < objs.length; i++) {
objs[i] = new AttrRangObjectWarper(keyValues[i]);
model.addElement(objs[i]);
-
specMap.put(objs[i].toString(), comboBoxIndex++);
}
cbx.setModel(model);
+ if(displayValues.containsKey(attrObj.getId())){
+// cbx.setSelectedItem(displayValues.get(attrObj.getId()));
+// cbx.setSelectedIndex(3);
+ for (int i = 0; i < objs.length; i++) {
+ if(objs[i].getKeyValue().getKey().equals(displayValues.get(attrObj.getId()))){
+ cbx.setSelectedIndex(i);
+ }
+ }
+ cbx.setEnabled(false);
+ }
compt = cbx;
}
} else if(StringUtils.isNotBlank(attrObj.getReferConfig())){//鍙傜収鐨勯渶瑕佽缃垚涓嬫媺妗嗭紝骞朵笖鍙
@@ -968,34 +987,69 @@
cbx.setModel(model);
compt = cbx;
} else { // 涓嶅瓨鍦ㄥ彇鍊艰寖鍥村垯鎸夌被鍨嬬敓鎴愪笉鍚岀殑鎺т欢
- if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTBoolean)) { // Boolean绫诲瀷
+ if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTBoolean.toString())) { // Boolean绫诲瀷
VCIJComboBox cbx = new VCIJComboBox();
DefaultComboBoxModel model = new DefaultComboBoxModel();
model.addElement("0");
model.addElement("1");
cbx.setModel(model);
+ if(displayValues.containsKey(attrObj.getId())){
+ cbx.setSelectedIndex(Integer.parseInt(displayValues.get(attrObj.getId())));
+ cbx.setEnabled(false);
+ return cbx;
+ }
compt = cbx;
- } else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTDate)) { // 鏃ユ湡绫诲瀷
- compt = new VCIJCalendarPanel("yyyy-MM-dd",
- attrObj.getRequireFlag().equals("true"), true, false);
- } else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTDateTime)) { // 鏃ユ湡绫诲瀷
- compt = new VCIJCalendarPanel("yyyy-MM-dd HH:mm:ss",
+ } else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTDate.toString())) { // 鏃ユ湡绫诲瀷
+ VCIJCalendarPanel aTrue = new VCIJCalendarPanel("yyyy-MM-dd",
attrObj.getRequireFlag().equals("true"), true, false);
- }else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTTime)) { // 鏃ユ湡绫诲瀷
- compt = new VCIJCalendarPanel("HH:mm:ss",
+ if(displayValues.containsKey(attrObj.getId())){
+ aTrue.setDateString(displayValues.get(attrObj.getId()));
+ aTrue.setEnabled(false);
+ return aTrue;
+ }
+ compt = aTrue;
+ } else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTDateTime.toString())) { // 鏃ユ湡绫诲瀷
+ VCIJCalendarPanel aTrue = new VCIJCalendarPanel("yyyy-MM-dd HH:mm:ss",
attrObj.getRequireFlag().equals("true"), true, false);
+ if(displayValues.containsKey(attrObj.getId())){
+ aTrue.setDateString(displayValues.get(attrObj.getId()));
+ aTrue.setEnabled(false);
+ return aTrue;
+ }
+ compt = aTrue;
+ }else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTTime.toString())) { // 鏃ユ湡绫诲瀷
+ VCIJCalendarPanel aTrue = new VCIJCalendarPanel("HH:mm:ss",
+ attrObj.getRequireFlag().equals("true"), true, false);
+ if(displayValues.containsKey(attrObj.getId())){
+ aTrue.setDateString(displayValues.get(attrObj.getId()));
+ aTrue.setEnabled(false);
+ return aTrue;
+ }
+ compt = aTrue;
}
- else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTDouble)||attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTLong)) { // Real绫诲瀷
+ else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTDouble.toString())||attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTLong.toString())) { // Real绫诲瀷
RealTextField txt = new RealTextField("");
txt.setRequired(attrObj.getRequireFlag().equals("true"));
+ if(displayValues.containsKey(attrObj.getId())){
+ txt.setText(displayValues.get(attrObj.getId()));
+ txt.setEditable(false);
+ }
compt = txt;
- } else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTInteger)) { // Integer绫诲瀷
+ } else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTInteger.toString())) { // Integer绫诲瀷
IntegerTextField txt = new IntegerTextField("");
txt.setRequired(attrObj.getRequireFlag().equals("true"));
+ if(displayValues.containsKey(attrObj.getId())){
+ txt.setText(displayValues.get(attrObj.getId()));
+ txt.setEditable(false);
+ }
compt = txt;
}
else{
VCIJTextField txt = new VCIJTextField(this,attrObj.getRequireFlag().equals("true"));
+ if(displayValues.containsKey(attrObj.getId())){
+ txt.setText(displayValues.get(attrObj.getId()));
+ txt.setEditable(false);
+ }
compt = txt;
textCompts.add(txt);
}
@@ -1153,7 +1207,8 @@
private void getComptAttrValue( CodeClassifyTemplateAttrVO tempPropObj, LinkedHashMap<String, JComponent> attrIdToCtrlMaps) {
Map<String,String> dataMap=new HashMap<>();
Map<String,String> condtionMap=new HashMap<>();
- attrIdToCtrlMaps.forEach((key,compt)->{
+ for(String key: attrIdToCtrlMaps.keySet()){
+ JComponent compt = attrIdToCtrlMaps.get(key);
String value = "";
if (compt instanceof JTextComponent) {
value = ((JTextComponent) compt).getText();
@@ -1170,7 +1225,7 @@
}
dataMap.put(key,value);
condtionMap.put("dataMap["+key+"]",value);
- });
+ }
condtionMap.put("componentRuleValue",tempPropObj.getComponentRule());
Map<String,String> headerMap=new HashMap<>();
headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());
@@ -1263,7 +1318,7 @@
dialog.setVisible(true);
}
- private void doSearch(VCIJComboxBox comboxBox,CodeBasicSecVO secObj){
+ private void doSearch(final VCIJComboxBox comboxBox, CodeBasicSecVO secObj){
if(StringUtils.isBlank(secObj.getReferConfig())){
VCIOptionPane.showMessage(this,"鍙傜収閰嶇疆淇℃伅涓嶆纭�,璇锋牳瀵癸紒");
return;
@@ -1552,7 +1607,10 @@
LinkedList<String> listValues = new LinkedList<String>();
// 鍚勫睘鎬х殑绫诲瀷
LinkedList<String> listDataTypes = new LinkedList<String>();
- Map<String,CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOMap=transmitForRMData.getTempPropObjsList().stream().collect(Collectors.toMap(s -> s.getId(), t -> t));
+ Map<String,CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOMap = new HashMap<>();
+ for (CodeClassifyTemplateAttrVO codeClassifyTemplateAttrVO : transmitForRMData.getTempPropObjsList()) {
+ codeClassifyTemplateAttrVOMap.put(codeClassifyTemplateAttrVO.getId(),codeClassifyTemplateAttrVO);
+ }
Iterator<String> keys = attrIdToCtrlMaps.keySet().iterator();
JComponent compt = null;
JComponent firstCompt = null;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchProvider.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchProvider.java
index ad3d323..ced587b 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchProvider.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchProvider.java
@@ -13,6 +13,7 @@
import com.vci.rmip.code.client.codeapply.Apply410.object.R;
import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
import com.vci.rmip.code.client.codeapply.Apply410.utils.ListUtil;
+import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
@@ -36,10 +37,10 @@
CodeClassifyTemplateVO codeClassifyTemplateVO=this.dialog.getOwnerPanel().getCurrentCodeClassifyTemplateVO();
if(codeClassifyTemplateVO!=null){
if(!CollectionUtils.isEmpty(codeClassifyTemplateVO.getAttributes())){
- codeClassifyTemplateVO.getAttributes().stream().forEach(codeClassifyTemplateAttrVO -> {
+ for (CodeClassifyTemplateAttrVO codeClassifyTemplateAttrVO : codeClassifyTemplateVO.getAttributes()) {
fieldList.add(codeClassifyTemplateAttrVO.getId());
nameList.add(codeClassifyTemplateAttrVO.getName());
- });
+ }
}
}
fields = fieldList.toArray(new String[]{});
@@ -61,11 +62,11 @@
String data="";
for (String field:fields){
if(defaultDataMap.containsKey(field+"_text")){
- data=defaultDataMap.getOrDefault(field+"_text","");
+ data=defaultDataMap.get(field+"_text") ;
}else if(defaultDataMap.containsKey(field+"Text")){
- data=defaultDataMap.getOrDefault(field+"Text","");
+ data=defaultDataMap.get(field+"Text") ;
}else{
- data=defaultDataMap.getOrDefault(field,"");
+ data=defaultDataMap.get(field);
}
res.setPropertyValue(getColumns()[i++], data);
@@ -108,11 +109,11 @@
List<Map> dataList= dataGrid.getData();
List<BaseModel> hostInfos=new ArrayList<>();
//List<BaseModel> hostInfos= ListUtil.listMapParseListObj(dataList, BaseModel.class);
- dataList.stream().forEach(map->{
+ for (Map map : dataList) {
BaseModel baseModel= ListUtil.mapParseJavaBean(map,BaseModel.class);
baseModel.setData(map);
hostInfos.add(baseModel);
- });
+ }
//List<BaseModel> hostInfos = (List<BaseModel>) dataList.stream().map(entity -> JSONUtil.toBean(JSONUtil.parseObj(entity), BaseModel.class)).collect(Collectors.toList());
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java
index 5e0fa87..c63e3ee 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java
@@ -59,6 +59,10 @@
* 瀛樺偍灞炴�у拰鍊肩殑Map,key:灞炴�у悕绉帮紝value锛氬睘鎬у��
*/
private String deptName = null;
+ /**
+ * 瀛樺偍灞炴�у拰鍊肩殑Map,key,鐢ㄤ簬榛樿鍊肩殑鏄剧ず
+ */
+ private Map displayValues = new HashMap<String,String>();
private String[] libName = new String[]{};//浠ｇ爜椤瑰悕绉�
private VCIBaseTree leftTree = null;
@@ -78,7 +82,7 @@
* @param deptName
* @param libName
*/
- public CodeApplyPanelFor410(CodeApplyFor410Dialog owner , TokenUserObject tokenUserObject, boolean isIntegrate, String clsfName, String deptName, String[] libName){
+ public CodeApplyPanelFor410(CodeApplyFor410Dialog owner , TokenUserObject tokenUserObject, boolean isIntegrate, String clsfName, String deptName, String[] libName,Map displayValues){
this.tokenUserObject = tokenUserObject;
this.owner =owner;
rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,tokenUserObject,getCurrentCodeClassifyTemplateVO());
@@ -86,6 +90,7 @@
this.clsfName = clsfName;
this.deptName = deptName;
this.libName = libName;
+ this.displayValues = displayValues;
init();
initActionListener();
}
@@ -188,9 +193,9 @@
VCIOptionPane.showMessage(this,r.getMsg());
}
if(!CollectionUtils.isEmpty(codeClassifyList)){
- codeClassifyList.stream().forEach(codeClassify -> {
+ for (CodeClassify codeClassify : codeClassifyList) {
codeItemCombo.addItem(codeClassify);
- });
+ }
codeItemCombo.setSelectedIndex(0);
}
initLeftPanel();
@@ -293,7 +298,7 @@
initBtnStatus(res);
}
}
- rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,tokenUserObject,deptName,getCurrentCodeClassifyTemplateVO());
+ rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,tokenUserObject,deptName,getCurrentCodeClassifyTemplateVO(),displayValues);
scrollPane.setViewportView(rightMainPanel);
rightMainPanel.buildMainPanel(1);
int location = jspLeftToRight.getDividerLocation();
@@ -358,7 +363,7 @@
transmitTreeObject.setCurrentTreeNode(selectedTreeNode);
if(selectedTreeNode.isRoot() && selectedTreeNode.getObj() instanceof String) return;
scrollPane = new JScrollPane();
- rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,tokenUserObject,deptName,getCurrentCodeClassifyTemplateVO());
+ rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,tokenUserObject,deptName,getCurrentCodeClassifyTemplateVO(),displayValues);
scrollPane.setViewportView(rightMainPanel);
rightMainPanel.buildMainPanel(1);
VCIJPanel rightPanel = new VCIJPanel();
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410ActionListener.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410ActionListener.java
index d262684..793fb25 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410ActionListener.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410ActionListener.java
@@ -25,6 +25,7 @@
private LinkedHashMap<String, Runnable> actionMaps = new LinkedHashMap<String, Runnable>();
boolean codeAlreadExist = false;
private String url= ConfigUtils.getConfigValue("410.code.url","http://127.0.0.1:36014/codeApplySwingController");
+ private String classifyGroupCode= ConfigUtils.getConfigValue("410.code.codeApply.classifyGroupCode");
public CodeApplyPanelFor410ActionListener(CodeApplyPanelFor410 owner){
this.owner = owner;
this.initActionMap();
@@ -103,12 +104,12 @@
codeOrderDTO.setTemplateOid(codeClassifyTemplateVO.getOid());
codeOrderDTO.setCodeRuleOid(codeRuleVO.getOid());
List<CodeOrderSecDTO> secDTOList=new ArrayList<>();
- keyValueList.stream().forEach(keyValue -> {
+ for (KeyValue keyValue : keyValueList) {
CodeOrderSecDTO codeOrderSecDTO=new CodeOrderSecDTO();
codeOrderSecDTO.setSecOid(keyValue.getKey());
codeOrderSecDTO.setSecValue(keyValue.getValue());
secDTOList.add(codeOrderSecDTO);
- });
+ }
codeOrderDTO.setLcStatus("Released");
codeOrderDTO.setSecDTOList(secDTOList);
codeOrderDTO.setData(dataMap);
@@ -119,6 +120,9 @@
String code="";
//鏍￠獙鍏抽敭灞炴�у瓨鍦ㄧ殑鏁版嵁鐩存帴杩斿洖缂栫爜
R checkKeyAttrOnOrderR= HttpUtil.sendPost(url+"/checkKeyAttrOnOrderFordatas",object.toString(),headerMap);
+ //鏌ヨ褰撳墠鐢宠缂栫爜鐨勭被鍨�
+ R checkGroupCode= HttpUtil.sendGet(url+"/checkGroupCode?oid="+codeClassify.getOid()+
+ "&classifyGroupCode="+classifyGroupCode,null,headerMap);
if(checkKeyAttrOnOrderR.isSuccess()){
List<Map> list=(List)checkKeyAttrOnOrderR.getData();
if(!CollectionUtils.isEmpty(list)) {
@@ -127,6 +131,15 @@
this.owner.getApplyTxt().requestFocusInWindow();
this.owner.getApplyTxt().selectAll();
this.owner.setAttrNameAndValMap(attrNameAndValMap);
+ if(checkGroupCode.isSuccess()){
+ if(checkGroupCode.getData().equals("true")){
+ VCIOptionPane.showMessage(this.owner, "褰撳墠鍒嗙被鐨勪紒涓氱紪鐮佷负锛�"+list.get(0).get("GROUPCODE"));
+ }else{
+ VCIOptionPane.showMessage(this.owner, "褰撳墠缂栫爜鍒嗙被鏈壘鍒扮浉搴旂殑闆嗗洟锛岃妫�鏌ワ紒锛�");
+ }
+ }else {
+ VCIOptionPane.showMessage(this.owner, "杩滅▼璋冪敤澶辫触锛岃閲嶈瘯锛�");
+ }
return;
}
}
@@ -139,6 +152,20 @@
this.owner.setAttrNameAndValMap(attrNameAndValMap);
}else{
VCIOptionPane.showMessage(this.owner,r.getMsg());
+ }
+ if(checkGroupCode.isSuccess()){
+ if(checkGroupCode.getData().equals("false")){
+ Map<String,String> applyMap = new HashMap<>();
+ applyMap.put("oids",codeClassify.getOid());
+ applyMap.put("btmName",codeClassify.getBtmname());
+ Object applyGroupCodeData = JSONObject.toJSON(applyMap);
+ R applyResult= HttpUtil.sendPost(url+"/DockingPreApplyCode/applyGroupCode",applyGroupCodeData.toString(),headerMap);
+ if(!applyResult.isSuccess()){
+ VCIOptionPane.showMessage(this.owner, r.getMsg());
+ }
+ }
+ }else {
+ VCIOptionPane.showMessage(this.owner, "杩滅▼璋冪敤澶辫触锛岃娉ㄦ剰锛�");
}
}
@@ -161,7 +188,8 @@
CodeApplyFor410MainPanel rightMainPanel2 = this.owner.getRightMainPanel();
LinkedHashMap<String, JComponent> attrInnerNameToCtrlMaps = rightMainPanel2.getAttrInnerNameToCtrlMaps();
if(attrInnerNameToCtrlMaps!=null&&attrInnerNameToCtrlMaps.size()>0){
- attrInnerNameToCtrlMaps.forEach((key,component)->{
+ for(String key : attrInnerNameToCtrlMaps.keySet()){
+ JComponent component = attrInnerNameToCtrlMaps.get(key);
if(component instanceof JTextComponent){
if(((JTextComponent) component).isEnabled())
((JTextComponent) component).setText("");
@@ -169,7 +197,7 @@
if(((VCIJComboBox) component).isEnabled())
((VCIJComboBox) component).setSelectedIndex(0);
}
- });
+ }
}
String applyCode = this.owner.getApplyCode();
if(StringUtils.isBlank(applyCode)) {
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java
index 23c6a08..31f6b45 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java
@@ -20,7 +20,6 @@
import org.apache.commons.collections4.CollectionUtils;
import java.util.*;
-import java.util.stream.Collectors;
public class CodeDataMainPanelDataProvider extends AbstractVCIJTableDataProvider<BaseModel> {
private CodeDataMainPanel ownerPanel;
@@ -37,12 +36,12 @@
LinkedList<String> nameList = new LinkedList<>();
LinkedList<String> fieldList = new LinkedList<>();
List<CodeShowFieldConfigVO> colsList=ownerPanel.getUiFormRefer().getCodeShowFieldConfigVOS();
- colsList.stream().forEach(columns->{
+ for (CodeShowFieldConfigVO columns : colsList) {
String title= columns.getTitle();
String field=columns.getField();
nameList.add(title);
fieldList.add(field);
- });
+ }
specialColumns = nameList.toArray(new String[]{});
fields = fieldList.toArray(new String[]{});
return specialColumns;
@@ -61,7 +60,7 @@
VCIJTableNode<BaseModel> res = new VCIJTableNode<BaseModel>(model);
int i=dataColumnStartIndex;
for (String field:fields){
- String data=defaultDataMap.getOrDefault(field,"");
+ String data=defaultDataMap.containsKey(field) ? defaultDataMap.get(field) : "" ;
res.setPropertyValue(getColumns()[i++], data);
}
return res;
@@ -81,19 +80,18 @@
List<CodeSrchCondConfigVO> codeSrchCondConfigVOS=uiFormRefer.getCodeSrchCondConfigVOS();
JSONObject jsonObject=new JSONObject();
if(!CollectionUtils.isEmpty(codeSrchCondConfigVOS)){
- codeSrchCondConfigVOS.stream().forEach(codeSrchCondConfigVO -> {
+ for (CodeSrchCondConfigVO codeSrchCondConfigVO : codeSrchCondConfigVOS) {
String field=codeSrchCondConfigVO.getFilterField();
String value=codeSrchCondConfigVO.getFilterValue();
String filterType= codeSrchCondConfigVO.getFilterType();
condtionMap.put("conditionMap["+field+"]",value);
- });
+ }
}
Map<String, String> customCondtionMap=ownerPanel.getCustomCondtionMap();
if(customCondtionMap!=null&&customCondtionMap.size()>0){
- customCondtionMap.forEach((field, value) -> {
- condtionMap.put("conditionMap["+field+"]",value);
- });
-
+ for(String field : customCondtionMap.keySet()){
+ condtionMap.put("conditionMap["+field+"]",customCondtionMap.get(field));
+ }
}
Map<String,String> headerMap=new HashMap<>();
headerMap.put("Blade-Auth",this.ownerPanel.getTokenUserObject().getAccess_token());
@@ -116,7 +114,10 @@
List dataList= iPage.getRecords();
BaseModel [] baseModels=new BaseModel[]{};
if(!CollectionUtils.isEmpty(dataList)) {
- List<BaseModel> hostInfos = (List<BaseModel>) dataList.stream().map(entity -> JSONUtil.toBean(JSONUtil.parseObj(entity), BaseModel.class)).collect(Collectors.toList());
+ List<BaseModel> hostInfos = new ArrayList<>();
+ for (Object entity : dataList) {
+ hostInfos.add(JSONUtil.toBean(JSONUtil.parseObj(entity),BaseModel.class));
+ }
baseModels = hostInfos.toArray(new BaseModel[]{});
}
return baseModels;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialogActionListener.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialogActionListener.java
index 96e4caa..8af7e4f 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialogActionListener.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialogActionListener.java
@@ -65,8 +65,8 @@
if(treeNode.getObj() instanceof Tree) {
Tree tree =(Tree)treeNode.getObj();
Map<String,String> attibuteMap= tree.getAttributes();
- String fieldValue=attibuteMap.getOrDefault(valueField,"");
- String textValue=attibuteMap.getOrDefault(textField,"");
+ String fieldValue=attibuteMap.containsKey(valueField) ? attibuteMap.get(valueField) : "";
+ String textValue=attibuteMap.containsKey(textField) ? attibuteMap.get(textField) : "";
KeyValue keyValue=new KeyValue();
keyValue.setKey(fieldValue);
keyValue.setValue(textValue);
@@ -85,8 +85,8 @@
BaseModel baseModel=list.get(0);
Map<String, String> defaultDataMap= VciBaseUtil.objectToMapString(list.get(0));
defaultDataMap.putAll(baseModel.getData());
- String fieldValue=defaultDataMap.getOrDefault(valueField,"");
- String textValue=defaultDataMap.getOrDefault(textField,"");
+ String fieldValue=defaultDataMap.containsKey(valueField) ? defaultDataMap.get(valueField) : "";
+ String textValue=defaultDataMap.containsKey(textField) ? defaultDataMap.get(textField) : "";
KeyValue keyValue=new KeyValue();
keyValue.setKey(fieldValue);
keyValue.setValue(textValue);
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/IPage.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/IPage.java
index 9a6cdfc..5255a5f 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/IPage.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/IPage.java
@@ -1,49 +1,48 @@
package com.vci.rmip.code.client.codeapply.Apply410.object;
+
import java.io.Serializable;
import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
public interface IPage<T> extends Serializable {
List<OrderItem> orders();
- default boolean optimizeCountSql() {
- return true;
- }
+// default boolean optimizeCountSql() {
+// return true;
+// }
- default boolean optimizeJoinOfCountSql() {
- return true;
- }
+// default boolean optimizeJoinOfCountSql() {
+// return true;
+// }
+//
+// default boolean searchCount() {
+// return true;
+// }
+//
+// default long offset() {
+// long current = this.getCurrent();
+// return current <= 1L ? 0L : Math.max((current - 1L) * this.getSize(), 0L);
+// }
- default boolean searchCount() {
- return true;
- }
+// default Long maxLimit() {
+// return null;
+// }
+//
+// default long getPages() {
+// if (this.getSize() == 0L) {
+// return 0L;
+// } else {
+// long pages = this.getTotal() / this.getSize();
+// if (this.getTotal() % this.getSize() != 0L) {
+// ++pages;
+// }
+//
+// return pages;
+// }
+// }
- default long offset() {
- long current = this.getCurrent();
- return current <= 1L ? 0L : Math.max((current - 1L) * this.getSize(), 0L);
- }
-
- default Long maxLimit() {
- return null;
- }
-
- default long getPages() {
- if (this.getSize() == 0L) {
- return 0L;
- } else {
- long pages = this.getTotal() / this.getSize();
- if (this.getTotal() % this.getSize() != 0L) {
- ++pages;
- }
-
- return pages;
- }
- }
-
- default IPage<T> setPages(long pages) {
- return this;
- }
+// default IPage<T> setPages(long pages) {
+// return this;
+// }
List<T> getRecords();
@@ -61,11 +60,11 @@
IPage<T> setCurrent(long current);
- default <R> IPage<T> convert(Function<? super T, ? extends R> mapper) {
- List<T> collect = (List)this.getRecords().stream().map(mapper).collect(Collectors.toList());
- return this.setRecords(collect);
- }
- default String countId() {
- return null;
- }
+// default <R> IPage<T> convert(Function<? super T, ? extends R> mapper) {
+// List<T> collect = (List)this.getRecords().stream().map(mapper).collect(Collectors.toList());
+// return this.setRecords(collect);
+// }
+// default String countId() {
+// return null;
+// }
}
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/OrderItem.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/OrderItem.java
index 2a35b8f..0f4058b 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/OrderItem.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/OrderItem.java
@@ -1,7 +1,7 @@
package com.vci.rmip.code.client.codeapply.Apply410.object;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.stream.Collectors;
public class OrderItem {
@@ -18,11 +18,21 @@
}
public static List<OrderItem> ascs(String... columns) {
- return (List) Arrays.stream(columns).map(OrderItem::asc).collect(Collectors.toList());
+ List<OrderItem> orderItems = new ArrayList<>();
+ for (String column : columns) {
+ orderItems.add(asc(column));
+ }
+ return orderItems;
+// (List) Arrays.stream(columns).map(OrderItem::asc).collect(Collectors.toList());
}
public static List<OrderItem> descs(String... columns) {
- return (List)Arrays.stream(columns).map(OrderItem::desc).collect(Collectors.toList());
+ List<OrderItem> orderItems = new ArrayList<>();
+ for (String column : columns) {
+ orderItems.add(desc(column));
+ }
+ return orderItems;
+// (List)Arrays.stream(columns).map(OrderItem::desc).collect(Collectors.toList());
}
private static OrderItem build(String column, boolean asc) {
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/Page.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/Page.java
index 0f2d41b..db7c639 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/Page.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/Page.java
@@ -3,7 +3,6 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import java.util.function.Predicate;
public class Page<T> {
private static final long serialVersionUID = 8545996863226528798L;
@@ -113,25 +112,25 @@
return this.maxLimit;
}
- private String[] mapOrderToArray(Predicate<OrderItem> filter) {
- List<String> columns = new ArrayList(this.orders.size());
- this.orders.forEach((i) -> {
- if (filter.test(i)) {
- columns.add(i.getColumn());
- }
+// private String[] mapOrderToArray(Predicate<OrderItem> filter) {
+// List<String> columns = new ArrayList(this.orders.size());
+// this.orders.forEach((i) -> {
+// if (filter.test(i)) {
+// columns.add(i.getColumn());
+// }
+//
+// });
+// return (String[])columns.toArray(new String[0]);
+// }
- });
- return (String[])columns.toArray(new String[0]);
- }
-
- private void removeOrder(Predicate<OrderItem> filter) {
- for(int i = this.orders.size() - 1; i >= 0; --i) {
- if (filter.test(this.orders.get(i))) {
- this.orders.remove(i);
- }
- }
-
- }
+// private void removeOrder(Predicate<OrderItem> filter) {
+// for(int i = this.orders.size() - 1; i >= 0; --i) {
+// if (filter.test(this.orders.get(i))) {
+// this.orders.remove(i);
+// }
+// }
+//
+// }
public Page<T> addOrder(OrderItem... items) {
this.orders.addAll(Arrays.asList(items));
diff --git a/Source/UBCS/ubcs-codeApply/src/main/resources/properties/conf.properties b/Source/UBCS/ubcs-codeApply/src/main/resources/properties/conf.properties
index 83342df..9057012 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/resources/properties/conf.properties
+++ b/Source/UBCS/ubcs-codeApply/src/main/resources/properties/conf.properties
@@ -26,5 +26,4 @@
410.code.token.tenantId=000000
410.code.token.authorization=Basic c3dvcmQ6c3dvcmRfc2VjcmV0
410.code.token.contentType=application/x-www-form-urlencoded
-
-
+410.code.codeApply.classifyGroupCode=wupin#appendix#renyuanku
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
index 0634134..52d55bb 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
@@ -237,4 +237,15 @@
public R checkKeyAttrOnOrderFordatas(@RequestBody CodeOrderDTO orderDTO) throws Exception {
return R.data(mdmEngineService.checkKeyAttrOnOrderFordatas(orderDTO));
}
+
+ /**
+ * 闆嗗洟/浼佷笟鐮佹鍒ゆ柇
+ * @param parameter 浼犲叆鏁版嵁 ,classifyGroupCode:閰嶇疆鐨勪腑鐨勫垎绫婚《鑺傜偣锛宱id锛氶�夋嫨鑺傜偣鐨刼id--锛宯owApplyCode锛氬綋鍓嶇敵璇风紪鐮佺殑鍒嗙被
+ * @return 鎵ц缁撴灉
+ */
+ @GetMapping("/checkGroupCode")
+ @VciBusinessLog(operateName = "闆嗗洟/浼佷笟鐮佹鍒ゆ柇")
+ public R checkGroupCode(Map<String,String> parameter) throws Exception {
+ return R.data(mdmEngineService.checkGroupCode(parameter));
+ }
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
index 547f5a7..a7c9b89 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
@@ -161,4 +161,12 @@
* @param classifyList
*/
void batchUpdateLcStatus(@Param("records") List<CodeClassify> classifyList);
+
+ /**
+ * 鍚戜笂鏌ヨ鏍戝舰缁撴瀯
+ *
+ * @param oid 鍒嗙被鐨勪富閿�
+ * @return 鏁版嵁闆嗗悎
+ */
+ List<CodeClassify> selectAllParents(@Param("oid") String oid);
}
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 e723eb7..3174c1e 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
@@ -454,4 +454,10 @@
*/
public List<Map> checkKeyAttrOnOrderFordatas(CodeOrderDTO orderDTO) ;
- }
+ /**
+ * 鏍规嵁褰撳墠鐢宠缂栫爜鐨勫垎绫伙紝閫愬眰寰�涓婃牎楠屾槸鍚︾鍚堝睘浜庨厤缃殑涓殑鍒嗙被瀛愯妭鐐圭殑鍒�
+ * 绫伙紝濡傛灉绗﹀悎锛屽垯璇ュ垎绫荤敵璇风殑缂栫爜涓洪泦鍥㈢爜杩斿洖true锛屽弽涔嬪垯涓轰紒涓氱紪鐮佽繑鍥瀎alse
+ * @param parameter 浼犲叆鏁版嵁,classifyGroupCode:閰嶇疆鐨勪腑鐨勫垎绫婚《鑺傜偣锛宱id锛氶�夋嫨鑺傜偣鐨刼id
+ */
+ R checkGroupCode(Map<String, String> parameter);
+}
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 3c693e1..6a3d868 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
@@ -746,7 +746,29 @@
return dataList;
}
- /**
+ /**
+ * 鏍规嵁褰撳墠鐢宠缂栫爜鐨勫垎绫伙紝閫愬眰寰�涓婃牎楠屾槸鍚︾鍚堝睘浜庨厤缃殑涓殑鍒嗙被瀛愯妭鐐圭殑鍒�
+ * 绫伙紝濡傛灉绗﹀悎锛屽垯璇ュ垎绫荤敵璇风殑缂栫爜涓洪泦鍥㈢爜杩斿洖true锛屽弽涔嬪垯涓轰紒涓氱紪鐮佽繑鍥瀎alse
+ * @param parameter 浼犲叆鏁版嵁,classifyGroupCode:閰嶇疆鐨勪腑鐨勫垎绫婚《鑺傜偣锛宱id锛氶�夋嫨鑺傜偣鐨刼id
+ */
+ @Override
+ public R checkGroupCode(Map<String, String> parameter) {
+ List<CodeClassify> codeClassifyList = classifyService.selectAllLevelParents(parameter.get("oid"));
+ Set<String> configGroupCode = Arrays.stream(parameter.get("classifyGroupCode").split("#")).collect(Collectors.toSet());
+// Boolean checkGroupFlag = false;//鏄惁鏌ヨ鍒伴厤缃殑椤跺眰鍒嗙被涓�
+ for (int i = codeClassifyList.size()-1; i >= 0; i--) {
+ if(configGroupCode.contains(codeClassifyList.get(i).getId())){
+// checkGroupFlag = true;
+ return R.data("true");
+ }
+// if(checkGroupFlag && parameter.get("nowApplyCode").equals(codeClassifyList.get(i).getId())){
+// return R.data(true);
+// }
+ }
+ return R.data("false");
+ }
+
+ /**
* 灏佽鍏抽敭灞炴�х殑鏌ヨ璇彞
*
* @param value 褰撳墠鐨勫��
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
index 69dba1b..4d6f43b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -510,4 +510,11 @@
</foreach>
;END;
</update>
+
+ <select id="selectAllParents" resultMap="plCodeClassifyResultMap">
+ select * from PL_CODE_CLASSIFY p
+ start with p.OID =#{oid}
+ connect by p.oid = prior p.PARENTCODECLASSIFYOID
+ </select>
+
</mapper>
--
Gitblit v1.9.3