From e4384663a35646a92871c84fb0960f644fb703ad Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 29 十一月 2023 14:25:55 +0800
Subject: [PATCH] 1.标准化文件申请，修订测试完善
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/algorithm/CustomRomanSerialAlgorithmExample.java | 7 +++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 4 +-
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/标准化文件修订.json | 37 ++++++++++++++++++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/标准化文件申请.json | 37 ++++++++++++++++++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/系列变标准.json | 34 +++++++++++++++++
5 files changed, 116 insertions(+), 3 deletions(-)
diff --git "a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\346\240\207\345\207\206\345\214\226\346\226\207\344\273\266\344\277\256\350\256\242.json" "b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\346\240\207\345\207\206\345\214\226\346\226\207\344\273\266\344\277\256\350\256\242.json"
new file mode 100644
index 0000000..902c5f1
--- /dev/null
+++ "b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\346\240\207\345\207\206\345\214\226\346\226\207\344\273\266\344\277\256\350\256\242.json"
@@ -0,0 +1,37 @@
+{
+ "operationType": "2",
+ "series": false,
+ "releaseTime": "2023-11-23",
+ "oldCode": "BJJ-23-1",
+ "seriesFlow": "",
+ "isEditSeries": false,
+ "editInProcess": false,
+ "codeClassifyOid": "1722159255211085824",
+ "templateOid": "1722162284376199170",
+ "codeRuleOid": "1729702446013485056",
+ "editInProcess": "",
+ "secDTOList":[{
+ "secOid":"1729702742034878464",
+ "secValue": "BJJ"
+ },{
+ "secOid":"1729702831633600512",
+ "secValue": "-"
+ },
+ {
+ "secOid":"1729703035887816704",
+ "secValue": "23"
+ },{
+ "secOid":"1729703108231172096",
+ "secValue": "-"
+ }
+ ],
+ "data":{"name":"鏍囧噯鍖栨枃浠跺悕绉�",
+ "standardFileType":"鏂囦欢绫诲瀷",
+ "codeStandardEditType":"2",
+ "oldcode":"BJJ-23-1",
+ "isSeries":"false",
+ "reviseSeries":"false",
+ "ImplementationDate":"2023-11-23 19:22:33",
+ "approveDate":"2023-11-23 19:22:33",
+ "releaseDate": "2023-11-23 19:22:33"}
+}
diff --git "a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\346\240\207\345\207\206\345\214\226\346\226\207\344\273\266\347\224\263\350\257\267.json" "b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\346\240\207\345\207\206\345\214\226\346\226\207\344\273\266\347\224\263\350\257\267.json"
new file mode 100644
index 0000000..c68b161
--- /dev/null
+++ "b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\346\240\207\345\207\206\345\214\226\346\226\207\344\273\266\347\224\263\350\257\267.json"
@@ -0,0 +1,37 @@
+{
+ "operationType": "1",
+ "series": false,
+ "releaseTime": "2023-11-23",
+ "oldCode": "",
+ "seriesFlow": "",
+ "isEditSeries": false,
+ "editInProcess": false,
+ "codeClassifyOid": "1722159255211085824",
+ "templateOid": "1722162284376199170",
+ "codeRuleOid": "1729702446013485056",
+ "editInProcess": "",
+ "secDTOList":[{
+ "secOid":"1729702742034878464",
+ "secValue": "BJJ"
+ },{
+ "secOid":"1729702831633600512",
+ "secValue": "-"
+ },
+ {
+ "secOid":"1729703035887816704",
+ "secValue": "23"
+ },{
+ "secOid":"1729703108231172096",
+ "secValue": "-"
+ }
+ ],
+ "data":{"name":"鏍囧噯鍖栨枃浠跺悕绉�",
+ "standardFileType":"鏂囦欢绫诲瀷",
+ "codeStandardEditType":"1",
+ "oldcode":"",
+ "isSeries":"false",
+ "reviseSeries":"false",
+ "ImplementationDate":"2023-11-23 19:22:33",
+ "approveDate":"2023-11-23 19:22:33",
+ "releaseDate": "2023-11-23 19:22:33"}
+}
diff --git "a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\347\263\273\345\210\227\345\217\230\346\240\207\345\207\206.json" "b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\347\263\273\345\210\227\345\217\230\346\240\207\345\207\206.json"
new file mode 100644
index 0000000..132a7b8
--- /dev/null
+++ "b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\347\263\273\345\210\227\345\217\230\346\240\207\345\207\206.json"
@@ -0,0 +1,34 @@
+{
+ "operationType": "2",
+ "series": true,
+ "releaseTime": "2023-11-23",
+ "oldCode": "Q/3B7.1-2023",
+ "seriesFlow": "",
+ "isEditSeries": true,
+ "editInProcess": false,
+ "codeClassifyOid": "1722159168229609472",
+ "templateOid": "1722159635358650369",
+ "codeRuleOid": "1717377846655193088",
+ "editInProcess": "",
+ "secDTOList":[{
+ "secOid":"1717378065371369472",
+ "secValue": "Q/3B"
+ },{
+ "secOid":"1722497248551636992",
+ "secValue": "-"
+ },
+ {
+ "secOid":"1722497450259910656",
+ "secValue": "2023"
+ }
+ ],
+ "data":{"name":"绯诲垪鏍囧噯鍚嶇О",
+ "standardFileType":"鏂囦欢绫诲瀷",
+ "codeStandardEditType":"2",
+ "oldcode":"Q/3B7.1-2023",
+ "isSeries":"true",
+ "reviseSeries":"true",
+ "ImplementationDate":"2023-11-23 19:22:33",
+ "approveDate":"2023-11-23 19:22:33",
+ "releaseDate": "2023-11-23 19:22:33"}
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/algorithm/CustomRomanSerialAlgorithmExample.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/algorithm/CustomRomanSerialAlgorithmExample.java
index 26d489d..ab65d16 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/algorithm/CustomRomanSerialAlgorithmExample.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/algorithm/CustomRomanSerialAlgorithmExample.java
@@ -116,7 +116,12 @@
int newYear=0;
int month=0;
if(yearMoths.length>2){
- newYear=Integer.parseInt(yearMoths[0]);
+ String year=yearMoths[0];
+ if(year.length()>String.valueOf(yearSecValue).length()){//鏈夋椂鍊欏彂甯冩椂闂寸殑骞撮暱搴﹀ぇ浜庣爜娈电殑闀垮害锛屽垯闇�瑕佹埅鍙栧悗2浣�
+ newYear= Integer.parseInt(year.substring(2));
+ }else {
+ newYear=Integer.parseInt(year);
+ }
month=Integer.parseInt(yearMoths[1]);
}
if(newYear>yearSecValue&&month>1){
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 f5e3785..c012248 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
@@ -961,14 +961,14 @@
LinkedList<CodeOrderSecDTO> newSecDTOList=new LinkedList<>();
changeCodeOrderSecDTO(ruleVO,secDTOS,oldCode,newSecDTOList);//鏍规嵁瑕佹眰閲嶆柊绠楃爜娈电爜鍊�
if(!codeBZApplyDTO.isEditSeries()){//鍙樻洿涓烘爣鍑�
- if(!codeBZApplyDTO.isSeries()){//濡傛灉鏄〃鍑嗭紝鍒欓渶瑕佸皢绯诲垪濂芥祦姘寸疆涓簄ull
+ //if(!codeBZApplyDTO.isSeries()){//濡傛灉鏄〃鍑嗭紝鍒欓渶瑕佸皢绯诲垪濂芥祦姘寸疆涓簄ull
//鍥犱负鏄爣鍑嗗垯鎺у埗鐮佹涓殑绯诲垪娴佹按鐮佹鍊间负绌�
newSecDTOList.stream().forEach(codeOrderSecDTO -> {
if(codeCodeBasicSecMap.containsKey(codeOrderSecDTO.getSecOid())&&codeCodeBasicSecMap.get(codeOrderSecDTO.getSecOid()).getName().equals(secName)){
codeOrderSecDTO.setSecValue("");
}
});
- }
+ //}
orderDTO.setSecDTOList(newSecDTOList);
return createDataBZ(orderDTO,ruleVO,authUser);
}else{//鍙樻洿涓虹郴鍒�.鍒欐寜鐓ч�昏緫鍘诲鐞�
--
Gitblit v1.9.3