From d26f247bb6035ca846e8c7dd123fb7d6425c8c8b Mon Sep 17 00:00:00 2001 From: wangzhijiang <1358525938@qq.com> Date: Wed, 21 Jun 2023 09:30:42 +0800 Subject: [PATCH 01/11] =?UTF-8?q?71145=20=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83-=E6=A0=B9=E6=8D=AE=E9=99=84=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=90=9C=E7=B4=A2=E7=9F=A5=E8=AF=86=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProblemKnowledgeBaseEOServiceImpl.java | 7 +++++++ .../service/impl/DocumentSearchServiceImpl.java | 1 + 2 files changed, 8 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index 1efb0c122..8c4854ed3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -436,6 +436,13 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl accessoryFileList = this.iOSSFileService.getFileInfos(problemKnowledgeBaseEO.getAccessoryFile()); + accessoryFileName = accessoryFileList.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); + } + convertAfterMap.put("file_name",accessoryFileName); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 3a1bd4b15..adb8eaa99 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -1252,6 +1252,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { List fieldList = new ArrayList<>(); fieldList.add("title");//权重5 fieldList.add("content");//权重4 + fieldList.add("file_name");//权重3 //fieldList.add("module_type"); //fieldList.add("id"); //fieldList.add("flag"); From bb714f84bc6acfd4f34f7e09dc4ea7c550684f0e Mon Sep 17 00:00:00 2001 From: wangzhijiang <1358525938@qq.com> Date: Wed, 21 Jun 2023 10:00:33 +0800 Subject: [PATCH 02/11] =?UTF-8?q?71114=20=E6=89=8B=E6=9C=BA=E7=AB=AF-?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BB=BB=E5=8A=A1=E7=BB=9F=E8=AE=A1PreHomo?= =?UTF-8?q?=E6=95=B0=E9=87=8F=EF=BC=8C=E6=8C=89=E7=85=A7PC=E7=AB=AF?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../phone/service/impl/TaskStatisticsServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/TaskStatisticsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/TaskStatisticsServiceImpl.java index 94e4ddba0..a6f174a13 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/TaskStatisticsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/TaskStatisticsServiceImpl.java @@ -71,9 +71,10 @@ public class TaskStatisticsServiceImpl implements ITaskStatisticsService { List preHomoList = piEoList.stream().filter(piEo -> { return StringUtils.equals(piEo.getFlowType(), FlowTypeEnum.CERTIFICATION_LC.getValue()); }).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(preHomoList)) { - preHomoCount = this.getPreHomoCount(pidEoList, preHomoList); - } + preHomoCount = preHomoList.size(); +// if (CollectionUtils.isNotEmpty(preHomoList)) { +// preHomoCount = this.getPreHomoCount(pidEoList, preHomoList); +// } List technologyEvaluationList = piEoList.stream().filter(piEo -> { return StringUtils.equals(piEo.getFlowType(), FlowTypeEnum.FGJSPG.getValue()); From 0207efb60752ef82a1da0141ea48318239d20097 Mon Sep 17 00:00:00 2001 From: wangzhijiang <1358525938@qq.com> Date: Wed, 21 Jun 2023 14:28:24 +0800 Subject: [PATCH 03/11] =?UTF-8?q?71162=20=E6=89=8B=E6=9C=BA=E7=AB=AF-?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E3=80=81?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 6 +++- .../mapper/xml/ProcessInfoEOMapper.xml | 32 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index f072aca67..706af7d17 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -659,4 +659,8 @@ CREATE TABLE `recent_browse` ( `browse_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浏览类型', `browse_data_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浏览数据id', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '最近浏览' ROW_FORMAT = Dynamic; \ No newline at end of file +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '最近浏览' ROW_FORMAT = Dynamic; + +-- 认证清单表 交付物字段扩大 2023-06-21 未同步生产环境 +ALTER TABLE `project_certification_inventory` + MODIFY COLUMN `deliverable` varchar(1500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物' AFTER `duty_territory`; \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml index 5024555f4..f6ad28419 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml @@ -537,6 +537,38 @@ #{item} + + union + SELECT + pi.id, + '' as project_library_id, + '' as project_laws_inventory_id, + pi.buss_document_library_id, + pi.acti_proc_inst_id, + '--' AS project_name, + '' as year_name, + bdl.serial_number, + concat( bdl.serial_number, ' ', bdl.title ) AS standard_info, + bdl.title, + bdl.title_en, + pi.flow_type, + pi.create_by, + pi.end_time, + pi.STATUS, + pi.prc_num, + pi.prc_name, + '' as project_name_id, + '' as target_market, + '' as studio_engineer, + '' as project_version, + '' as parent_id + FROM + process_info pi + LEFT JOIN buss_document_library bdl ON pi.buss_document_library_id = bdl.id + WHERE + pi.flow_type IN ( '5', '6' ) + AND ( pi.id IN ( SELECT pid.process_info_id FROM process_info_detail pid WHERE pid.user_id = #{params.currentUserId} AND pid.STATUS = #{params.taskStatus} ) ) + )temp order by From 170d6e95913093237dd011229ca1fdc449aefefe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 21 Jun 2023 15:54:17 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83=E4=B8=8D=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E9=A1=B5=E7=AD=BE=EF=BC=8C=E6=9F=A5=E8=AF=A2=E7=9A=84?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E9=83=BD=E4=B8=8D=E8=A2=AB=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/permission.js | 2 +- jero-web/src/views/phoneView/handlingPage.vue | 11 +-- .../src/views/phoneView/preHomoMangement.vue | 13 +++- .../src/views/phoneView/processManagement.vue | 5 +- jero-web/src/views/phoneView/toDoCenter.vue | 38 +++++++--- .../views/user/third/JeroThirdLoginMixin.js | 70 +++++++++++++------ 6 files changed, 102 insertions(+), 37 deletions(-) diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js index 9c15d3171..75510d21d 100644 --- a/jero-web/src/permission.js +++ b/jero-web/src/permission.js @@ -119,7 +119,7 @@ router.beforeEach((to, from, next) => { router.addRoutes(store.getters.addRouters) let redirect = decodeURIComponent(from.query.redirect || to.path) if (mobile) { - if (redirect == '/'){ + if (redirect == '/' || redirect == '/dashboard/analysis'){ redirect = '/phoneSearch' } } diff --git a/jero-web/src/views/phoneView/handlingPage.vue b/jero-web/src/views/phoneView/handlingPage.vue index 36423dc24..57e39178a 100644 --- a/jero-web/src/views/phoneView/handlingPage.vue +++ b/jero-web/src/views/phoneView/handlingPage.vue @@ -51,7 +51,7 @@ pageSize: 10, loading: false, finished: false, - isDisplay:false, + isDisplay: false } }, mounted() { @@ -65,7 +65,10 @@ path: this.$route.query.goRouter, query: { searchValue: this.$route.query.searchValue, - activeTab: this.$route.query.activeTab + activeTab: this.$route.query.activeTab, + searchFlowType: this.$route.query.searchFlowType, + checked: this.$route.query.checked, + selectModel: this.$route.query.selectModel } }) } else { @@ -77,9 +80,9 @@ path: '/phonePreHomoMangement', query: { taskDefinitionKey: this.$route.query.taskDefinitionKey, - projectName:this.$route.query.projectName, + projectName: this.$route.query.projectName, id: item.id, - isDisplay:this.isDisplay + isDisplay: this.isDisplay } }) }, diff --git a/jero-web/src/views/phoneView/preHomoMangement.vue b/jero-web/src/views/phoneView/preHomoMangement.vue index d477cd5c6..5761136e7 100644 --- a/jero-web/src/views/phoneView/preHomoMangement.vue +++ b/jero-web/src/views/phoneView/preHomoMangement.vue @@ -317,6 +317,7 @@ } }) }, + getDeliveryResult(item) { getAction('sys/common/getFileInfos', { id: item }).then((res) => { if (res.success) { @@ -333,6 +334,7 @@ } }) }, + disposeResultChange(value) { if (value == 'rzgcssc_tg') { this.form.reasonForReturn = '' @@ -349,6 +351,7 @@ this.form = { ...this.form } }) }, + onSubmit() { this.$refs.form.validate().then(() => { this.textLoading = this.$t('Submitting') @@ -419,7 +422,15 @@ //保存 preservationClick() { let content = [] - content[0] = Object.assign(this.queryForm, this.form) + let fileListId = [] + let form = JSON.parse(JSON.stringify(this.form)) + if (this.queryForm.valueType == 'file') { + this.fileList.forEach(res => { + fileListId.push(res.id) + }) + form.deliveryResult = fileListId.join(',') + } + content[0] = Object.assign(this.queryForm, form) postAction(this.url.saveBatch, { 'dataList': content }).then((res) => { if (res.success) { this.ApprovedClick() diff --git a/jero-web/src/views/phoneView/processManagement.vue b/jero-web/src/views/phoneView/processManagement.vue index 68d8fabae..4e27f164a 100644 --- a/jero-web/src/views/phoneView/processManagement.vue +++ b/jero-web/src/views/phoneView/processManagement.vue @@ -270,7 +270,10 @@ path: this.$route.query.goRouter, query: { searchValue: this.$route.query.searchValue, - activeTab: this.$route.query.activeTab + activeTab: this.$route.query.activeTab, + searchFlowType:this.$route.query.searchFlowType, + checked:this.$route.query.checked, + selectModel:this.$route.query.selectModel, } }) } else { diff --git a/jero-web/src/views/phoneView/toDoCenter.vue b/jero-web/src/views/phoneView/toDoCenter.vue index ff0bdbc17..316b9a106 100644 --- a/jero-web/src/views/phoneView/toDoCenter.vue +++ b/jero-web/src/views/phoneView/toDoCenter.vue @@ -279,16 +279,21 @@ mounted() { document.title = 'NIO GRP' if (this.$route.query.flowType) { + let flowType = this.$route.query.flowType + flowType = flowType.split(',') this.form.flowType = [] - this.form.flowType.push(this.$route.query.flowType) - this.form = { ...this.form } + this.form.flowType = this.form.flowType.concat(flowType) } - if (this.$route.query.searchValue){ - this.phoneQueryValue = this.$route.query.searchValue + if (this.$route.query.searchValue) { + this.phoneQueryValue = this.$route.query.searchValue } if (this.$route.query.activeTab) { this.activeTab = this.$route.query.activeTab + this.form.flowType = this.$route.query.searchFlowType + this.form.checked = JSON.parse(this.$route.query.checked) + this.form.selectModel = this.$route.query.selectModel } + this.form = { ...this.form } // this.toDoProcessPageNo = 1 // this.getToDoProcess() }, @@ -476,8 +481,11 @@ DueDate: 'designDueDate', remarks: 'designRemark', goRouter: '/phoneToDoCenter', - searchValue:this.phoneQueryValue, - activeTab:this.activeTab + searchValue: this.phoneQueryValue, + activeTab: this.activeTab, + checked: this.form.checked, + selectModel: this.form.selectModel, + searchFlowType: this.form.flowType } this.$router.push({ path: '/phoneProcessManagement', @@ -499,8 +507,11 @@ DueDate: 'verifyDueDate', remarks: 'verifyRemark', goRouter: '/phoneToDoCenter', - searchValue:this.phoneQueryValue, - activeTab:this.activeTab + searchValue: this.phoneQueryValue, + activeTab: this.activeTab, + searchFlowType: this.form.flowType, + checked: this.form.checked, + selectModel: this.form.selectModel } this.$router.push({ path: '/phoneProcessManagement', @@ -518,8 +529,11 @@ isDisplay: isTrue, projectName: row.projectName, goRouter: '/phoneToDoCenter', - searchValue:this.phoneQueryValue, - activeTab:this.activeTab + searchValue: this.phoneQueryValue, + activeTab: this.activeTab, + searchFlowType: this.form.flowType, + checked: this.form.checked, + selectModel: this.form.selectModel } }) } else { @@ -597,6 +611,7 @@ } }) }, + getProcessDone() { let form = JSON.parse(JSON.stringify(this.form)) if (form.flowType && form.flowType instanceof Array) { @@ -623,6 +638,7 @@ } }) }, + getSentProcess() { let form = JSON.parse(JSON.stringify(this.form)) if (form.flowType && form.flowType instanceof Array) { @@ -649,6 +665,7 @@ } }) }, + processClick(type) { if (!this.form.flowType) { this.form.flowType = [] @@ -670,6 +687,7 @@ } this.form = { ...this.form } }, + checkboxGroupColor(type) { if (this.form.flowType && this.form.flowType.length > 0) { for (let i = 0; i < this.form.flowType.length; i++) { diff --git a/jero-web/src/views/user/third/JeroThirdLoginMixin.js b/jero-web/src/views/user/third/JeroThirdLoginMixin.js index ff4f1736b..2b0fc5cd9 100644 --- a/jero-web/src/views/user/third/JeroThirdLoginMixin.js +++ b/jero-web/src/views/user/third/JeroThirdLoginMixin.js @@ -74,9 +74,9 @@ export const JeroThirdLoginMixin = { doThirdLogin(token) { if (this.thirdLoginState === false) { this.thirdLoginState = true - let param={}; - param.thirdType=this.thirdType - param.token=token + let param = {} + param.thirdType = this.thirdType + param.token = token this.ThirdLogin(param).then(res => { if (res.success) { this.loginSuccess() @@ -179,33 +179,63 @@ export const JeroThirdLoginMixin = { } }) }, - loginSuccess () { + // 判断当前设备 + isMobile() { + var userAgentInfo = navigator.userAgent + + var mobileAgents = ['Android', 'iPhone', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod'] + + var mobile_flag = false + + //根据userAgent判断是否是手机 + for (var v = 0; v < mobileAgents.length; v++) { + if (userAgentInfo.indexOf(mobileAgents[v]) > 0) { + mobile_flag = true + break + } + } + var screen_width = window.screen.width + var screen_height = window.screen.height + + //根据屏幕分辨率判断是否是手机 + if (screen_width < 500 && screen_height < 800) { + mobile_flag = true + } + return mobile_flag + }, + loginSuccess() { // update-begin- author:sunjianlei --- date:20190812 --- for: 登录成功后不解除禁用按钮，防止多次点击 // this.loginBtn = false // update-end- author:sunjianlei --- date:20190812 --- for: 登录成功后不解除禁用按钮，防止多次点击 - this.$router.push({ path: "/dashboard/analysis" }).catch(()=>{ + let fullPath = '' + if (isMobile()) { + fullPath = '/phoneSearch' + } else { + fullPath = '/dashboard/analysis' + } + this.$router.push({ path: fullPath }).catch(() => { console.log('登录跳转首页出错,这个错误从哪里来的') }) this.$notification.success({ message: '欢迎', - description: `${timeFix()}，欢迎回来`, - }); + description: `${timeFix()}，欢迎回来` + }) }, - cmsFailed(err){ - this.$notification[ 'error' ]({ - message: "登录失败", - description:err, - duration: 4, - }); - }, - requestFailed (err) { - this.$notification[ 'error' ]({ + cmsFailed(err) { + this.$notification['error']({ message: '登录失败', - description: ((err.response || {}).data || {}).message || err.message || "请求出现错误，请稍后再试", - duration: 4, - }); - this.loginBtn = false; + description: err, + duration: 4 + }) }, + requestFailed(err) { + this.$notification['error']({ + message: '登录失败', + description: ((err.response || {}).data || {}).message || err.message || '请求出现错误，请稍后再试', + duration: 4 + }) + this.loginBtn = false + } } } \ No newline at end of file From 4d96759b133d58f4465930ac91d46fce527f568d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 21 Jun 2023 17:32:42 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83=E4=B8=8D=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E9=A1=B5=E7=AD=BE=EF=BC=8C=E6=9F=A5=E8=AF=A2=E7=9A=84?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E9=83=BD=E4=B8=8D=E8=A2=AB=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/public/index.html | 72 +++++++++++++++++++++++++++++++++----- jero-web/src/App.vue | 3 +- 2 files changed, 66 insertions(+), 9 deletions(-) diff --git a/jero-web/public/index.html b/jero-web/public/index.html index 37f7a397c..4657e9024 100644 --- a/jero-web/public/index.html +++ b/jero-web/public/index.html @@ -19,12 +19,14 @@ margin: 0px; padding: 0px; } + .chromeframe { margin: 0.2em 0; background: #ccc; color: #000; padding: 0.2em 0; } + #loader-wrapper { position: fixed; top: 0; @@ -33,6 +35,7 @@ height: 100%; z-index: 999999; } + #loader { display: block; position: relative; @@ -57,6 +60,7 @@ /* Chrome, Firefox 16+, IE 10+, Opera */ z-index: 1001; } + #loader:before { content: ""; position: absolute; @@ -79,6 +83,7 @@ animation: spin 3s linear infinite; /* Chrome, Firefox 16+, IE 10+, Opera */ } + #loader:after { content: ""; position: absolute; @@ -101,6 +106,7 @@ animation: spin 1.5s linear infinite; /* Chrome, Firefox 16+, IE 10+, Opera */ } + @-webkit-keyframes spin { 0% { -webkit-transform: rotate(0deg); @@ -119,6 +125,7 @@ /* Firefox 16+, IE 10+, Opera */ } } + @keyframes spin { 0% { -webkit-transform: rotate(0deg); @@ -137,6 +144,7 @@ /* Firefox 16+, IE 10+, Opera */ } } + #loader-wrapper .loader-section { position: fixed; top: 0; @@ -152,12 +160,15 @@ transform: translateX(0); /* Firefox 16+, IE 10+, Opera */ } + #loader-wrapper .loader-section.section-left { left: 0; } + #loader-wrapper .loader-section.section-right { right: 0; } + /* Loaded */ .loaded #loader-wrapper .loader-section.section-left { -webkit-transform: translateX(-100%); @@ -169,6 +180,7 @@ -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); } + .loaded #loader-wrapper .loader-section.section-right { -webkit-transform: translateX(100%); /* Chrome, Opera 15+, Safari 3.1+ */ @@ -179,11 +191,13 @@ -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); } + .loaded #loader { opacity: 0; -webkit-transition: all 0.3s ease-out; transition: all 0.3s ease-out; } + .loaded #loader-wrapper { visibility: hidden; -webkit-transform: translateY(-100%); @@ -195,13 +209,16 @@ -webkit-transition: all 0.3s 1s ease-out; transition: all 0.3s 1s ease-out; } + /* JavaScript Turned Off */ .no-js #loader-wrapper { display: none; } + .no-js h1 { color: #222222; } + #loader-wrapper .load_title { font-family: 'Open Sans'; color: #FFF; @@ -214,6 +231,7 @@ opacity: 1; line-height: 30px; } + #loader-wrapper .load_title span { font-weight: normal; font-style: italic; @@ -221,28 +239,66 @@ color: #FFF; opacity: 0.5; } + /* 滚动条优化 start */ - ::-webkit-scrollbar{ - width:8px; - height:8px; + ::-webkit-scrollbar { + width: 8px; + height: 8px; } - ::-webkit-scrollbar-track{ + + ::-webkit-scrollbar-track { background: #f6f6f6; - border-radius:2px; + border-radius: 2px; } - ::-webkit-scrollbar-thumb{ + + ::-webkit-scrollbar-thumb { background: #cdcdcd; - border-radius:2px; + border-radius: 2px; } - ::-webkit-scrollbar-thumb:hover{ + + ::-webkit-scrollbar-thumb:hover { background: #747474; } + ::-webkit-scrollbar-corner { background: #f6f6f6; } + /* 滚动条优化 end */ + diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue index d4bd69fbf..1caee63ae 100644 --- a/jero-web/src/App.vue +++ b/jero-web/src/App.vue @@ -211,7 +211,8 @@ height: 32px !important; line-height: 32px !important; } - .page .ant-select-selection__rendered{ + + .page .ant-select-selection__rendered { height: 32px !important; line-height: 32px !important; } From 8fab3d8a3d0ebe6bc1f202b3005893dee9100571 Mon Sep 17 00:00:00 2001 From: wangzhijiang <1358525938@qq.com> Date: Wed, 21 Jun 2023 17:43:34 +0800 Subject: [PATCH 06/11] =?UTF-8?q?71256=20=E4=BF=AE=E6=94=B9=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=EF=BC=8C=E5=90=8C=E6=AD=A5=E5=BE=85=E5=8A=9E=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=AD=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rojectCertificationInventoryEOService.java | 7 ++ ...ctCertificationInventoryEOServiceImpl.java | 79 +++++++++++++++++-- 2 files changed, 78 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java index e8b43edfa..2a53d7390 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java @@ -310,4 +310,11 @@ public interface IProjectCertificationInventoryEOService extends IService groupByCertificationProgress(List pciEos); + + /** + * 同步待办中心明细数据-认证清单 截止日期 + * @param endTime + * @param editEndTimeCertificationInventoryEOS + */ + void syncProcessInfoDetailEndTime(Date endTime, List editEndTimeCertificationInventoryEOS); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 03843587c..c1076d716 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -213,6 +213,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); @@ -609,28 +612,30 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl certificationQueryWrap = new QueryWrapper<>(); certificationQueryWrap.lambda().in(ProjectCertificationInventoryEO::getId,idList); - certificationQueryWrap.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList); +// certificationQueryWrap.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList); List projectCertificationInventoryEOS = this.list(certificationQueryWrap); if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOS)){ - projectCertificationInventoryEOS = projectCertificationInventoryEOS.stream().filter(certificationInventory -> { + List pciEoListTemp = projectCertificationInventoryEOS.stream().filter(certificationInventory -> { boolean flag = false; - if(projectCertificationInventoryEO.getEndTime() != null && certificationInventory.getEndTime() != null){ - if(!projectCertificationInventoryEO.getEndTime().equals(certificationInventory.getEndTime())){ - flag = true; + if(StringUtils.equals(certificationInventory.getFlowStatus(),CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())){ + if(projectCertificationInventoryEO.getEndTime() != null && certificationInventory.getEndTime() != null){ + if(!projectCertificationInventoryEO.getEndTime().equals(certificationInventory.getEndTime())){ + flag = true; + } } } return flag; }).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(projectCertificationInventoryEOS)) { - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId()); + if (CollectionUtils.isNotEmpty(pciEoListTemp)) { + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(pciEoListTemp.get(0).getProjectLibraryId()); if(ObjectUtils.isNotEmpty(projectLibraryBase)){ List userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); this.sendMessageByTemplateId( - projectCertificationInventoryEOS, + pciEoListTemp, TemplateInfoEnum2.CERTIFICATION_MESSAGE14.getValue(), userIdList, userInfoList, @@ -638,6 +643,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl pciEoList) { + pciEoList = pciEoList.stream().filter(pciEo -> { + boolean flag = false; + if(!newEndTime.equals(pciEo.getEndTime())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(pciEoList)){ + List pciIdList = pciEoList.stream().map(ProjectCertificationInventoryEO::getId).distinct().collect(Collectors.toList()); + + QueryWrapper pidQueryWrap = new QueryWrapper<>(); + pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue()); + pidQueryWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,pciIdList); + List pidEoList = this.processInfoDetailEOService.list(pidQueryWrap); + + if(CollectionUtils.isNotEmpty(pidEoList)){ + List updatePidEoList = new ArrayList<>(); + for (ProjectCertificationInventoryEO pciEo : pciEoList) { + String pciEoId = pciEo.getId(); + String flowStatus = pciEo.getFlowStatus(); + // 如果该数据为 结果待提交或审查退回的时候 + if (StringUtils.equals(flowStatus,CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + || StringUtils.equals(flowStatus,CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) ) { + List pidEoListTemp = pidEoList.stream().filter(pidEo -> { + boolean flag = ( + StringUtils.equals(pidEo.getProjectLawsInventoryId(),pciEoId) + && StringUtils.equals(pidEo.getStatus(),TaskStatusEnum.NOT_DONE.getValue()) + && StringUtils.equals(pidEo.getTaskDefinitionKey(),CertificationFlowNodeEnum.ZRRTJRW.getKey()) + ); + return flag; + }).collect(Collectors.toList()); + updatePidEoList.addAll(pidEoListTemp); + }else if(StringUtils.equals(flowStatus,CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())){ + List pidEoListTemp = pidEoList.stream().filter(pidEo -> { + boolean flag = ( + StringUtils.equals(pidEo.getProjectLawsInventoryId(),pciEoId) + && StringUtils.equals(flowStatus,TaskStatusEnum.NOT_DONE.getValue()) + && StringUtils.equals(pidEo.getTaskDefinitionKey(),CertificationFlowNodeEnum.RZGCSSC.getKey()) + ); + return flag; + }).collect(Collectors.toList()); + updatePidEoList.addAll(pidEoListTemp); + } + } + + if(CollectionUtils.isNotEmpty(updatePidEoList)){ + updatePidEoList.forEach(pidEo -> pidEo.setEndTime(newEndTime)); + this.processInfoDetailEOService.updateBatchById(updatePidEoList); + } + } + } + } + @Override public Map>> queryDutyPersonByProjectId(Map params) { Map>> result = new HashMap<>(); From e9dd0e7f2368b40b30ea084905caa5d68f536226 Mon Sep 17 00:00:00 2001 From: wangzhijiang <1358525938@qq.com> Date: Wed, 21 Jun 2023 17:57:32 +0800 Subject: [PATCH 07/11] =?UTF-8?q?71263=20=E5=BE=85=E5=8A=9E=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E6=A3=80=E7=B4=A2=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E3=80=81=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml index f6ad28419..af0a76db1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml @@ -548,9 +548,9 @@ '--' AS project_name, '' as year_name, bdl.serial_number, - concat( bdl.serial_number, ' ', bdl.title ) AS standard_info, bdl.title, bdl.title_en, + concat( bdl.serial_number, ' ', bdl.title ) AS standard_info, pi.flow_type, pi.create_by, pi.end_time, From 7114a2014434635ab188d90e6829bb95b01149f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Sun, 25 Jun 2023 09:26:18 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E8=BF=94=E5=9B=9E=E8=B7=B3=E5=88=B0pc=E7=9A=84?= =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/public/index.html b/jero-web/public/index.html index 4657e9024..63ed7250c 100644 --- a/jero-web/public/index.html +++ b/jero-web/public/index.html @@ -295,7 +295,7 @@ if (isMobile()) { if (location.pathname == '/dashboard/analysis' || location.pathname == '/') { - window.location.href = 'http://10.0.3.22:3000/phoneSearch' + window.location.href = 'http://10.10.10.46:8102/phoneSearch' } } From 5c10d3b3f73d65bc2a7ca8ff19d2bd2c8ae4e739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Sun, 25 Jun 2023 10:58:58 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E8=BF=94=E5=9B=9E=E8=B7=B3=E5=88=B0pc=E7=9A=84?= =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/phoneView/processManagement.vue | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/phoneView/processManagement.vue b/jero-web/src/views/phoneView/processManagement.vue index 4e27f164a..3eb70bd54 100644 --- a/jero-web/src/views/phoneView/processManagement.vue +++ b/jero-web/src/views/phoneView/processManagement.vue @@ -271,9 +271,9 @@ query: { searchValue: this.$route.query.searchValue, activeTab: this.$route.query.activeTab, - searchFlowType:this.$route.query.searchFlowType, - checked:this.$route.query.checked, - selectModel:this.$route.query.selectModel, + searchFlowType: this.$route.query.searchFlowType, + checked: this.$route.query.checked, + selectModel: this.$route.query.selectModel } }) } else { @@ -458,7 +458,20 @@ if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.show = false - this.$router.go(-1) + if (this.$route.query.goRouter) { + this.$router.push({ + path: this.$route.query.goRouter, + query: { + searchValue: this.$route.query.searchValue, + activeTab: this.$route.query.activeTab, + searchFlowType: this.$route.query.searchFlowType, + checked: this.$route.query.checked, + selectModel: this.$route.query.selectModel + } + }) + } else { + this.$router.go(-1) + } } else { this.show = false this.$message.warning(res.message) From 46ef4d4580a7aefb0c97c5c6c26a8bf76df98710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Sun, 25 Jun 2023 14:37:16 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E8=BF=94=E5=9B=9E=E8=B7=B3=E5=88=B0pc=E7=9A=84?= =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/phoneView/preHomoMangement.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/phoneView/preHomoMangement.vue b/jero-web/src/views/phoneView/preHomoMangement.vue index 5761136e7..fe589e752 100644 --- a/jero-web/src/views/phoneView/preHomoMangement.vue +++ b/jero-web/src/views/phoneView/preHomoMangement.vue @@ -97,9 +97,7 @@
{{$t('resultofhandling')}} + + + {{$t('DeliverablesResult')}} - * + *
Date: Sun, 25 Jun 2023 15:33:58 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E8=BF=94=E5=9B=9E=E8=B7=B3=E5=88=B0pc=E7=9A=84?= =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/phoneView/taskData.vue | 2 +- jero-web/src/views/phoneView/toDoCenter.vue | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/phoneView/taskData.vue b/jero-web/src/views/phoneView/taskData.vue index fde6d12c4..784274adc 100644 --- a/jero-web/src/views/phoneView/taskData.vue +++ b/jero-web/src/views/phoneView/taskData.vue @@ -198,7 +198,7 @@ this.$router.push({ path: '/phoneToDoCenter', query: { - flowType: num + searchFlowType: num } }) }, diff --git a/jero-web/src/views/phoneView/toDoCenter.vue b/jero-web/src/views/phoneView/toDoCenter.vue index 316b9a106..e415ff460 100644 --- a/jero-web/src/views/phoneView/toDoCenter.vue +++ b/jero-web/src/views/phoneView/toDoCenter.vue @@ -278,8 +278,8 @@ }, mounted() { document.title = 'NIO GRP' - if (this.$route.query.flowType) { - let flowType = this.$route.query.flowType + if (this.$route.query.searchFlowType) { + let flowType = this.$route.query.searchFlowType flowType = flowType.split(',') this.form.flowType = [] this.form.flowType = this.form.flowType.concat(flowType) @@ -289,7 +289,6 @@ } if (this.$route.query.activeTab) { this.activeTab = this.$route.query.activeTab - this.form.flowType = this.$route.query.searchFlowType this.form.checked = JSON.parse(this.$route.query.checked) this.form.selectModel = this.$route.query.selectModel } @@ -485,7 +484,7 @@ activeTab: this.activeTab, checked: this.form.checked, selectModel: this.form.selectModel, - searchFlowType: this.form.flowType + searchFlowType: this.form.flowType.join(','), } this.$router.push({ path: '/phoneProcessManagement', @@ -509,7 +508,7 @@ goRouter: '/phoneToDoCenter', searchValue: this.phoneQueryValue, activeTab: this.activeTab, - searchFlowType: this.form.flowType, + searchFlowType: this.form.flowType.join(','), checked: this.form.checked, selectModel: this.form.selectModel } @@ -531,7 +530,7 @@ goRouter: '/phoneToDoCenter', searchValue: this.phoneQueryValue, activeTab: this.activeTab, - searchFlowType: this.form.flowType, + searchFlowType: this.form.flowType.join(','), checked: this.form.checked, selectModel: this.form.selectModel }