From 134cf21339727b9f9756db3becbf6a600f263763 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Mon, 20 Jun 2022 10:42:00 +0800 Subject: [PATCH 001/140] =?UTF-8?q?[update]=20=E8=87=AA=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index a171d5023..a0f50274f 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -28,14 +28,14 @@ {{ record.dataValue == null? '--': record.dataValue}} + @click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}} - {{ record.dataValue == null? '--': record.dataValue}} + {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}} - {{ record.dataValue == null? '--': record.dataValue}} + {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}} @@ -273,7 +273,7 @@ // 当前工程接口人的id this.getquerySdtId = record.id getAction(this.url.getquerySdtList, { - projectId: this.$route.query.id, + projectId: this.$route.query.projectId, dutyTerritory: record.dutyTerritory }).then((res) => { if (res.success) { @@ -339,7 +339,6 @@ paramsManifestId: this.$route.query.id, projectId: this.$route.query.projectId } - console.log(params,'pppp') getAction(this.url.getLoginUserType, params).then((res) => { if (res.success) { this.getTableList() From 03943ff6ee1b342be241fee06fc86f8bdb143d3c Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Mon, 20 Jun 2022 12:03:40 +0800 Subject: [PATCH 002/140] [update] --- .../src/components/TaskCutOffTime/index.vue | 6 ++--- .../ParameterItemCollectionList.vue | 7 +++--- .../projectManagement/dialog/configure.vue | 24 ++++++++++++------- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue index dee4202f3..7ca73d419 100644 --- a/jero-web/src/components/TaskCutOffTime/index.vue +++ b/jero-web/src/components/TaskCutOffTime/index.vue @@ -11,9 +11,9 @@ > - - - + {{$t('cutoffTime')}} + + diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 83e7306b1..0035ab4d5 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -201,8 +201,9 @@ @areaVisibleAssignedbyflag='areaVisibleAssignedbyflag' @areaVisible='areaVisibleAssignedby = false'/> - - + @@ -524,7 +525,7 @@ export default { flag = 0 } // 状态符合，但是没有工程接口人 不能下发收集 - if(item.sdt.dataValue === null && (flag == 1 || flag == 3)) { + if((item.sdt.dataValue === null || item.sdt.dataValue ==='undefined') && (flag == 1 || flag == 3)) { this.NotSelectedNoEngineerValue.push(item) flag = 3 } diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue index 8a501e3a4..410a485ad 100644 --- a/jero-web/src/views/projectManagement/dialog/configure.vue +++ b/jero-web/src/views/projectManagement/dialog/configure.vue @@ -182,22 +182,30 @@ export default { }) }, addModel(id) { + this.paramsConfigEOList = [] this.visible = true this.title = '维护配置信息' this.formInline = {} this.getconList(id) }, - editModel(value) { - this.visible = true - this.title = '编辑配置信息' - this.$nextTick(() => { - this.formInline = value - }) - }, getconList(id) { getAction(`${this.url.conList}?paramsManifestId=${id}`, {}).then((res) => { if (res.success) { - this.paramsConfigEOList = res.result.length === 0 ? this.paramsConfigEOList : res.result + if(res.result.length === 0) { + this.paramsConfigEOList = [ + { + id: '', + // displaySeq: 0, + configName: '', // 配置名称 + version: '', // 版本 + carType: '', // 车型 + battery: '', // 电池 + motor: '', // 电机 + } + ] + } else { + this.paramsConfigEOList = res.result + } this.visible = true } else { this.$message.warning(res.message) From 0c2f52a53e40e17c728fda45baaf7679ee965e75 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Mon, 20 Jun 2022 15:32:21 +0800 Subject: [PATCH 003/140] [update] --- .../src/components/SynchronousSubmissionLibrary/index.vue | 2 +- .../components/ParameterItemCollectionList.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/components/SynchronousSubmissionLibrary/index.vue b/jero-web/src/components/SynchronousSubmissionLibrary/index.vue index fc539927d..6760052e7 100644 --- a/jero-web/src/components/SynchronousSubmissionLibrary/index.vue +++ b/jero-web/src/components/SynchronousSubmissionLibrary/index.vue @@ -80,7 +80,7 @@ export default { this.loadData() }, handleCancel() { - this.$emit('areaVisible', false) + this.$emit('areaVisibsynchronous', false) }, onSelectChange(selectedRowKeys, selectedRowKeysDate) { this.selectedRowKeysDate = selectedRowKeysDate diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 0035ab4d5..8d1e2b411 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -215,7 +215,7 @@ + :selectedRowKeysArray='selectedRowKeysArray' @areaVisibsynchronous='areaVisibsynchronous = false'/> { if(itemIn !== 'sdt') { - if(item[itemIn] instanceof Object) { + if(item[itemIn] instanceof Object && !(item[itemIn] instanceof Array)) { postDateobj[itemIn] = item[itemIn] item[itemIn].list.forEach((item,index) => { if(item.type == 'pull_more'){ From 100af31d9650a51f5755acdd825dd499568a88d7 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Mon, 20 Jun 2022 17:16:26 +0800 Subject: [PATCH 004/140] [update] --- .../components/dict/JMultiSelectTagOnlyRz.vue | 200 ++++++++++++++++++ jero-web/src/components/dict/index.js | 2 + .../parameterlist/components/addModel.vue | 2 +- 3 files changed, 203 insertions(+), 1 deletion(-) create mode 100644 jero-web/src/components/dict/JMultiSelectTagOnlyRz.vue diff --git a/jero-web/src/components/dict/JMultiSelectTagOnlyRz.vue b/jero-web/src/components/dict/JMultiSelectTagOnlyRz.vue new file mode 100644 index 000000000..b09a3a9cb --- /dev/null +++ b/jero-web/src/components/dict/JMultiSelectTagOnlyRz.vue @@ -0,0 +1,200 @@ + + + + + diff --git a/jero-web/src/components/dict/index.js b/jero-web/src/components/dict/index.js index 23400a72d..57a67e628 100644 --- a/jero-web/src/components/dict/index.js +++ b/jero-web/src/components/dict/index.js @@ -1,5 +1,6 @@ import JDictSelectTag from './JDictSelectTag.vue' import JMultiSelectTag from './JMultiSelectTag.vue' +import JMultiSelectTagOnlyRz from './JMultiSelectTagOnlyRz.vue' import JSearchSelectTag from './JSearchSelectTag.vue' import { filterMultiDictText,filterDictText,initDictOptions,filterDictTextByCache } from './JDictSelectUtil' @@ -7,6 +8,7 @@ export default { install: function (Vue) { Vue.component('JDictSelectTag',JDictSelectTag); Vue.component('JMultiSelectTag',JMultiSelectTag); + Vue.component('JMultiSelectTagOnlyRz',JMultiSelectTagOnlyRz); Vue.component('JSearchSelectTag',JSearchSelectTag); Vue.prototype.$initDictOptions = (dictCode) => initDictOptions(dictCode) Vue.prototype.$filterMultiDictText = (dictOptions, text) => filterMultiDictText(dictOptions, text) diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index fcd11c997..cb5866fe1 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -142,7 +142,7 @@ :title="$t('ParameterName')">{{$t('certificationCategory')}} - Date: Mon, 20 Jun 2022 17:19:14 +0800 Subject: [PATCH 005/140] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=88=86=E9=85=8D=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E4=BA=BA=E5=92=8C=E4=B8=8B=E5=8F=91=E6=94=B6=E9=9B=86=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=B8=85=E5=8D=95id=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsCollectManifestEOServiceImpl.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index af78bfab8..522bf3835 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1025,12 +1025,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl updateEOList = new ArrayList<>(); @@ -1052,8 +1054,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImplthe link,"; + String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId; + String href = "the link,"; String content = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter the link to handle it."; String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " please enter " + href + " to handle it."; // 发送系统消息 @@ -1080,11 +1082,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl updateEOList = new ArrayList<>(); @@ -1117,8 +1121,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImplthe link,"; + String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId; + String href = "the link,"; String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter " + href + " and fill in the relevant information."; // 发送系统消息 From 3a7ca46cd9bf3fc2f4bf245d1896a17831a27fd8 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 20 Jun 2022 17:30:55 +0800 Subject: [PATCH 006/140] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=A1=AB=E5=86=99=E4=BA=BA=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOController.java | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index 38331b390..9b28764d5 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -1,16 +1,24 @@ package com.jero.modules.cert.collect.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.PermissionData; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService; import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO; import com.jero.modules.cert.template.entity.ParamsInfoPublishEO; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -21,6 +29,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** @@ -37,6 +46,9 @@ public class ParamsCollectManifestEOController extends JeroController> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap()); + //TODO 外部模拟登陆临时账号，列表不显示 + queryWrapper.ne("username", "_reserve_user_external"); + Page page = new Page(pageNo, pageSize); + IPage pageList = sysUserService.page(page, queryWrapper); + + //批量查询用户的所属部门 + //step.1 先拿到全部的 useids + //step.2 通过 useids，一次性查询用户的所属部门名字 + List userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList()); + if (userIds != null && userIds.size() > 0) { + Map useDepNames = sysUserService.getDepNamesByUserIds(userIds); + pageList.getRecords().forEach(item -> { + item.setOrgCodeTxt(useDepNames.get(item.getId())); + }); + } + result.setSuccess(true); + result.setResult(pageList); + log.info(pageList.toString()); + return result; + } + /** * 分配工程接口人 * From a6730d4c6315810ac6171a931c450beae06d0f5c Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Mon, 20 Jun 2022 17:53:08 +0800 Subject: [PATCH 007/140] [update] --- jero-web/src/components/AssignedBy/index.vue | 4 +- .../components/ImportFileOnlyList/index.vue | 241 ++++++++++++++++++ .../views/parameter/parameterlist/index.vue | 6 +- .../ParameterItemCollectionList.vue | 2 +- 4 files changed, 247 insertions(+), 6 deletions(-) create mode 100644 jero-web/src/components/ImportFileOnlyList/index.vue diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue index 35aa37a8e..74f7c0078 100644 --- a/jero-web/src/components/AssignedBy/index.vue +++ b/jero-web/src/components/AssignedBy/index.vue @@ -144,7 +144,7 @@ export default { if(this.form.realname !== undefined) { params.realname = `*${this.form.realname}*` } - getAction(`sys/user/page`, params).then(res => { + getAction(`params/collectManifest/drePage`, params).then(res => { if (res.success) { this.areaTable = [...res.result.records] this.total = res.result.total @@ -177,7 +177,7 @@ export default { } else if (this.selectedRowKeys.length > 1) { this.$message.warning(this.$t('OnlyOneSelected')) } else { - let param = {ids: this.selectedRowKeysArray, projectId: this.$route.query.id, dre:this.selectedRowKeysDate[0].username } + let param = {ids: this.selectedRowKeysArray, paramsManifestId:this.$route.query.id ,projectId: this.$route.query.projectId, dre:this.selectedRowKeysDate[0].username } axios({ url: '/jero-boot/params/collectManifest/updateDreBatch', method: 'post', diff --git a/jero-web/src/components/ImportFileOnlyList/index.vue b/jero-web/src/components/ImportFileOnlyList/index.vue new file mode 100644 index 000000000..7caf6dabd --- /dev/null +++ b/jero-web/src/components/ImportFileOnlyList/index.vue @@ -0,0 +1,241 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index da4ee8837..6910e6038 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -53,7 +53,7 @@ {{$t('templateDownload')}}
- +
@@ -106,13 +106,13 @@ import { getAction, postAction, downloadFile, deleteAction, downFilePost } from import addModel from './components/addModel' import axios from 'axios' import { ACCESS_TOKEN } from '@/store/mutation-types' -import ImportFile from '@/components/ImportFile/index' +import ImportFileOnlyList from '@/components/ImportFileOnlyList/index' import Vue from 'vue' export default { name: 'index', components: { addModel, - ImportFile + ImportFileOnlyList }, data() { return { diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 8d1e2b411..ca90fe50c 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -878,7 +878,7 @@ export default { _array.push(item.id) }) let _this = this - let param = {projectId: this.$route.query.id, ids: _array.join(',')} + let param = {paramsManifestId: this.$route.query.id,projectId:this.$route.query.projectId, ids: _array.join(',')} axios({ url: '/jero-boot/params/collectManifest/issueCollection', method: 'post', From 326e357428ea3b9dc5c36b3deb80d4a62bd346c0 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Mon, 20 Jun 2022 18:04:08 +0800 Subject: [PATCH 008/140] [update] 54095 --- jero-web/src/views/parameter/ParameterTemplate/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index d598407d0..526b3e8b5 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -201,6 +201,9 @@ export default { this.areaVisible=false }, handleSubmit() { + if( this.formInline.paramsTemplateName !== undefined) { + this.formInline.paramsTemplateName = this.formInline.paramsTemplateName.trim() + } this.$refs.ruleForm.validate(valid => { if (valid) { getAction(this.url.copy + `?id=${this.selectedRowKeys[0]}¶msTemplateName=${this.formInline.paramsTemplateName}`, {}).then((res) => { From 41d1e362615e785da1e1bf1006855adb6b046a57 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 20 Jun 2022 18:13:13 +0800 Subject: [PATCH 009/140] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E8=B7=B3=E8=BD=AC=E8=87=B3=E9=A1=B9=E7=9B=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=EF=BC=8C=E5=B8=A6=E5=8F=82=E6=95=B0=20projec?= =?UTF-8?q?tName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/job/InventoryAffirmJob.java | 13 ++++++++-- .../jero/modules/project/job/PrehomoJob.java | 14 +++++++++-- .../project/job/VerifyComplianceJob.java | 14 +++++++++-- .../project/job/designComplianceJob.java | 14 +++++++++-- .../ProjectLawsInventoryEOServiceImpl.java | 24 +++++++++++++------ ...ojectTaskInventoryDetailEOServiceImpl.java | 7 +++++- .../ProjectTaskInventoryEOServiceImpl.java | 13 ++++++++-- 7 files changed, 81 insertions(+), 18 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index 973a8c568..9c9a0ca27 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -130,10 +130,14 @@ public class InventoryAffirmJob implements Job { + " are 3 days. Please check and handle it in time."; //飞书跳转链接 - String hrefFeishu = backUrl + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType(); + String hrefFeishu = backUrl + + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + + projectLibraryBase.getId() + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); @@ -153,10 +157,15 @@ public class InventoryAffirmJob implements Job { + " will expire today. Please check and address it in a timely manner."; //飞书跳转链接 - String hrefFeishu = backUrl + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType(); + String hrefFeishu = backUrl + + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + + projectLibraryBase.getId() + + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java index f5489d989..d2796f84c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java @@ -136,10 +136,15 @@ public class PrehomoJob implements Job { + " are 3 days. Please check and handle it in time."; //飞书跳转链接 - String hrefFeishu = backUrl + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType(); + String hrefFeishu = backUrl + + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + + projectLibraryBase.getId() + + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); @@ -160,10 +165,15 @@ public class PrehomoJob implements Job { + " will expire today. Please check and address it in time."; //飞书跳转链接 - String hrefFeishu = backUrl + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType(); + String hrefFeishu = backUrl + + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + + projectLibraryBase.getId() + + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java index 32a1ea3b8..a01ad12f1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java @@ -135,10 +135,15 @@ public class VerifyComplianceJob implements Job { + " are 3 days. Please check and handle it in time."; //飞书跳转链接 - String hrefFeishu = backUrl + JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType(); + String hrefFeishu = backUrl + + JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + + projectLibraryBase.getId() + + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); @@ -159,10 +164,15 @@ public class VerifyComplianceJob implements Job { + " will expire today. Please check and address it in time."; //飞书跳转链接 - String hrefFeishu = backUrl + JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType(); + String hrefFeishu = backUrl + + JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + + projectLibraryBase.getId() + + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java index d50c58f77..78b5e8d8a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java @@ -133,10 +133,15 @@ public class designComplianceJob implements Job { + " are 3 days. Please check and address it in a timely manner."; //飞书跳转链接 - String hrefFeishu = backUrl + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType(); + String hrefFeishu = backUrl + + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + + projectLibraryBase.getId() + + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); @@ -156,10 +161,15 @@ public class designComplianceJob implements Job { + " will expire today. Please check and address it in time."; //飞书跳转链接 - String hrefFeishu = backUrl + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType(); + String hrefFeishu = backUrl + + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + + projectLibraryBase.getId() + + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 3065a6c35..cbc31ba28 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1102,11 +1102,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; + + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName() + + "'>" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); sendMessageMap.put("hrefFeishu",hrefFeishu); @@ -1624,7 +1628,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; @@ -5775,11 +5781,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; + + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName() + + "'>" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); sendMessageMap.put("hrefFeishu",hrefFeishu); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java index 739462ef9..e7ad07806 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java @@ -276,10 +276,15 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index 9c0a9d0c5..541f5ad94 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -328,10 +328,14 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); @@ -611,10 +615,15 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); From 13722e6e95e6b30d46771ef3e5f4b63441c31df7 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Tue, 21 Jun 2022 09:28:16 +0800 Subject: [PATCH 010/140] [update] bug --- .../components/ParameterItemCollectionList.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index ca90fe50c..d832e8c07 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -769,7 +769,7 @@ export default { LoginUserType(val) { this.RoleType = [] if(this.currentPersonRole == '') { - this.currentPersonRole = val.length > 1 ? val[0].value : '' + this.currentPersonRole = val.length >= 1 ? val[0].value : '' } this.RoleType = val this.formInlineRoleSwitching.roleSwitchingCode = this.currentPersonRole @@ -951,6 +951,9 @@ export default { if(item.type == 'pull_more'){ item.dataValue = item.dataValue.join(',') } + if(item.type == 'text'){ + item.dataValue = item.dataValue.toString() + } }) } } From 0df286908a1f629fc555555dc1e325c4da85934c Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 21 Jun 2022 09:57:05 +0800 Subject: [PATCH 011/140] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E6=92=A4=E5=9B=9Ebug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 522bf3835..99a3a6ca3 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -973,12 +973,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Tue, 21 Jun 2022 11:22:06 +0800 Subject: [PATCH 012/140] [update] 54104 --- jero-web/src/views/parameter/ParameterTemplate/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index 526b3e8b5..ca51c7fb2 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -58,11 +58,11 @@ > - {{ text && text.length > 30 ? text.slice(0, 29) + '...' : text }} + {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} - {{ text && text.length > 50 ? text.slice(0, 49) + '...' : text }} + {{ text && text.length > 30 ? text.slice(0, 29) + '...' : text }} {{$t('edit')}} From b69872363bd4d367057fa94e3c6631feef7273c1 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Tue, 21 Jun 2022 11:59:30 +0800 Subject: [PATCH 013/140] [update] 54645 --- jero-web/src/components/AssignedBy/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue index 74f7c0078..2fcef6a5a 100644 --- a/jero-web/src/components/AssignedBy/index.vue +++ b/jero-web/src/components/AssignedBy/index.vue @@ -9,7 +9,7 @@ :label-col='labelCol' :wrapper-col='wrapperCol' > - + Date: Tue, 21 Jun 2022 12:04:50 +0800 Subject: [PATCH 014/140] [update] --- .../src/views/projectManagement/dialog/historicalVersion.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/dialog/historicalVersion.vue b/jero-web/src/views/projectManagement/dialog/historicalVersion.vue index bfe0e35f1..97ffea549 100644 --- a/jero-web/src/views/projectManagement/dialog/historicalVersion.vue +++ b/jero-web/src/views/projectManagement/dialog/historicalVersion.vue @@ -12,7 +12,7 @@ :scroll='{x: 600}'> {{ text }} - {{ $t('See') }} + {{ $t('See') }}
From 9745d1c8cfd4ddece291e791b91ada77075972e3 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Tue, 21 Jun 2022 13:55:36 +0800 Subject: [PATCH 015/140] [update] 54675 --- .../components/ParameterItemCollectionList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index d832e8c07..dfb0eec2d 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -971,8 +971,8 @@ export default { onOk() { postAction(_this.url.add, configDataList).then((res) => { if (res.success) { + _this.$message.success(res.result) _this.GetgetTableList() - _this.$message.success(this.$t('OperationSuccessful')) } else { _this.$message.warning(this.$t('operationFailed')) } From 1a9060fb89d69050a7353b8ae04323e546a30107 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Tue, 21 Jun 2022 14:01:19 +0800 Subject: [PATCH 016/140] [update] --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 7b534e09c..9e848365e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -714,7 +714,7 @@ module.exports = { // 认证 ParameteItemCollectionList: 'Parameter item collection list', Areyousureparameteritems: 'Are you sure to submit the selected parameter items?', - Theselectedconfiguration: 'The selected item has incomplete data collection, unable to add configuration', + Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed', theCurrent: 'The current status of this data is', thisbuttonCompleted: 'This button can only be operated when the status is completed', Frozenstatus: 'Frozen status, can only be viewed', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index c99f0daca..22d4e84d4 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -725,7 +725,7 @@ module.exports = { // 认证 ParameteItemCollectionList: '参数项收集清单', Areyousureparameteritems: '确认提交所选参数项嘛?', - Theselectedconfiguration: '所选项目有未完成收集数据，不能添加配置', + Theselectedconfiguration: '参数清单中参数项均为 待发起收集或变更时，才能添加配置', theCurrent: '此数据当前状态为', thisbuttonCompleted: '当状态为"已完成"时，才可操作此按钮', Frozenstatus: '冻结状态,仅可以查看', From b5d2a1de1b7742c97e3584c56e5f75e0095cd9de Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Tue, 21 Jun 2022 14:12:54 +0800 Subject: [PATCH 017/140] [update] --- .../src/views/parameter/parameterlist/components/addModel.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index cb5866fe1..cbedfcfcd 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -176,6 +176,7 @@
+ * {{$t('controlVerification')}}
@@ -381,6 +382,9 @@ export default { controlType: [ { required: true, message: this.$t('pleaseSelect')+this.$t('controlType'), trigger: 'change' }, ], + controlVerify: [ + { required: true, message: this.$t('PleaseEnter')+this.$t('controlVerification'), trigger: 'change' }, + ], controlValues: [ { required: true, message: this.$t('PleaseEnter')+this.$t('controlAlternatives'), trigger: 'change' }, { min:1, max: 500, message: this.$t('cantExeed')+'500'+this.$t('characters'), trigger: 'blur' }, From 5b038f223b2cbeabfc4a6fb58f8a2ae7b04c6a75 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Tue, 21 Jun 2022 14:23:06 +0800 Subject: [PATCH 018/140] [update] 54181 --- .../src/views/parameter/parameterlist/components/addModel.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index cbedfcfcd..92b1aa041 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -695,7 +695,9 @@ export default { display: flex; /*align-items: center;*/ } - +/deep/.ant-form-item-control { + line-height: 10px; +} .title-text { width: 114px; text-align: right; From 090c44728d0aa1c4b3aeef32d2577cd1f2b20da3 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Tue, 21 Jun 2022 14:36:42 +0800 Subject: [PATCH 019/140] [update] --- .../components/ParameterItemCollectionList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index dfb0eec2d..74f9a722b 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1063,7 +1063,7 @@ export default { .then( (res) =>{ if (res.data.success) { _this.$message.success(res.data.result) - _this.getTableList() + _this.GetgetTableList() _this.selectedRowKeysValue=[] }else{ _this.$message.warning(_this.$t('operationFailed')) From 75775486efe0a1931e997377404298ff2d5a6564 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Tue, 21 Jun 2022 14:42:38 +0800 Subject: [PATCH 020/140] [update] --- .../projectManagement/dialog/ProjectCollectionParameters.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue index 8c50486ca..bb4dd3af3 100644 --- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue +++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue @@ -115,8 +115,7 @@ export default { title: this.$t('parameterTemplate'), align: 'center', dataIndex: 'paramsTemplateName', - ellipsis: true, - scopedSlots: { customRender: 'click' } + ellipsis: true } ], newVisible: false, From 7d5016260fdf468c350be929daf71f2300fc5d00 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Tue, 21 Jun 2022 14:54:58 +0800 Subject: [PATCH 021/140] [update] --- .../components/TaskParameterCollection.vue | 6 +++++- .../dialog/ProjectCollectionParameters.vue | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 27c691886..f28187e55 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -87,7 +87,7 @@ - @@ -252,6 +252,10 @@ drawerhandleCancel(val) { this.drawerVisible = val }, + copysubmit() { + this.drawerVisible = false + this.getlist() + }, searchQuery() { this.pageNo = 1 this.getlist() diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue index bb4dd3af3..a94838008 100644 --- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue +++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue @@ -267,6 +267,7 @@ export default { if (valid) { this.flag = true this.spinLoading = true + this.confirmLoading = true let _tt = { paramsTemplateId: this.selectedRowKeysDate[0].paramsTemplateId, projectId: this.selectedRowKeysDate[0].projectId, @@ -292,9 +293,16 @@ export default { }) .then( (res) =>{ if (res.data.success) { - _this.$message.success(res.data.result) + _this.$emit('copysubmit') + _this.$message.success(res.data.message) + _this.flag = false + _this.spinLoading = false + _this.confirmLoading = false }else{ - _this.$message.warning(res.data.result) + _this.$message.warning(res.data.message) + _this.flag = false + _this.spinLoading = false + _this.confirmLoading = false } }) .catch( (error) =>{ From e44611c6203bd5b3d58b1b43bca3f49c3293e564 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Tue, 21 Jun 2022 15:15:31 +0800 Subject: [PATCH 022/140] [update] --- .../components/ParameterItemCollectionList.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 74f9a722b..e0b1a1a08 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -187,8 +187,7 @@
- {{$t('preservation')}} + {{$t('preservation')}} {{$t('cancel')}}
From 872765db4425a529ee0fd1cbd1be285b23c8092b Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 21 Jun 2022 15:56:17 +0800 Subject: [PATCH 023/140] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=90=8C=E6=AD=A5=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 48 +++++++++----- ...msCollectManifestHistoryEOServiceImpl.java | 52 +++++++++++++++- .../impl/ParamsManifestEOServiceImpl.java | 34 +++++----- .../ParamsExportTemplateEOController.java | 4 +- .../controller/ParamsReportEOController.java | 6 +- .../report/entity/ParamsExportTemplateEO.java | 4 ++ .../report/entity/ParamsReportConfigEO.java | 7 +++ .../mapper/xml/ParamsReportConfigEOMapper.xml | 1 + .../mapper/xml/ParamsReportDetailEOMapper.xml | 2 +- .../service/IParamsReportEOService.java | 4 +- .../ParamsExportTemplateEOServiceImpl.java | 29 ++++++++- .../impl/ParamsReportDetailEOServiceImpl.java | 62 ++++++++++++++++++- .../impl/ParamsReportEOServiceImpl.java | 11 ++-- .../controller/ParamsInfoEOController.java | 10 ++- 14 files changed, 224 insertions(+), 50 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 99a3a6ca3..5c51151e9 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1179,7 +1179,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsCollectManifestIdList = Arrays.asList(paramsCollectManifestIds.split(",")); ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId); - // 根据收集库清单id 的是否上报过 - boolean isSync = paramsReportEOService.isSync(paramsManifestId); + // 根据收集库清单id和版本，判断当前版本是否上报过 + boolean isSync = paramsReportEOService.isSync(paramsManifestId, paramsManifestEO.getVersion()); String reportId = null; - if (!isSync) { + if (!isSync) { // 未上报过 reportId = UUID.randomUUID().toString().replace("-",""); - } else { - ParamsReportEO paramsReportEO = paramsReportEOService.queryByOldParamsManifestId(paramsManifestId); + } else { // 上报过 + ParamsReportEO paramsReportEO = paramsReportEOService.queryByOldParamsManifestId(paramsManifestId, paramsManifestEO.getVersion()); reportId = paramsReportEO.getId(); } @@ -1285,15 +1285,24 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); List addReportConfigEOList = new ArrayList<>(); List addReportCertCategoryParamsInfoEOList = new ArrayList<>(); + Map configIdMap = new HashMap<>(); // 存放新旧 configId 关系 if (!isSync) { // 未上报 // 复制配置 for (ParamsConfigEO configEO : paramsConfigEOList) { ParamsReportConfigEO addReportConfigEO = new ParamsReportConfigEO(); - BeanUtils.copyProperties(configEO, addReportConfigEO); // 全盘复制,包括id + BeanUtils.copyProperties(configEO, addReportConfigEO); addReportConfigEO.setParamsManifestId(reportId); + String addReportConfigId = UUID.randomUUID().toString().replace("-",""); + addReportConfigEO.setId(addReportConfigId); + addReportConfigEO.setOldParamsConfigId(configEO.getId()); addReportConfigEOList.add(addReportConfigEO); + + configIdMap.put(configEO.getId(), addReportConfigId); } + } else { + List paramsReportConfigEOList = paramsReportConfigEOService.queryList(reportId); + configIdMap = paramsReportConfigEOList.stream().collect(Collectors.toMap(ParamsReportConfigEO::getOldParamsConfigId, ParamsReportConfigEO::getId)); } // 添加参数项到上报库 @@ -1316,6 +1325,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl certCategoryParamsInfoPublishEOS = certCategoryParamsInfoPublishEOService.queryListByVersionAndNio(paramsManifestEO.getParamsTemplateId(), paramsManifestEO.getParamsTemplatePublishVersion(), nioNumberList); for (CertCategoryParamsInfoPublishEO ccpi : certCategoryParamsInfoPublishEOS) { ReportCertCategoryParamsInfoEO addCcpi = new ReportCertCategoryParamsInfoEO(); - BeanUtils.copyProperties(ccpi, addCcpi); // 全盘复制,包括id + BeanUtils.copyProperties(ccpi, addCcpi); + addCcpi.setId(UUID.randomUUID().toString().replace("-","")); addReportCertCategoryParamsInfoEOList.add(addCcpi); } @@ -1337,18 +1349,22 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl updateEOList = new ArrayList<>(); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java index dbeda896e..e5d6841d8 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java @@ -18,6 +18,8 @@ import com.jero.modules.cert.collect.service.IParamsConfigHistoryEOService; import com.jero.modules.cert.collect.vo.ParamsConfigDataVO; import com.jero.modules.cert.template.enums.ControlTypeEnum; import com.jero.modules.ocr.util.LineHumpUtil; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.ISysDictItemService; import org.apache.commons.lang3.StringUtils; @@ -52,6 +54,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl configIdList = new ArrayList<>(); // 配置列名 + Map manifestMap = objectToMap(collectManifestEO); // 对象转map String controlType = collectManifestEO.getControlType(); String paramsCollectManifestId = collectManifestEO.getId(); @@ -126,10 +133,12 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl configMap = new HashMap<>(); String paramsConfigId = paramsConfigEO.getId(); ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataHistoryEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 - List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 + List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 configMap.put("controlType", controlType); configMap.put("list", paramsConfigDataVOList); manifestMap.put(paramsConfigEO.getId(), configMap); + + configIdList.add(paramsConfigEO.getId()); }); } @@ -141,6 +150,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl getConfigDataVOList(String controlType, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestHistoryEO paramsCollectManifestEO) { + private List getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestHistoryEO paramsCollectManifestEO) { List paramsConfigDataVOList = new ArrayList<>(); + String templateId = null; + String templateName = null; + if (StringUtils.isNotEmpty(paramsCollectManifestEO.getFileTemplateConnectId())) { + List ossFiles = ossFileService.getFileInfosByConnectId(paramsCollectManifestEO.getFileTemplateConnectId()); + if (CollectionUtil.isNotEmpty(ossFiles)) { + templateId = ossFiles.get(0).getId(); + templateName = ossFiles.get(0).getFileName(); + } + } if (ControlTypeEnum.TEXT.getValue().equals(controlType)) { ParamsConfigDataVO configDataVO = new ParamsConfigDataVO(); configDataVO.setType(ConfigDataTypeEnum.TEXT.getValue()); configDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + configDataVO.setIsLock(paramsConfigEO.getIsLock()); configDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify()); if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { configDataVO.setDataValue(paramsConfigDataEO.getTextData()); @@ -173,6 +195,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.like(StringUtils.isNotEmpty(paramsExportTemplateEO.getTemplateName()), ParamsExportTemplateEO::getTemplateName, paramsExportTemplateEO.getTemplateName()); + queryWrapper.like(StringUtils.isNotEmpty(paramsExportTemplateEO.getTemplateName()), ParamsExportTemplateEO::getTemplateName, paramsExportTemplateEO.getTemplateName()) + .orderByDesc(ParamsExportTemplateEO::getCreateTime); Page page = new Page(pageNo, pageSize); IPage pageList = paramsExportTemplateEOService.page(page, queryWrapper); List rows = pageList.getRecords(); + // 处理 状态 中英文 Map stateMap = ExportTemplateStateEnum.toMap(cut); rows.forEach(exportTemplateEO -> { exportTemplateEO.setState(stateMap.get(exportTemplateEO.getState())); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java index be73a96d3..11e698743 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java @@ -104,7 +104,7 @@ public class ParamsReportEOController extends JeroController edit(@Validated @RequestBody ParamsReportEO paramsReportEO) { paramsReportEOService.editById(paramsReportEO); return Result.OK("编辑成功!"); @@ -118,7 +118,7 @@ public class ParamsReportEOController extends JeroController delete(@RequestParam(name="id",required=true) String id) { paramsReportEOService.deleteById(id); return Result.OK("删除成功!"); @@ -132,7 +132,7 @@ public class ParamsReportEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.paramsReportEOService.deleteByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java index 084f3be64..0bdd40ab1 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java @@ -1,6 +1,7 @@ package com.jero.modules.cert.report.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -78,4 +79,7 @@ public class ParamsExportTemplateEO implements Serializable { @ApiModelProperty(value = "附件上传") private String fileConnectId; + @TableField(exist = false) + private String cut; + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java index 14a5fed4c..cc93e55fa 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java @@ -3,9 +3,11 @@ package com.jero.modules.cert.report.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.jero.modules.cert.collect.entity.ParamsConfigEO; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; @@ -24,4 +26,9 @@ import java.io.Serializable; public class ParamsReportConfigEO extends ParamsConfigEO implements Serializable { private static final long serialVersionUID = 1L; + /**收集库参数配置id*/ + @Excel(name = "收集库参数配置id", width = 15) + @ApiModelProperty(value = "收集库参数配置id") + private String oldParamsConfigId; + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml index a58059d08..8dc02628a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml @@ -16,5 +16,6 @@ + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml index c386f672d..ac6fd652e 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml @@ -59,6 +59,6 @@ select * from params_report_detail - order by create_time asc + order by sync_time asc \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java index 7d8471009..ff7746e6f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java @@ -63,8 +63,8 @@ public interface IParamsReportEOService extends IService { IPage pageInfo(IPage page, ParamsReportEO paramsReportEO); - boolean isSync(String oldParamsManifestId); + boolean isSync(String oldParamsManifestId, Integer version); - ParamsReportEO queryByOldParamsManifestId(String oldParamsManifestId); + ParamsReportEO queryByOldParamsManifestId(String oldParamsManifestId, Integer version); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java index 51815b94e..b53290e5c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java @@ -3,6 +3,8 @@ package com.jero.modules.cert.report.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.exception.JeroBootException; import com.jero.modules.cert.report.entity.ParamsExportTemplateEO; import com.jero.modules.cert.report.mapper.ParamsExportTemplateEOMapper; import com.jero.modules.cert.report.service.IParamsExportTemplateEOService; @@ -36,6 +38,16 @@ public class ParamsExportTemplateEOServiceImpl extends ServiceImpl 0) { - return false; - } else { return true; + } else { + return false; } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index b9b2d1e7e..53676b424 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -21,6 +21,8 @@ import com.jero.modules.cert.report.service.IParamsReportConfigEOService; import com.jero.modules.cert.report.service.IParamsReportDetailEOService; import com.jero.modules.cert.template.enums.ControlTypeEnum; import com.jero.modules.ocr.util.LineHumpUtil; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.ISysDictItemService; import org.apache.commons.lang3.StringUtils; @@ -55,6 +57,9 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl configIdList = new ArrayList<>(); // 配置列名 + Map manifestMap = objectToMap(collectManifestEO); // 对象转map String controlType = collectManifestEO.getControlType(); String paramsCollectManifestId = collectManifestEO.getId(); @@ -129,13 +136,26 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl configMap = new HashMap<>(); String paramsConfigId = paramsConfigEO.getId(); ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 - List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 + List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 configMap.put("controlType", controlType); configMap.put("list", paramsConfigDataVOList); manifestMap.put(paramsConfigEO.getId(), configMap); + + configIdList.add(paramsConfigEO.getId()); }); } + // 处理工程接口人 +// Map sdtMap = new HashMap<>(); +// sdtMap.put("id", collectManifestEO.getId()); +// sdtMap.put("state", collectManifestEO.getState()); +// sdtMap.put("dutyTerritory", StringUtils.join(dutyTerritory, ",")); +// sdtMap.put("dataValue", collectManifestEO.getSdt()); +// manifestMap.put("sdt", sdtMap); + + // 配置列名数组 + manifestMap.put("configIds", configIdList); + listMap.add(manifestMap); }); @@ -149,14 +169,24 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl getConfigDataVOList(String controlType, ParamsConfigDataEO paramsConfigDataEO, ParamsReportDetailEO paramsCollectManifestEO) { + private List getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataEO paramsConfigDataEO, ParamsReportDetailEO paramsCollectManifestEO) { List paramsConfigDataVOList = new ArrayList<>(); + String templateId = null; + String templateName = null; + if (StringUtils.isNotEmpty(paramsCollectManifestEO.getFileTemplateConnectId())) { + List ossFiles = ossFileService.getFileInfosByConnectId(paramsCollectManifestEO.getFileTemplateConnectId()); + if (CollectionUtil.isNotEmpty(ossFiles)) { + templateId = ossFiles.get(0).getId(); + templateName = ossFiles.get(0).getFileName(); + } + } if (ControlTypeEnum.TEXT.getValue().equals(controlType)) { ParamsConfigDataVO configDataVO = new ParamsConfigDataVO(); configDataVO.setType(ConfigDataTypeEnum.TEXT.getValue()); configDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + configDataVO.setIsLock(paramsConfigEO.getIsLock()); configDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify()); if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { configDataVO.setDataValue(paramsConfigDataEO.getTextData()); @@ -168,6 +198,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl controlValueMap = new HashMap<>(); - controlValueMap.put("lable", controlValueStr[i]); + controlValueMap.put("label", controlValueStr[i]); controlValueMap.put("value", controlValueStr[i]); controlValueMapList.add(controlValueMap); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java index 8c9398eea..b53905e06 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.cert.report.entity.ParamsReportEO; import com.jero.modules.cert.report.mapper.ParamsReportEOMapper; import com.jero.modules.cert.report.service.IParamsReportEOService; +import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -100,9 +101,10 @@ public class ParamsReportEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, oldParamsManifestId); + queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, oldParamsManifestId) + .eq(ParamsReportEO::getVersion, version); int num = count(queryWrapper); if (num > 0) { return true; // 上报过 @@ -113,9 +115,10 @@ public class ParamsReportEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, oldParamsManifestId); + queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, oldParamsManifestId) + .eq(ParamsReportEO::getVersion, version); return getOne(queryWrapper); } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java index 6f0941db9..fbe30a3ec 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.cert.template.entity.ParamsInfoEO; import com.jero.modules.cert.template.service.IParamsInfoEOService; @@ -231,9 +232,14 @@ public class ParamsInfoEOController extends JeroController publish(@RequestParam(name="paramsTemplateId") String paramsTemplateId) { + public Result publish(@RequestParam(name="paramsTemplateId") String paramsTemplateId, + @RequestParam(name="cut") String cut) { int publishVersion = paramsInfoPublishEOService.publishTemplate(paramsTemplateId); - return Result.OK("发布版本：" + publishVersion + "成功!"); + if (CutEnum.CN.equals(cut)) { + return Result.OK("发布版本：" + publishVersion + "成功！"); + } else { + return Result.OK("Publish version:" + publishVersion + "success!"); + } } /** From 36b44c57a967c55db297f8e31d7e97e4f3b7d6f2 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Tue, 21 Jun 2022 16:08:30 +0800 Subject: [PATCH 024/140] [update] --- jero-web/src/common/lang/en-us.js | 7 +++ jero-web/src/common/lang/zh-cn.js | 7 +++ .../parameterlist/components/addModel.vue | 49 ++++++++++--------- 3 files changed, 40 insertions(+), 23 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 9e848365e..f8ac2da66 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -74,6 +74,7 @@ module.exports = { user: 'User', numericalValue: 'Numerical Value', not: 'No.', + notOnlyRz: 'no', EnterValue: 'Please Enter a Value', SavedQuery: 'Saved Search', NoQueriesSaved: 'No Queries Were Saved', @@ -712,6 +713,12 @@ module.exports = { uploadTime: 'Upload Time', enclosure: 'Enclosure', // 认证 + // 认证状态 + Dropdownradio: 'Drop down radio', + Dropdownmultipleselection: 'Drop down multiple selection', + a: '+', + positiveInteger: 'positive integer', + ParameteItemCollectionList: 'Parameter item collection list', Areyousureparameteritems: 'Are you sure to submit the selected parameter items?', Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 22d4e84d4..b95f2e589 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -76,6 +76,7 @@ module.exports = { numericalValue: '数值', yes: '是', not: '否', + notOnlyRz: '否', EnterValue: '请输入值', SavedQuery: '保存的查询', NoQueriesSaved: '没有保存任何查询', @@ -723,6 +724,12 @@ module.exports = { uploadTime: '上传时间', enclosure: '附件', // 认证 + // 认证状态 + Dropdownradio: '下拉单选', + Dropdownmultipleselection: '下拉多选', + a: '+', + positiveInteger: '正整数', + ParameteItemCollectionList: '参数项收集清单', Areyousureparameteritems: '确认提交所选参数项嘛?', Theselectedconfiguration: '参数清单中参数项均为 待发起收集或变更时，才能添加配置', diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 92b1aa041..75567f562 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -37,7 +37,7 @@ {{$t('yes')}} - {{$t('not')}} + {{$t('notOnlyRz')}} @@ -320,27 +320,27 @@ export default { data() { return { controlType: [ // 控件类型 - {value:'1', label: '文本' }, - {value:'2', label: '下拉单选' }, - {value:'3', label: '下拉多选' }, - {value:'4', label: '附件' }, - {value:'5', label: '文本+下拉单选' }, - {value:'6', label: '文本+下拉多选' }, - {value:'7', label: '文本+附件' }, - {value:'8', label: '下拉单选+附件' }, - {value:'9', label: '下拉多选+附件' }, - {value:'10', label: '文本+下拉单选+附件' }, + {value:'1', label: this.$t('text') }, + {value:'2', label: this.$t('Dropdownradio') }, + {value:'3', label: this.$t('Dropdownmultipleselection') }, + {value:'4', label: this.$t('enclosure') }, + {value:'5', label: this.$t('text')+ this.$t('a')+this.$t('Dropdownradio') }, + {value:'6', label: this.$t('text')+ this.$t('a')+this.$t('Dropdownmultipleselection') }, + {value:'7', label: this.$t('text')+ this.$t('a')+this.$t('enclosure') }, + {value:'8', label: this.$t('Dropdownradio')+ this.$t('a')+this.$t('enclosure') }, + {value:'9', label: this.$t('Dropdownmultipleselection')+ this.$t('a')+this.$t('enclosure') }, + {value:'10', label: this.$t('text')+ this.$t('a')+this.$t('Dropdownradio')+ this.$t('a')+this.$t('enclosure') }, ], controlVerification: [ // 控件校验 - {value:'1', label: '无' }, - {value:'2', label: '中文' }, - {value:'3', label: '正整数' }, - {value:'4', label: '正浮点数' }, - {value:'5', label: '整数或小数' }, - {value:'6', label: '一位小数' }, - {value:'7', label: '两位小数' }, - {value:'8', label: '三位小数' }, - {value:'9', label: '四位小数' }, + {value:'1', label: this.$t('nothing') }, + {value:'2', label: this.$t('chinese') }, + {value:'3', label: this.$t('positiveInteger') }, + {value:'4', label: this.$t('Positivefloatingpointnumber') }, + {value:'5', label: this.$t('integerOrDecimal')}, + {value:'6', label: this.$t('OneDecimalPlace') }, + {value:'7', label: this.$t('TwoDecimalplaces') }, + {value:'8', label: this.$t('Threedecimalplaces') }, + {value:'9', label: this.$t('FourDecimalplaces') }, ], CategoryTreeList: [], // 技术领域 certCategoryParamsInfoEOList: [], // 认证类别得tab栏 @@ -405,6 +405,7 @@ export default { inputChangelabel: false, // 控件备选值校验 buttonChangelabel: false, // 模板校验 contentListStart: [], // 认证类别编辑 + flag: 1, // 判断师新增，编辑 默认新增 } }, mounted() { @@ -453,7 +454,7 @@ export default { }, Onchangelabel(val) { let _tt = [] - if(this.title == '新增') { + if(this.flag == 1) { this.contentListStart.forEach((itemVal) => { val.forEach((item) => { if(itemVal.value === item.value) { @@ -511,7 +512,8 @@ export default { }, addModel() { this.visible = true - this.title = '新增' + this.flag = 1 + this.title = this.$t('newlyAdded') this.formInline = {} // 获取认证类别 this.getcontentListedEdit() @@ -533,7 +535,8 @@ export default { value.technologyTerritory = value.technologyTerritory.split(',') } this.formInline = value - this.title = '编辑' + this.title = this.$t('edit') + this.flag = 0 // 获取认证类别 this.getcontentListedEdit() value.certCategoryParamsInfoEOList.map((item, index) => { From e433e4ea1ee613410ffe5edb0e643aa2e47fcd1d Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Tue, 21 Jun 2022 16:17:03 +0800 Subject: [PATCH 025/140] [update] --- .../views/parameter/parameterlist/index.vue | 29 ++++--------------- 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 6910e6038..112b11ee5 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -206,32 +206,13 @@ export default { }, // 发布版本 releaseVersion() { - let _this = this - axios({ - url: `/jero-boot/params/paramsInfo/publish?paramsTemplateId=${this.$route.query.id}`, - method: 'get', - transformRequest: [function (data) { - let ret = '' - for (let it in data) { - ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' - } - return ret - }], - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - 'X-Access-Token':_this.token + getAction('params/paramsInfo/publish', { paramsTemplateId: this.$route.query.id }).then((res) => { + if (res.success) { + this.$message.success(res.result) + } else { + this.$message.success(res.result) } }) - .then( (res) =>{ - if (res.data.success) { - _this.$message.success(res.data.result) - }else{ - _this.$message.warning(res.data.result) - } - }) - .catch( (error) =>{ - console.log(error); - }); }, //下载模板 handleModule() { From 7305f365abfb3046171072b3fb6d5c2cfa2265cf Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 21 Jun 2022 16:57:52 +0800 Subject: [PATCH 026/140] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 +- jero-web/src/common/lang/zh-cn.js | 1 + jero-web/src/components/layouts/Tabcrumbs.vue | 10 +- jero-web/src/components/search/index.vue | 119 +++++++++- .../views/regulatoryEarlyWarning/index.vue | 218 ++++++++++++++++++ 5 files changed, 345 insertions(+), 6 deletions(-) create mode 100644 jero-web/src/views/regulatoryEarlyWarning/index.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index f8ac2da66..03e856504 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -946,5 +946,6 @@ module.exports = { question: 'Question', ConfirmQuestion: 'Confirm Question', disableInput: 'Disable input', - OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out' + OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out', + warningTime:'Warning time', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index b95f2e589..c1eec6bc4 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -952,4 +952,5 @@ module.exports = { ConfirmQuestion: '确认催办？', OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办', disableInput:'禁止输入', + warningTime:'预警时间', } \ No newline at end of file diff --git a/jero-web/src/components/layouts/Tabcrumbs.vue b/jero-web/src/components/layouts/Tabcrumbs.vue index 4ff89fb50..42616fa75 100644 --- a/jero-web/src/components/layouts/Tabcrumbs.vue +++ b/jero-web/src/components/layouts/Tabcrumbs.vue @@ -26,7 +26,10 @@ }, watch: { '$route': function(val) { - if (val.meta.title == '首页' || val.meta.title === ' home page') { + if (val.meta.title == '首页' || + val.meta.title === ' Home Page' || + this.$route.meta.title === '法规预警' || + this.$route.meta.title === 'Regulatory Early Warning') { this.Navigation = val.meta.title this.subNavigation = null } else { @@ -36,7 +39,10 @@ }, mounted() { console.log(this.$route.meta) - if (this.$route.meta.title === '首页' || this.$route.meta.title === ' home page') { + if (this.$route.meta.title === '首页' || + this.$route.meta.title === ' Home Page' || + this.$route.meta.title === '法规预警' || + this.$route.meta.title === 'Regulatory Early Warning') { this.Navigation = this.$route.meta.title this.subNavigation = null } else { diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index f8f97fe0e..629ef022d 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -165,6 +165,14 @@ flag: { type: String, default: '' + }, + searchQueryList: { + type: Array, + default: [] + }, + isDefault: { + type: Boolean, + default: false } }, data() { @@ -183,6 +191,12 @@ }, searchReset() { this.queryParam = {} + if (this.isDefault) { + let startTime = moment(new Date()).format('YYYY-MM-DD') + let endTime = this.getNewDate('after', 6) + this.queryParam['warningTime'] = [startTime, endTime] + this.queryParam = { ...this.queryParam } + } eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam))) }, getSeach() { @@ -192,12 +206,79 @@ getAction(this.url.seachList, params).then((res) => { if (res.success) { this.searchList = res.result + if (this.searchQueryList && this.searchQueryList.length > 0) { + this.searchList = this.searchList.concat(this.searchQueryList) + let startTime = moment(new Date()).format('YYYY-MM-DD') + let endTime = this.getNewDate('after', 6) + this.queryParam['warningTime'] = [startTime, endTime] + this.queryParam = { ...this.queryParam } + } } }) }, - // handleToggleSearch() { - // this.toggleSearchStatus = !this.toggleSearchStatus - // }, + getNewDate(flag, many) { + + const thirtyDays = [4, 6, 9, 11] // 30天的月份 + + const thirtyOneDays = [1, 3, 5, 7, 8, 10, 12] // 31天的月份 + + const currDate = new Date() // 今天日期 + + const year = currDate.getFullYear() + + let month = currDate.getMonth() + 1 + + let targetDateMilli = 0 + + let GMTDate = '' // 中国标准时间 + + let targetYear = '' // 年 + + let targetMonth = '' // 月 + + let targetDate = '' // 日 + + let dealTargetDays = '' // 目标日期 + + const isLeapYear = !!((year % 4 == 0 && year % 100 != 0) || year % 400 == 0) // 是否是闰年 + + let countDays = 0 // 累计天数 + + for (let i = 0; i < many; i++) { + + if (flag === 'before') { + + month = month - 1 <= 0 ? 12 : month - 1 + + } else { + + month = month + 1 > 12 ? 1 : month + 1 + + } + + thirtyDays.includes(month) ? (countDays += 30) : thirtyOneDays.includes(month) ? (countDays += 31) : isLeapYear ? (countDays += 29) : (countDays += 28) + } + + targetDateMilli = currDate.setDate( + currDate.getDate() - (flag === 'before' ? countDays : countDays * -1) + ) + + GMTDate = new Date(targetDateMilli) + + targetYear = GMTDate.getFullYear() + + targetMonth = GMTDate.getMonth() + 1 + + targetDate = GMTDate.getDate() + + targetMonth = targetMonth.toString().padStart(2, '0') + + targetDate = targetDate.toString().padStart(2, '0') + + dealTargetDays = `${targetYear}-${targetMonth}-${targetDate}` + + return dealTargetDays + }, dateChange(item) { this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD') }, @@ -216,7 +297,39 @@ } } + \ No newline at end of file From d9b15d0afd978a2a6241039bcee92a67626dc8a6 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Tue, 21 Jun 2022 18:00:18 +0800 Subject: [PATCH 027/140] [update] 54725 --- jero-web/src/common/lang/en-us.js | 9 ++++- jero-web/src/common/lang/zh-cn.js | 7 ++++ .../ParameterItemCollectionList.vue | 34 +++++++++---------- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index f8ac2da66..d156de901 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -714,6 +714,12 @@ module.exports = { enclosure: 'Enclosure', // 认证 // 认证状态 + timeoperation: 'You have permission to operate this button.', + NiOnumberis: 'NiO number is', + NoOperationPermissionForthisbutton: 'No operation permission for this button', + Attentionfreeze: 'Note: after freezing, the frozen configuration content cannot be edited.', + Filledperson: 'The project contact person has not been filled in. Please fill in the project contact person before issuing and collecting.', + Datastatusis: 'Datastatusis', Dropdownradio: 'Drop down radio', Dropdownmultipleselection: 'Drop down multiple selection', a: '+', @@ -946,5 +952,6 @@ module.exports = { question: 'Question', ConfirmQuestion: 'Confirm Question', disableInput: 'Disable input', - OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out' + OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out', + or: 'or', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index b95f2e589..32a434bcd 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -725,6 +725,12 @@ module.exports = { enclosure: '附件', // 认证 // 认证状态 + timeoperation: '时，才有权限操作此按钮。', + NiOnumberis: 'NIO编号为', + NoOperationPermissionForthisbutton:'没有此按钮的操作权限', + Attentionfreeze: '注：冻结后该冻结配置内容不可进行编辑。', + Filledperson: '工程接口人没有填写,请填写完工程接口人再进行下发收集。', + Datastatusis: '数据状态为', Dropdownradio: '下拉单选', Dropdownmultipleselection: '下拉多选', a: '+', @@ -952,4 +958,5 @@ module.exports = { ConfirmQuestion: '确认催办？', OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办', disableInput:'禁止输入', + or: '或', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index e0b1a1a08..68389ff90 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -182,7 +182,7 @@
- 注：冻结后该冻结配置内容不可进行编辑。 + {{$t('Attentionfreeze')}}
@@ -262,62 +262,62 @@ - NIO编号为 + {{$t('NiOnumberis')}} {{ item.nioNumber }}、 - 工程接口人没有填写,请填写完工程接口人再进行下发收集。 + {{$t('Filledperson')}}
-
NIO编号为{{ item.nioNumber }},状态为{{ item.state }},没有此按钮的操作权限。
+
{{$t('NiOnumberis')}}{{ item.nioNumber }},{{$t('Statusis')}}{{ item.state }},{{$t('NoOperationPermissionForthisbutton')}}。
- {{ currentPersonRole =='homo'? '认证工程师': (currentPersonRole =='sdt'? '工程接口人': '填写人') }}数据状态为 + {{ currentPersonRole =='homo'? '认证工程师': (currentPersonRole =='sdt'? '工程接口人': '填写人') }}{{$t('Datastatusis')}} - '待发起收集'、'工程接口人退回'或'变更' + '{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}' - '已提交'或'变更' + '{{$t('Submitted')}}'{{$t('or')}}'{{$t('alteration')}}' - '待发起收集' + '{{$t('CollectionInitiated')}}' - '待工程接口人处理'或'填写人退回' + '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}' - '待填写'或'认证工程师退回' + '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}' - '已提交' + {{$t('Submitted')}} - '待工程接口人处理'或'填写人退回' + '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}' - '待填写'或'认证工程师退回' + '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}' - '待工程接口人处理'或'填写人退回' + '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}' - '待填写' + {{$t('completed')}} - '已提交' + {{$t('Submitted')}} - 时，才有权限操作此按钮。 + {{$t('timeoperation')}}
From b86fa3a064fbd5dcb513ad49e947eed96422b7dd Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Tue, 21 Jun 2022 18:03:15 +0800 Subject: [PATCH 028/140] [update] --- jero-web/src/common/lang/en-us.js | 1 - 1 file changed, 1 deletion(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index cfdad6b29..73006f15f 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -954,6 +954,5 @@ module.exports = { disableInput: 'Disable input', OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out', or: 'or', - OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out', warningTime:'Warning time', } \ No newline at end of file From b02708c37c52303819e57f62e3f73e567668d10b Mon Sep 17 00:00:00 2001 From: zer0Black Date: Tue, 21 Jun 2022 22:22:12 +0800 Subject: [PATCH 029/140] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 jero-boot/db/蔚来标准sql/dev_third_record.sql diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql new file mode 100644 index 000000000..a2b42ef96 --- /dev/null +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -0,0 +1 @@ +-- 三阶段的新增功能，必须添加的固定数据以sql形式放到此处 \ No newline at end of file From 824215fcce3d23baa53c61bb8e484dee71ef02ca Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 22 Jun 2022 09:36:28 +0800 Subject: [PATCH 030/140] =?UTF-8?q?=E8=AE=A4=E8=AF=81-bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsManifestEOController.java | 12 ++++- .../enums/CollectManifestStateEnum.java | 18 ++++---- .../cert/collect/enums/ManifestStateEnum.java | 36 +++++++++++++-- .../ParamsCollectManifestEOServiceImpl.java | 19 ++++++-- ...msCollectManifestHistoryEOServiceImpl.java | 2 +- .../controller/ParamsInfoEOController.java | 6 +-- .../cert/template/entity/ParamsInfoEO.java | 3 ++ .../service/impl/ParamsInfoEOServiceImpl.java | 45 ++++++++++++++----- 8 files changed, 110 insertions(+), 31 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index f471eda07..22e9effbb 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -8,9 +8,12 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.cert.collect.entity.ParamsManifestEO; +import com.jero.modules.cert.collect.enums.ManifestStateEnum; import com.jero.modules.cert.collect.service.IParamsManifestEOService; import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO; import com.jero.modules.cert.collect.vo.ParamsManifestVO; +import com.jero.modules.cert.report.entity.ParamsExportTemplateEO; +import com.jero.modules.cert.report.enums.ExportTemplateStateEnum; import com.jero.modules.cert.template.entity.ParamsTemplateEO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,9 +28,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; +import java.util.Map; - /** +/** * @Description: 参数清单 * @Author: jero-boot * @Date: 2022-05-05 @@ -66,6 +70,12 @@ public class ParamsManifestEOController extends JeroController rows = pageList.getRecords(); + // 处理 状态 中英文 + Map stateMap = ManifestStateEnum.toMap(cut); + rows.forEach(manifestEO -> { + manifestEO.setState(stateMap.get(manifestEO.getState())); + }); return Result.OK(cut, pageList); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java index 6ec9fee80..ce0611de7 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java @@ -11,15 +11,15 @@ import java.util.Map; * @Date: Created in 15:17 2022/5/7 */ public enum CollectManifestStateEnum { - WAIT_COLLECT("待发起收集","wait collect","1"), - WAIT_SDT("待工程接口人处理","wait sdt","2"), - SDT_BACK("工程接口人退回","sdt back","3"), - WAIT_FILL("待填写","wait fill","4"), - DRE_BACK("填写人退回","dre back","5"), - SUBMIT("已提交","submit","6"), - CERT_BACK("认证工程师退回","cert back","7"), - SYNC_REPORT("已同步至上报库","sync report","8"), - CHANGE("变更","change","9"); + WAIT_COLLECT("待发起收集","Wait Collect","1"), + WAIT_SDT("待工程接口人处理","Wait Sdt","2"), + SDT_BACK("工程接口人退回","Sdt Back","3"), + WAIT_FILL("待填写","Wait Fill","4"), + DRE_BACK("填写人退回","Dre Back","5"), + SUBMIT("已提交","Submit","6"), + CERT_BACK("认证工程师退回","Cert Back","7"), + SYNC_REPORT("已同步至上报库","Sync Report","8"), + CHANGE("变更","Change","9"); String name; String enName; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java index 2e3528573..e62add4e9 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java @@ -1,19 +1,27 @@ package com.jero.modules.cert.collect.enums; +import com.jero.common.constant.enums.CutEnum; +import com.jero.modules.cert.report.enums.ExportTemplateStateEnum; + +import java.util.HashMap; +import java.util.Map; + /** * @Author: liyawei * @Description: 参数清单-状态 * @Date: Created in 16:19 2022/5/5 */ public enum ManifestStateEnum { - COLLECTING("收集中","收集中"), - FINISHED("已完成","已完成"); + COLLECTING("收集中","Collecting","收集中"), + FINISHED("已完成","Finished","已完成"); String name; + String enName; String value; - ManifestStateEnum(String name, String value) { + ManifestStateEnum(String name, String enName, String value) { this.name = name; + this.enName = enName; this.value = value; } @@ -25,6 +33,14 @@ public enum ManifestStateEnum { this.name = name; } + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + public String getValue() { return value; } @@ -32,4 +48,18 @@ public enum ManifestStateEnum { public void setValue(String value) { this.value = value; } + + public static Map toMap(String cut){ + Map map = new HashMap<>(); + if (CutEnum.CN.getValue().equals(cut)) { + for (ManifestStateEnum manifestStateEnum : ManifestStateEnum.values()) { + map.put(manifestStateEnum.getValue(), manifestStateEnum.getName()); + } + } else if (CutEnum.EN.getValue().equals(cut)) { + for (ManifestStateEnum manifestStateEnum : ManifestStateEnum.values()) { + map.put(manifestStateEnum.getValue(), manifestStateEnum.getEnName()); + } + } + return map; + } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 5c51151e9..0b93b1f6d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -953,7 +953,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl controlValueMap = new HashMap<>(); - controlValueMap.put("lable", controlValueStr[i]); + controlValueMap.put("label", controlValueStr[i]); controlValueMap.put("value", controlValueStr[i]); controlValueMapList.add(controlValueMap); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java index fbe30a3ec..b1fe83c38 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java @@ -235,10 +235,10 @@ public class ParamsInfoEOController extends JeroController publish(@RequestParam(name="paramsTemplateId") String paramsTemplateId, @RequestParam(name="cut") String cut) { int publishVersion = paramsInfoPublishEOService.publishTemplate(paramsTemplateId); - if (CutEnum.CN.equals(cut)) { - return Result.OK("发布版本：" + publishVersion + "成功！"); + if (CutEnum.CN.getValue().equals(cut)) { + return Result.OK("发布版本：" + publishVersion + " 成功！"); } else { - return Result.OK("Publish version:" + publishVersion + "success!"); + return Result.OK("Publish version:" + publishVersion + " success!"); } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java index 46bb57d69..cdca194aa 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java @@ -135,4 +135,7 @@ public class ParamsInfoEO implements Serializable { @TableField(exist = false) private List certCategoryParamsInfoEOList; // 认证类别参数列表 + @TableField(exist = false) + private String cut; + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 56f0677fe..3c7d2b04e 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -101,14 +101,22 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber()); List paramsInfoEOList = list(queryWrapper); if (CollectionUtil.isNotEmpty(paramsInfoEOList)) { - throw new JeroBootException("NIO编号已存在！"); + if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { + throw new JeroBootException("NIO编号已存在！"); + } else { + throw new JeroBootException("NIO number already exists!"); + } } // 批量添加认证类别参数 @@ -119,7 +127,11 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl new TreeSet<>(Comparator.comparing(o -> o.getCertCategory() + ";" + o.getParamsNumber()))), ArrayList::new)); if (ccParamsInfoList.size() < certCategoryParamsInfoEOList.size()) { - throw new JeroBootException("不同类别间参数编号必须唯一！"); + if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { + throw new JeroBootException("不同类别间参数编号必须唯一！"); + } else { + throw new JeroBootException("Parameter number must be unique among the different categories!"); + } } certCategoryParamsInfoEOList.forEach(certCategoryParamsInfoEO -> { certCategoryParamsInfoEO.setParamsTemplateId(paramsTemplateId); @@ -166,7 +178,11 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEOList = list(queryWrapper); if (CollectionUtil.isNotEmpty(paramsInfoEOList)) { - throw new JeroBootException("NIO编号已存在！"); + if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { + throw new JeroBootException("NIO编号已存在！"); + } else { + throw new JeroBootException("NIO number already exists!"); + } } } @@ -191,7 +211,11 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl new TreeSet<>(Comparator.comparing(o -> o.getCertCategory() + ";" + o.getParamsNumber()))), ArrayList::new)); if (ccParamsInfoList.size() < certCategoryParamsInfoEOList.size()) { - throw new JeroBootException("不同类别间参数编号必须唯一！"); + if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { + throw new JeroBootException("不同类别间参数编号必须唯一！"); + } else { + throw new JeroBootException("Parameter number must be unique among the different categories!"); + } } certCategoryParamsInfoEOList.forEach(certCategoryParamsInfoEO -> { @@ -710,7 +734,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl nowFileList = FileUnZip.readFileByFilename(filepath, fileName); + List nowFileList = FileUnZip.readFileByFilename(filepath, fileName,null,null,null,null,null); +// List nowFileList = FileUnZip.readFileByFilename(filepath, fileName); if (nowFileList.size() == 0) { if(CutEnum.CN.getValue().equals(cut)) { errorMsg += "附件模板压缩包中没有" + fileName + "文件; "; @@ -1248,7 +1273,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl Date: Wed, 22 Jun 2022 09:56:36 +0800 Subject: [PATCH 031/140] =?UTF-8?q?=E8=AE=A4=E8=AF=81-bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql | 6 +++++- .../cert/template/controller/ParamsInfoEOController.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql b/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql index 3f2798162..21d3cc26d 100644 --- a/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql +++ b/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql @@ -49,4 +49,8 @@ ALTER TABLE `laws_weilai`.`params_report_detail` ---2022-06-15 ALTER TABLE `laws_weilai`.`sys_user_role` - MODIFY COLUMN `role_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色id' AFTER `user_id`; \ No newline at end of file + MODIFY COLUMN `role_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色id' AFTER `user_id`; + +---2022-06-21 +ALTER TABLE `laws_weilai`.`params_report_config` + ADD COLUMN `old_params_config_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收集库参数配置id' AFTER `display_seq`; \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java index b1fe83c38..9dad10dce 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java @@ -80,7 +80,7 @@ public class ParamsInfoEOController extends JeroController page = new Page(pageNo, pageSize); IPage pageList = paramsInfoEOService.page(page, queryWrapper); From 65d58bca914542cbb56d5d0cb6087860e440240d Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 22 Jun 2022 10:25:09 +0800 Subject: [PATCH 032/140] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 7 + jero-web/src/common/lang/zh-cn.js | 7 + jero-web/src/components/layouts/Tabcrumbs.vue | 8 +- .../components/RegulationMonthlyFill.vue | 208 ++++++++++++ .../RegulationMonthlyManagement.vue | 312 ++++++++++++++++++ .../components/modules/managementAdd.vue | 257 +++++++++++++++ .../regulationReport/index.vue | 42 +++ 7 files changed, 835 insertions(+), 6 deletions(-) create mode 100644 jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue create mode 100644 jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue create mode 100644 jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue create mode 100644 jero-web/src/views/businessSupport/regulationReport/index.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index faee708cd..1c4f25207 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -955,4 +955,11 @@ module.exports = { OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out', or: 'or', warningTime:'Warning time', + RegulationMonthlyManagement:'Regulation Monthly Management', + RegulationMonthlyFill:'Regulation Monthly Fill', + RegulationMonthlyName:'Regulation monthly name', + monthlyLanguage:'Monthly language', + releaseStatus:'Release status', + uploadedBy:'Uploaded by', + uploadMonthly:'Upload monthly', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 73fdc0447..96d70a9fc 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -960,4 +960,11 @@ module.exports = { disableInput:'禁止输入', or: '或', warningTime:'预警时间', + RegulationMonthlyManagement:'法规月报管理', + RegulationMonthlyFill:'法规月报填写', + RegulationMonthlyName:'法规月报名称', + monthlyLanguage:'月报语种', + releaseStatus:'发布状态', + uploadedBy:'上传人', + uploadMonthly:'上传月报', } \ No newline at end of file diff --git a/jero-web/src/components/layouts/Tabcrumbs.vue b/jero-web/src/components/layouts/Tabcrumbs.vue index 42616fa75..43e8276ac 100644 --- a/jero-web/src/components/layouts/Tabcrumbs.vue +++ b/jero-web/src/components/layouts/Tabcrumbs.vue @@ -27,9 +27,7 @@ watch: { '$route': function(val) { if (val.meta.title == '首页' || - val.meta.title === ' Home Page' || - this.$route.meta.title === '法规预警' || - this.$route.meta.title === 'Regulatory Early Warning') { + val.meta.title === ' Home Page') { this.Navigation = val.meta.title this.subNavigation = null } else { @@ -40,9 +38,7 @@ mounted() { console.log(this.$route.meta) if (this.$route.meta.title === '首页' || - this.$route.meta.title === ' Home Page' || - this.$route.meta.title === '法规预警' || - this.$route.meta.title === 'Regulatory Early Warning') { + this.$route.meta.title === ' Home Page') { this.Navigation = this.$route.meta.title this.subNavigation = null } else { diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue new file mode 100644 index 000000000..74f026074 --- /dev/null +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -0,0 +1,208 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue new file mode 100644 index 000000000..9d15af59c --- /dev/null +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue @@ -0,0 +1,312 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue new file mode 100644 index 000000000..8f8d68927 --- /dev/null +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue @@ -0,0 +1,257 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/index.vue b/jero-web/src/views/businessSupport/regulationReport/index.vue new file mode 100644 index 000000000..8c13af823 --- /dev/null +++ b/jero-web/src/views/businessSupport/regulationReport/index.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file From b73c723cfe09d7db4a3f10c59b6b2ba8f705e826 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 22 Jun 2022 11:03:48 +0800 Subject: [PATCH 033/140] =?UTF-8?q?[update]=20=E4=B8=8A=E6=8A=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../escalationlibrary/components/addModel.vue | 308 +++++++++++ .../parameter/escalationlibrary/index.vue | 468 +++++++++++++++++ .../parameterexport/components/addModel.vue | 308 +++++++++++ .../views/parameter/parameterexport/index.vue | 491 ++++++++++++++++++ .../views/parameter/parameterlist/index.vue | 13 +- 5 files changed, 1587 insertions(+), 1 deletion(-) create mode 100644 jero-web/src/views/parameter/escalationlibrary/components/addModel.vue create mode 100644 jero-web/src/views/parameter/escalationlibrary/index.vue create mode 100644 jero-web/src/views/parameter/parameterexport/components/addModel.vue create mode 100644 jero-web/src/views/parameter/parameterexport/index.vue diff --git a/jero-web/src/views/parameter/escalationlibrary/components/addModel.vue b/jero-web/src/views/parameter/escalationlibrary/components/addModel.vue new file mode 100644 index 000000000..940a9f193 --- /dev/null +++ b/jero-web/src/views/parameter/escalationlibrary/components/addModel.vue @@ -0,0 +1,308 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue new file mode 100644 index 000000000..e1cb9c182 --- /dev/null +++ b/jero-web/src/views/parameter/escalationlibrary/index.vue @@ -0,0 +1,468 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue new file mode 100644 index 000000000..940a9f193 --- /dev/null +++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue @@ -0,0 +1,308 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue new file mode 100644 index 000000000..fb91ec868 --- /dev/null +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -0,0 +1,491 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 112b11ee5..97febff5b 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -76,6 +76,7 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" @customHeaderRow='customHeaderRow' + @change='handleTableChange' > {{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }} @@ -142,13 +143,18 @@ export default { pageSize: 10, pageNo: 1, title: '新增', + /* 排序参数 */ + isorter:{ + column: 'nioNumber', + order: 'desc', + }, columns: [ { title: this.$t('NiONumber'), align: 'center', width: '10%', dataIndex: 'nioNumber', - sorter: (a, b) => a.nioNumber - b.nioNumber, + sorter: true }, { title: this.$t('ParameterName'), @@ -190,6 +196,11 @@ export default { customHeaderRow(val,kk) { console.log(val,kk) }, + handleTableChange(pagination, filters, sorter) { + this.queryParam.orderByField = 'nioNumber' + this.queryParam.orderBy = (sorter.order === 'descend' ? 'asc': 'desc') + this.getList() + }, onClick(val,kk) { console.log(val,kk) }, From 65c93bb63b1be49561331ed1f79ab889104c7cf7 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 22 Jun 2022 11:24:19 +0800 Subject: [PATCH 034/140] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93-=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=88=B0=E5=A4=84=E6=A8=A1=E6=9D=BF-=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/oss/service/impl/OSSFileServiceImpl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index 4d12498a0..6786e76ff 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -111,6 +111,16 @@ public class OSSFileServiceImpl extends ServiceImpl impl throw new JeroBootException("Only upload pdf,word,excel type of file Please select the file again！"); } } + } else if ("2".equals(state)) { + String fileTypeStrTwo = ".doc,.DOC,.docx,.DOCX,.xls, .XLS,.xlsx,.XLSX"; + //固定文件 + if (!fileTypeStrTwo.contains(fileType)) { + if (cut.equals(CutEnum.CN.getValue())) { + throw new JeroBootException("只能够上传word,excel类型的文件。请重新选择文件！"); + } else { + throw new JeroBootException("Only upload word,excel type of file Please select the file again！"); + } + } } else { if (CommonUtils.limitFileSuffix(orgName, fileSuffixLimits)) { if (cut.equals(CutEnum.CN.getValue())) { From 24a131ac4f3e9f42683936960f0c8ce5356a072c Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 22 Jun 2022 12:04:01 +0800 Subject: [PATCH 035/140] =?UTF-8?q?[update]=20=E4=B8=8A=E5=AE=9D=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 3 ++ .../parameterexport/components/addModel.vue | 49 +++++++++++++------ .../views/parameter/parameterexport/index.vue | 33 ++++--------- 4 files changed, 48 insertions(+), 39 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1c4f25207..3c6c1ee00 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -962,4 +962,6 @@ module.exports = { releaseStatus:'Release status', uploadedBy:'Uploaded by', uploadMonthly:'Upload monthly', +// 上报库 + Enable: '启用', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 96d70a9fc..0d434b1aa 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -967,4 +967,7 @@ module.exports = { releaseStatus:'发布状态', uploadedBy:'上传人', uploadMonthly:'上传月报', +// 上报库 + Enable: '启用', + } \ No newline at end of file diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue index 940a9f193..2ba12c0c5 100644 --- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue @@ -19,11 +19,11 @@ {{$t('parameterTemplate')}}
- + + v-model="formInline.templateName" + :placeholder="$t('PleaseEnter')+$t('templateName')"/>
@@ -31,14 +31,15 @@
* - {{$t('zoneOfApplication')}} + {{$t('status')}}
- - + + + {{$t('Enable')}} + + {{$t('disable')}} + +
@@ -60,6 +61,23 @@
+ + +
+
+ * + {{$t('parameterTemplate')}} +
+ + + +
+ + @@ -86,19 +104,16 @@ export default { confirmLoading: false, visible: false, rules: { - paramsTemplateName:[ + templateName:[ { required: true, message: this.$t('PleaseEnter')+this.$t('parameterTemplate'), trigger: 'change' }, { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('characters'), trigger: 'blur' }, ], description:[ - { min:1, max: 300, message: this.$t('cantExeed')+'300'+this.$t('characters'), trigger: 'blur' }, + { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' }, ], - state: [ + status: [ { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' }, ], - region: [ - { required: true, message: this.$t('PleaseSelect')+this.$t('zoneOfApplication'), trigger: 'change' }, - ] }, disabled: false, projectNameList: [], @@ -122,6 +137,8 @@ export default { this.visible = true this.title = '新增' this.formInline = {} + this.formInline.status = '0' + this.formInline = {...this.formInline} this.$nextTick(() => { this.$refs['ruleForm'].clearValidate() }) diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index fb91ec868..7feb1988f 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -4,22 +4,11 @@
-
- {{$t('zoneOfApplication')}} +
+ {{$t('templateName')}}
- -
- - -
-
- {{$t('parameterTemplate')}} -
- +
@@ -138,12 +127,11 @@ export default { dataSource: [], confirmLoading: false, url: { - list: 'params/template/page', - add: 'params/template/add', - edit: 'params/template/edit', - deleteBatch: 'params/template/delete', - deleteAll: 'params/template/deleteBatch', - copy: 'params/template/copyById' + list: 'report/exportTemplate/page', + add: 'report/exportTemplate/add', + edit: 'report/exportTemplate/edit', + deleteBatch: 'report/exportTemplate/delete', + deleteAll: 'report/exportTemplate/deleteBatch', }, total: 0, pageSize: 10, @@ -164,8 +152,7 @@ export default { { title: this.$t('templateName'), align: 'center', - dataIndex: 'paramsTemplateName', - scopedSlots: { customRender: 'projectName' } + dataIndex: 'templateName' }, { title: this.$t('contentDescription'), From fa9c39394b7ea074c11a56d051f89c7b19032cef Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 22 Jun 2022 14:12:16 +0800 Subject: [PATCH 036/140] =?UTF-8?q?=E6=8B=86=E5=88=86,=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=85=A5-=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E8=A7=A3=E5=8E=8B=E6=96=87=E4=BB=B6=E4=B8=8B=E6=9C=89=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E6=96=87=E4=BB=B6=E5=A4=B9=E6=97=B6=E8=AF=BB=E4=B8=8D?= =?UTF-8?q?=E5=88=B0orgMkdirs=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/enums/ExportTemplateStateEnum.java | 4 +- .../service/impl/ParamsInfoEOServiceImpl.java | 4 +- .../jero/modules/split/common/FileUnZip.java | 49 +++++++++++++++++++ .../impl/FileSplitItemsEOServiceImpl.java | 4 +- 4 files changed, 55 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java index 68821d2fb..cc6cf3221 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java @@ -11,8 +11,8 @@ import java.util.Map; * @Date: Created in 11:29 2022/5/18 */ public enum ExportTemplateStateEnum { - ENABLE("启用","0","enable"), - DISABLE("禁用","1","disable"); + ENABLE("启用","0","Enable"), + DISABLE("禁用","1","Disable"); String name; String value; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 3c7d2b04e..f8623f09c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -734,7 +734,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl excelfilelist = FileUnZip.readExcelFile(zipEntryName); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java index 9962c9ba9..6b49c5eca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java @@ -76,6 +76,55 @@ public class FileUnZip { return orgMkdirs; } + /** + * 解压zip文件 + * 解决解压文件下有多个文件夹时，读不到orgMkdirs问题 + * @param sourceFile,待解压的zip文件; descDir,解压后的存放路径 + * @throws Exception + * @author gaoyan + **/ + public static String unZipFiles2(String sourceFile, String descDir) throws IOException { + File zipFile = new File(sourceFile); + + File pathFile = new File(descDir); + if (!pathFile.exists()) { + pathFile.mkdirs(); + } + ZipFile zip = new ZipFile(zipFile,"gbk"); + String orgMkdirsLast = ""; + for (Enumeration entries = zip.getEntries(); entries.hasMoreElements(); ) { + ZipEntry entry = (ZipEntry) entries.nextElement(); + String zipEntryName = entry.getName(); + String outPath = (descDir + "/" + zipEntryName).replaceAll("\\*", "/"); + orgMkdirsLast = zipEntryName.substring(0, zipEntryName.indexOf('/')); + //判断路径是否存在,不存在则创建文件路径 + File file = new File(outPath.substring(0, outPath.lastIndexOf('/'))); + if (!file.exists()) { + file.mkdirs(); + } + //判断文件全路径是否为文件夹,如果是上面已经上传,不需要解压 + if (new File(outPath).isDirectory()) { + continue; + } + //输出文件路径信息 +// InputStream in = null; +// OutputStream out = null; + try(InputStream in =zip.getInputStream(entry); + OutputStream out =new FileOutputStream(outPath)){ + byte[] buf1 = new byte[1024]; + int len; + while ((len = in.read(buf1)) > 0) { + out.write(buf1, 0, len); + } + }catch(IOException e){ + logger.error(e.getMessage(),e); + } + } + zip.close(); + String orgMkdirs = descDir + "/" + orgMkdirsLast; + return orgMkdirs; + } + /** * 递归删除文件及文件夹 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 3a21d9da6..8fae259fd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -1484,7 +1484,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl excelfilelist = FileUnZip.readExcelFile(zipEntryName); From d58bb131d43ecef38e01f01bb49edc142ba1b38e Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 22 Jun 2022 14:26:59 +0800 Subject: [PATCH 037/140] =?UTF-8?q?[update]=20=E4=B8=8A=E6=8A=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 +- jero-web/src/common/lang/zh-cn.js | 2 +- .../parameterexport/components/addModel.vue | 6 +- .../views/parameter/parameterexport/index.vue | 56 ++++++------------- 4 files changed, 24 insertions(+), 43 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 3c6c1ee00..f3a61598e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -963,5 +963,6 @@ module.exports = { uploadedBy:'Uploaded by', uploadMonthly:'Upload monthly', // 上报库 - Enable: '启用', + Enable: 'Enable', + Latestupdatetime: 'Latest update time', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 0d434b1aa..f73c1ffe3 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -969,5 +969,5 @@ module.exports = { uploadMonthly:'上传月报', // 上报库 Enable: '启用', - + Latestupdatetime: '最新更新时间', } \ No newline at end of file diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue index 2ba12c0c5..5e56b2185 100644 --- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue @@ -33,8 +33,8 @@ * {{$t('status')}}
- - + + {{$t('Enable')}} {{$t('disable')}} @@ -137,7 +137,7 @@ export default { this.visible = true this.title = '新增' this.formInline = {} - this.formInline.status = '0' + this.formInline.state = '0' this.formInline = {...this.formInline} this.$nextTick(() => { this.$refs['ruleForm'].clearValidate() diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index 7feb1988f..bda62d382 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -24,10 +24,6 @@ {{$t('newlyAdded')}}
-
- - {{$t('copy')}} -
{{$t('BatchDelete')}} @@ -46,12 +42,7 @@ :columns="columns" > - - {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} - - - - {{ text && text.length > 30 ? text.slice(0, 29) + '...' : text }} + {{ text && text.length > 100 ? text.slice(0, 99) + '...' : text }} {{$t('edit')}} @@ -138,17 +129,17 @@ export default { pageNo: 1, title: '新增', columns: [ - { - title: this.$t('serialNumber'), - dataIndex: '', - key: 'rowIndex', - width: 50, - ellipsis: true, - align: 'center', - customRender: function(t, r, index) { - return parseInt(index) + 1 - } - }, + // { + // title: this.$t('serialNumber'), + // dataIndex: '', + // key: 'rowIndex', + // width: 50, + // ellipsis: true, + // align: 'center', + // customRender: function(t, r, index) { + // return parseInt(index) + 1 + // } + // }, { title: this.$t('templateName'), align: 'center', @@ -158,22 +149,22 @@ export default { title: this.$t('contentDescription'), align: 'center', dataIndex: 'description', - scopedSlots: { customRender: 'titleName' } + scopedSlots: { customRender: 'projectName' } }, { title: this.$t('status'), align: 'center', width: '5%', - dataIndex: 'createTime' + dataIndex: 'state' }, { - title: this.$t('createTime'), + title: this.$t('creater'), align: 'center', width: '10%', - dataIndex: 'createTime' + dataIndex: 'createBy' }, { - title: this.$t('updateTime'), + title: this.$t('Latestupdatetime'), align: 'center', width: '10%', dataIndex: 'updateTime' @@ -228,17 +219,6 @@ export default { handleAdd() { this.$refs.addModelRef.addModel() }, - // 复制 - handlecody(){ - if (this.selectedRowKeys.length > 1) { - this.$message.warning(this.$t('OnlyOneSelected')) - } else if(this.selectedRowKeys.length == 0){ - this.$message.warning(this.$t('pleaseSelectData')) - } else { - this.areaVisible=true - this.formInline = {} - } - }, hideModal(){ this.visible = false; }, @@ -253,7 +233,7 @@ export default { content: _this.$t('ConfirmBatchDeletion'), onOk() { axios({ - url: '/jero-boot/params/template/deleteBatch', + url: '/jero-boot/report/exportTemplate/deleteBatch', method: 'post', data: param, transformRequest: [function (data) { From a1499306b68ea20d2d190d6b8fbefcabd3f7f4ed Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 22 Jun 2022 14:45:02 +0800 Subject: [PATCH 038/140] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 11 + jero-web/src/common/lang/zh-cn.js | 33 ++- .../components/RegulationMonthlyFill.vue | 156 ++++++++++---- .../components/modules/fillTable.vue | 155 ++++++++++++++ .../components/modules/fillTableAdd.vue | 198 ++++++++++++++++++ 5 files changed, 505 insertions(+), 48 deletions(-) create mode 100644 jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue create mode 100644 jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index f3a61598e..092305e9a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -962,6 +962,17 @@ module.exports = { releaseStatus:'Release status', uploadedBy:'Uploaded by', uploadMonthly:'Upload monthly', + chapterContents:'Chapter contents', + chineseTitle:'Chinese title', + englishTitle:'English title', + regulatoryContact:'Regulatory contact', + exportStatus:'Export status', + monthlyTitleTemplate:'Monthly title template', + monthlyIntegrationAndExport:'Monthly integration and export', + addContent:'Add content', + monthSelection:'Month selection', + moveUp:'Move up', + moveDown:'Move down', // 上报库 Enable: 'Enable', Latestupdatetime: 'Latest update time', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index f73c1ffe3..989c47c63 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -727,7 +727,7 @@ module.exports = { // 认证状态 timeoperation: '时，才有权限操作此按钮。', NiOnumberis: 'NIO编号为', - NoOperationPermissionForthisbutton:'没有此按钮的操作权限', + NoOperationPermissionForthisbutton: '没有此按钮的操作权限', Attentionfreeze: '注：冻结后该冻结配置内容不可进行编辑。', Filledperson: '工程接口人没有填写,请填写完工程接口人再进行下发收集。', Datastatusis: '数据状态为', @@ -956,17 +956,28 @@ module.exports = { documentLibraryDetails: '文档库详情', question: '催办', ConfirmQuestion: '确认催办？', - OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办', - disableInput:'禁止输入', + OnlyOrTaskconfirmationOut: '只有清单确认状态或任务确认状态为待确认时才可以进行催办', + disableInput: '禁止输入', or: '或', - warningTime:'预警时间', - RegulationMonthlyManagement:'法规月报管理', - RegulationMonthlyFill:'法规月报填写', - RegulationMonthlyName:'法规月报名称', - monthlyLanguage:'月报语种', - releaseStatus:'发布状态', - uploadedBy:'上传人', - uploadMonthly:'上传月报', + warningTime: '预警时间', + RegulationMonthlyManagement: '法规月报管理', + RegulationMonthlyFill: '法规月报填写', + RegulationMonthlyName: '法规月报名称', + monthlyLanguage: '月报语种', + releaseStatus: '发布状态', + uploadedBy: '上传人', + uploadMonthly: '上传月报', + chapterContents: '章节目录', + chineseTitle: '中文标题', + englishTitle: '英文标题', + regulatoryContact:'法规联系人', + exportStatus:'导出状态', + monthlyTitleTemplate:'月报标题模板', + monthlyIntegrationAndExport:'月报整合导出', + addContent:'新增内容', + monthSelection:'月份选择', + moveUp:'上移', + moveDown:'下移', // 上报库 Enable: '启用', Latestupdatetime: '最新更新时间', diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 74f026074..b7a31ca20 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -5,11 +5,12 @@
-
- {{$t('RegulationMonthlyName')}} +
+ {{$t('monthSelection')}}
- +
@@ -22,9 +23,17 @@
-
- - {{$t('uploadMonthly')}} +
+ + {{$t('monthlyTitleTemplate')}} +
+
+ + {{$t('monthlyIntegrationAndExport')}} +
+
+ + {{$t('addContent')}}
@@ -43,6 +52,11 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > + + {{$t('view')}} + {{$t('edit')}} + {{$t('deleteLib')}} +
+ + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue new file mode 100644 index 000000000..628453061 --- /dev/null +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue @@ -0,0 +1,198 @@ + + + + + + \ No newline at end of file From 69b689d512ae09ccecb76974d8c8a46e219a42ba Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 22 Jun 2022 14:51:13 +0800 Subject: [PATCH 039/140] =?UTF-8?q?=E8=AE=A4=E8=AF=81-bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 0b93b1f6d..ff32910b2 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -953,9 +953,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Wed, 22 Jun 2022 15:08:28 +0800 Subject: [PATCH 040/140] [update] 54751 --- .../src/components/tableCollection/index.vue | 2 +- .../ParameterItemCollectionList.vue | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index a0f50274f..82260a907 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -26,7 +26,7 @@ - + {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}} diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 68389ff90..10b9b80a7 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -276,7 +276,7 @@
- {{ currentPersonRole =='homo'? '认证工程师': (currentPersonRole =='sdt'? '工程接口人': '填写人') }}{{$t('Datastatusis')}} + {{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'? $t('engineeringInterfacePerson'): $t('completedBy')) }}{{$t('Datastatusis')}} '{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}' @@ -519,7 +519,7 @@ export default { } else { this.selectedRowKeysValue.forEach((item, index) => { // 状态不符合，不能下发收集 - if(item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更') { + if(item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'Wait Collect' && item.state !== 'Sdt Back' && item.state !== 'Change') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -546,7 +546,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '已提交') { + if(item.state !== '已提交'&& item.state !== 'Submit') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'homoTH' flag = 0 @@ -564,7 +564,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '待工程接口人处理' && item.state !== '填写人退回') { + if(item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'Wait Sdt' && item.state !== 'Dre Back') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'sdtTH' flag = 0 @@ -582,7 +582,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '待填写' && item.state !== '认证工程师退回') { + if(item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'Wait Fill' && item.state !== 'Cert Back') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'dreTH' flag = 0 @@ -603,7 +603,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更') { + if(item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'Wait Collect' && item.state !== 'Sdt Back' && item.state !== 'Change') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -622,7 +622,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '已提交' && item.state !== '变更') { + if(item.state !== '已提交' && item.state !== '变更'&& item.state !== 'Submit' && item.state !== 'Change') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -641,7 +641,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '待发起收集') { + if(item.state !== '待发起收集'&& item.state !== 'Wait Collect') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -662,7 +662,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '待工程接口人处理' && item.state !== '填写人退回') { + if(item.state !== '待工程接口人处理' && item.state !== '填写人退回'&&item.state !== 'Wait Sdt' && item.state !== 'Dre Back') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'homoQZTH' flag = 0 @@ -681,7 +681,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '待填写') { + if(item.state !== '待填写'&&item.state !== 'Wait Fill') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'sdtQZTH' flag = 0 @@ -699,7 +699,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '已提交') { + if(item.state !== '已提交'&&item.state !== 'Submit') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'dreQZTH' flag = 0 @@ -720,7 +720,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '待工程接口人处理' && item.state !== '填写人退回') { + if(item.state !== '待工程接口人处理' && item.state !== '填写人退回'&&item.state !== 'Wait Sdt' && item.state !== 'Dre Back') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -739,7 +739,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '待填写' && item.state !== '认证工程师退回') { + if(item.state !== '待填写' && item.state !== '认证工程师退回'&&item.state !== 'Wait Fill' && item.state !== 'Cert Back') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -757,7 +757,7 @@ export default { this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if(item.state !== '待填写' && item.state !== '认证工程师退回') { + if(item.state !== '待填写' && item.state !== '认证工程师退回'&&item.state !== 'Wait Fill' && item.state !== 'Cert Back') { this.NotSelectedRowKeysValue.push(item) flag = 0 } From c72b322cfa2ba953ee9b676dba4f14a6fdcaa2a8 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 22 Jun 2022 15:19:33 +0800 Subject: [PATCH 041/140] =?UTF-8?q?[update]=20=E4=B8=8A=E6=8A=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parameterexport/components/addModel.vue | 189 ++++++++++-------- 1 file changed, 108 insertions(+), 81 deletions(-) diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue index 5e56b2185..68968feb9 100644 --- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue @@ -1,100 +1,105 @@ + + \ No newline at end of file From 002c235932a77f9d23067c899b3b3787bae12366 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 22 Jun 2022 15:27:57 +0800 Subject: [PATCH 043/140] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index eeba46cdd..cf284ac6f 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -143,7 +143,7 @@ spring: # password: 123456 # driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false - url: jdbc:mysql://121.36.69.172:3307/laws_weilai_stand?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://121.36.69.172:3307/laws_weilai?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: hzwlsoft.com driver-class-name: com.mysql.cj.jdbc.Driver From f0d0f31c97581a1180cfd904184074802556e837 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 22 Jun 2022 15:41:09 +0800 Subject: [PATCH 044/140] [update] --- .../views/parameter/parameterexport/components/addModel.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue index 68968feb9..367f428f8 100644 --- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue @@ -72,8 +72,8 @@ - {{ (formInline.fileTemplateConnectId === 'null' || formInline.fileTemplateConnectId === '' || - formInline.fileTemplateConnectId == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + {{ (formInline.fileConnectId === 'null' || formInline.fileConnectId === '' || + formInline.fileConnectId == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
@@ -138,7 +138,7 @@ export default { } this.$refs.uploadFile.visible = false /** 赋值给当前对应的表单文件 */ - this.formInline.fileTemplateConnectId = attIdList.join(',') + this.formInline.fileConnectId = attIdList.join(',') this.formInline = { ...this.formInline } }, clickButtonToUpload(item) { From 70fd1799890ecb165429441cb6abc67baed015ea Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 22 Jun 2022 15:57:52 +0800 Subject: [PATCH 045/140] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/modules/defaultTemplate.vue | 121 ++++++++++++++++++ .../components/modules/fillAdd.vue | 2 +- 2 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue new file mode 100644 index 000000000..690562df1 --- /dev/null +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -0,0 +1,121 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue index 4d1cca795..83c82ca50 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue @@ -3,7 +3,7 @@ Date: Wed, 22 Jun 2022 16:33:38 +0800 Subject: [PATCH 046/140] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E6=B5=81=E7=A8=8B=E5=BC=80=E5=8F=91=EF=BC=9A?= =?UTF-8?q?=20=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86-?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=E8=A1=A8=E3=80=82=20?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86=E8=A1=A8?= =?UTF-8?q?=E3=80=82=20=E6=B3=95=E8=A7=84-=E6=B5=81=E7=A8=8B=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E8=A1=A8=E3=80=82=20=E8=A1=A8SQL=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 62 ++++++- ...wsOpinionAssessmentResultEOController.java | 170 ++++++++++++++++++ .../LawsOpinionGatherEOController.java | 170 ++++++++++++++++++ .../LawsProcessHistoryEOController.java | 170 ++++++++++++++++++ .../entity/LawsOpinionAssessmentResultEO.java | 98 ++++++++++ .../entity/LawsOpinionGatherEO.java | 100 +++++++++++ .../entity/LawsProcessHistoryEO.java | 93 ++++++++++ .../enums/GatherResultEnum.java | 63 +++++++ .../LawsOpinionAssessmentResultEOMapper.java | 17 ++ .../mapper/LawsOpinionGatherEOMapper.java | 17 ++ .../mapper/LawsProcessHistoryEOMapper.java | 17 ++ .../LawsOpinionAssessmentResultEOMapper.xml | 19 ++ .../mapper/xml/LawsOpinionGatherEOMapper.xml | 19 ++ .../mapper/xml/LawsProcessHistoryEOMapper.xml | 18 ++ ...ILawsOpinionAssessmentResultEOService.java | 61 +++++++ .../service/ILawsOpinionGatherEOService.java | 61 +++++++ .../service/ILawsProcessHistoryEOService.java | 61 +++++++ ...sOpinionAssessmentResultEOServiceImpl.java | 89 +++++++++ .../impl/LawsOpinionGatherEOServiceImpl.java | 89 +++++++++ .../impl/LawsProcessHistoryEOServiceImpl.java | 89 +++++++++ 20 files changed, 1482 insertions(+), 1 deletion(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/GatherResultEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsOpinionAssessmentResultEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsOpinionGatherEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsProcessHistoryEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsOpinionAssessmentResultEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsOpinionGatherEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsProcessHistoryEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index a2b42ef96..cbbca7f82 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1 +1,61 @@ --- 三阶段的新增功能，必须添加的固定数据以sql形式放到此处 \ No newline at end of file +-- 三阶段的新增功能，必须添加的固定数据以sql形式放到此处 + + +-- 法规意见收集流程相关表SQL +-- 工作流数据库 增加固定数据 +INSERT INTO `t_form` (`OBJECT_ID`, `CODE`, `CREATE_TIME`, `WIDGET_JSON`, `JSON`, `NAME`, `SHOW_KEY`, `IS_DELETED`, `MODEL_ID`, `JSON_EVAL`, `HTML`, `RUN_TYPE`, `CATEGORY_ID`, `HTML_READONLY`) VALUES ('fgyjsjlc', '0005', '2022-06-22 14:20:15', NULL, NULL, '法规意见收集流程', NULL, 0, '15007', NULL, NULL, 'json', '4bdf0b396b4aa6ea10dd5e19956a1e22', NULL); + +-- 法规意见表 +CREATE TABLE `laws_opinion_gather` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `serial_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编号', + `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题', + `technology_territory` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '技术领域', + `gather_result` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收集结果', + `start_time` datetime NULL DEFAULT NULL COMMENT '发起日期', + `end_time` datetime NULL DEFAULT NULL COMMENT '截止日期', + `acti_proc_inst_id` varchar(100) 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; + +-- 法规意见收集-评估结果表 +CREATE TABLE `laws_opinion_assessment_result` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `laws_opinion_gather_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '意见收集表id', + `related_section` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关章节', + `issue_or_suggest` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题/建议', + `reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '理由', + `accessory_file` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件', + `submit_time` datetime NULL DEFAULT NULL COMMENT '提出时间', + `acti_proc_inst_id` varchar(100) 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; + +-- 法规-流程历史表 +CREATE TABLE `laws_process_history` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `acti_proc_inst_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id', + `task_definition_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作节点', + `operator_person_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作人id', + `operator_role_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作角色编码', + `operator_time` datetime NULL DEFAULT NULL COMMENT '操作时间', + `flow_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程类型：法规意见收集或法规技术评估流程', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规-流程历史表' ROW_FORMAT = Dynamic; + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java new file mode 100644 index 000000000..80885a019 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.lawsOpinionGather.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO; +import com.jero.modules.lawsOpinionGather.service.ILawsOpinionAssessmentResultEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 法规意见收集-评估结果表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +@Api(tags="法规意见收集-评估结果表") +@RestController +@RequestMapping("/lawsOpinionGather/lawsOpinionAssessmentResultEO") +@Slf4j +public class LawsOpinionAssessmentResultEOController extends JeroController { + @Autowired + private ILawsOpinionAssessmentResultEOService lawsOpinionAssessmentResultEOService; + + /** + * 分页列表查询 + * + * @param lawsOpinionAssessmentResultEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "法规意见收集-评估结果表-分页列表查询") + @ApiOperation(value="法规意见收集-评估结果表-分页列表查询", notes="法规意见收集-评估结果表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsOpinionAssessmentResultEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = lawsOpinionAssessmentResultEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "法规意见收集-评估结果表-列表查询") + @ApiOperation(value="法规意见收集-评估结果表-列表查询", notes="法规意见收集-评估结果表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = lawsOpinionAssessmentResultEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsOpinionAssessmentResultEO + * @return + */ + @AutoLog(value = "法规意见收集-评估结果表-添加") + @ApiOperation(value="法规意见收集-评估结果表-添加", notes="法规意见收集-评估结果表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO) { + lawsOpinionAssessmentResultEOService.add(lawsOpinionAssessmentResultEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param lawsOpinionAssessmentResultEO + * @return + */ + @AutoLog(value = "法规意见收集-评估结果表-编辑") + @ApiOperation(value="法规意见收集-评估结果表-编辑", notes="法规意见收集-评估结果表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO) { + lawsOpinionAssessmentResultEOService.editById(lawsOpinionAssessmentResultEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "法规意见收集-评估结果表-通过id删除") + @ApiOperation(value="法规意见收集-评估结果表-通过id删除", notes="法规意见收集-评估结果表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + lawsOpinionAssessmentResultEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "法规意见收集-评估结果表-批量删除") + @ApiOperation(value="法规意见收集-评估结果表-批量删除", notes="法规意见收集-评估结果表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.lawsOpinionAssessmentResultEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "法规意见收集-评估结果表-通过id查询") + @ApiOperation(value="法规意见收集-评估结果表-通过id查询", notes="法规意见收集-评估结果表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO = lawsOpinionAssessmentResultEOService.queryById(id); + if(lawsOpinionAssessmentResultEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsOpinionAssessmentResultEO); + } + + /** + * 导出excel + * + * @param request + * @param lawsOpinionAssessmentResultEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO) { + return super.exportXls(request, lawsOpinionAssessmentResultEO, LawsOpinionAssessmentResultEO.class, "法规意见收集-评估结果表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, LawsOpinionAssessmentResultEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java new file mode 100644 index 000000000..d14d4172a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.lawsOpinionGather.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; +import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 法规意见收集表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +@Api(tags="法规意见收集表") +@RestController +@RequestMapping("/lawsOpinionGather/lawsOpinionGatherEO") +@Slf4j +public class LawsOpinionGatherEOController extends JeroController { + @Autowired + private ILawsOpinionGatherEOService lawsOpinionGatherEOService; + + /** + * 分页列表查询 + * + * @param lawsOpinionGatherEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "法规意见收集表-分页列表查询") + @ApiOperation(value="法规意见收集表-分页列表查询", notes="法规意见收集表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(LawsOpinionGatherEO lawsOpinionGatherEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsOpinionGatherEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = lawsOpinionGatherEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "法规意见收集表-列表查询") + @ApiOperation(value="法规意见收集表-列表查询", notes="法规意见收集表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = lawsOpinionGatherEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsOpinionGatherEO + * @return + */ + @AutoLog(value = "法规意见收集表-添加") + @ApiOperation(value="法规意见收集表-添加", notes="法规意见收集表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsOpinionGatherEO lawsOpinionGatherEO) { + lawsOpinionGatherEOService.add(lawsOpinionGatherEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param lawsOpinionGatherEO + * @return + */ + @AutoLog(value = "法规意见收集表-编辑") + @ApiOperation(value="法规意见收集表-编辑", notes="法规意见收集表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsOpinionGatherEO lawsOpinionGatherEO) { + lawsOpinionGatherEOService.editById(lawsOpinionGatherEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "法规意见收集表-通过id删除") + @ApiOperation(value="法规意见收集表-通过id删除", notes="法规意见收集表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + lawsOpinionGatherEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "法规意见收集表-批量删除") + @ApiOperation(value="法规意见收集表-批量删除", notes="法规意见收集表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.lawsOpinionGatherEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "法规意见收集表-通过id查询") + @ApiOperation(value="法规意见收集表-通过id查询", notes="法规意见收集表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + LawsOpinionGatherEO lawsOpinionGatherEO = lawsOpinionGatherEOService.queryById(id); + if(lawsOpinionGatherEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsOpinionGatherEO); + } + + /** + * 导出excel + * + * @param request + * @param lawsOpinionGatherEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsOpinionGatherEO lawsOpinionGatherEO) { + return super.exportXls(request, lawsOpinionGatherEO, LawsOpinionGatherEO.class, "法规意见收集表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, LawsOpinionGatherEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java new file mode 100644 index 000000000..876aa1187 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.lawsOpinionGather.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.lawsOpinionGather.entity.LawsProcessHistoryEO; +import com.jero.modules.lawsOpinionGather.service.ILawsProcessHistoryEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 法规-流程历史表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +@Api(tags="法规-流程历史表") +@RestController +@RequestMapping("/lawsOpinionGather/lawsProcessHistoryEO") +@Slf4j +public class LawsProcessHistoryEOController extends JeroController { + @Autowired + private ILawsProcessHistoryEOService lawsProcessHistoryEOService; + + /** + * 分页列表查询 + * + * @param lawsProcessHistoryEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "法规-流程历史表-分页列表查询") + @ApiOperation(value="法规-流程历史表-分页列表查询", notes="法规-流程历史表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(LawsProcessHistoryEO lawsProcessHistoryEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsProcessHistoryEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = lawsProcessHistoryEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "法规-流程历史表-列表查询") + @ApiOperation(value="法规-流程历史表-列表查询", notes="法规-流程历史表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = lawsProcessHistoryEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsProcessHistoryEO + * @return + */ + @AutoLog(value = "法规-流程历史表-添加") + @ApiOperation(value="法规-流程历史表-添加", notes="法规-流程历史表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsProcessHistoryEO lawsProcessHistoryEO) { + lawsProcessHistoryEOService.add(lawsProcessHistoryEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param lawsProcessHistoryEO + * @return + */ + @AutoLog(value = "法规-流程历史表-编辑") + @ApiOperation(value="法规-流程历史表-编辑", notes="法规-流程历史表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsProcessHistoryEO lawsProcessHistoryEO) { + lawsProcessHistoryEOService.editById(lawsProcessHistoryEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "法规-流程历史表-通过id删除") + @ApiOperation(value="法规-流程历史表-通过id删除", notes="法规-流程历史表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + lawsProcessHistoryEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "法规-流程历史表-批量删除") + @ApiOperation(value="法规-流程历史表-批量删除", notes="法规-流程历史表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.lawsProcessHistoryEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "法规-流程历史表-通过id查询") + @ApiOperation(value="法规-流程历史表-通过id查询", notes="法规-流程历史表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + LawsProcessHistoryEO lawsProcessHistoryEO = lawsProcessHistoryEOService.queryById(id); + if(lawsProcessHistoryEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsProcessHistoryEO); + } + + /** + * 导出excel + * + * @param request + * @param lawsProcessHistoryEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsProcessHistoryEO lawsProcessHistoryEO) { + return super.exportXls(request, lawsProcessHistoryEO, LawsProcessHistoryEO.class, "法规-流程历史表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, LawsProcessHistoryEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java new file mode 100644 index 000000000..a7712bfbf --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java @@ -0,0 +1,98 @@ +package com.jero.modules.lawsOpinionGather.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 法规意见收集-评估结果表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +@Data +@TableName("laws_opinion_assessment_result") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_opinion_assessment_result对象", description="法规意见收集-评估结果表") +public class LawsOpinionAssessmentResultEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**意见收集表id*/ + @Excel(name = "意见收集表id", width = 15) + @ApiModelProperty(value = "意见收集表id") + private String lawsOpinionGatherId; + + /**相关章节*/ + @Excel(name = "相关章节", width = 15) + @ApiModelProperty(value = "相关章节") + private String relatedSection; + + /**问题/建议*/ + @Excel(name = "问题/建议", width = 15) + @ApiModelProperty(value = "问题/建议") + private String issueOrSuggest; + + /**理由*/ + @Excel(name = "理由", width = 15) + @ApiModelProperty(value = "理由") + private String reason; + + /**附件*/ + @Excel(name = "附件", width = 15) + @ApiModelProperty(value = "附件") + private String accessoryFile; + + /**提出时间*/ + @Excel(name = "提出时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "提出时间") + private Date submitTime; + + /**流程实例id*/ + @Excel(name = "流程实例id", width = 15) + @ApiModelProperty(value = "流程实例id") + private String actiProcInstId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java new file mode 100644 index 000000000..aa759104e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java @@ -0,0 +1,100 @@ +package com.jero.modules.lawsOpinionGather.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 法规意见收集表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +@Data +@TableName("laws_opinion_gather") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_opinion_gather对象", description="法规意见收集表") +public class LawsOpinionGatherEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**编号*/ + @Excel(name = "编号", width = 15) + @ApiModelProperty(value = "编号") + private String serialNumber; + + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private String title; + + /**技术领域*/ + @Excel(name = "技术领域", width = 15) + @ApiModelProperty(value = "技术领域") + private String technologyTerritory; + + /**收集结果*/ + @Excel(name = "收集结果", width = 15) + @ApiModelProperty(value = "收集结果") + private String gatherResult; + + /**发起日期*/ + @Excel(name = "发起日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "发起日期") + private Date startTime; + + /**截止日期*/ + @Excel(name = "截止日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "截止日期") + private Date endTime; + + /**流程实例id*/ + @Excel(name = "流程实例id", width = 15) + @ApiModelProperty(value = "流程实例id") + private String actiProcInstId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java new file mode 100644 index 000000000..6ac820d97 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java @@ -0,0 +1,93 @@ +package com.jero.modules.lawsOpinionGather.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 法规-流程历史表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +@Data +@TableName("laws_process_history") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_process_history对象", description="法规-流程历史表") +public class LawsProcessHistoryEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**流程实例id*/ + @Excel(name = "流程实例id", width = 15) + @ApiModelProperty(value = "流程实例id") + private String actiProcInstId; + + /**操作节点*/ + @Excel(name = "操作节点", width = 15) + @ApiModelProperty(value = "操作节点") + private String taskDefinitionKey; + + /**操作人id*/ + @Excel(name = "操作人id", width = 15) + @ApiModelProperty(value = "操作人id") + private String operatorPersonId; + + /**操作角色编码*/ + @Excel(name = "操作角色编码", width = 15) + @ApiModelProperty(value = "操作角色编码") + private String operatorRoleCode; + + /**操作时间*/ + @Excel(name = "操作时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "操作时间") + private Date operatorTime; + + /**流程类型*/ + @Excel(name = "流程类型", width = 15) + @ApiModelProperty(value = "流程类型") + private String flowType; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/GatherResultEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/GatherResultEnum.java new file mode 100644 index 000000000..777f4ed77 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/GatherResultEnum.java @@ -0,0 +1,63 @@ +package com.jero.modules.lawsOpinionGather.enums; + +import com.jero.common.constant.enums.CutEnum; +import org.apache.commons.lang3.StringUtils; + +/** + * 收集结果枚举类 + */ +public enum GatherResultEnum { + + UNDERWAY("进行中","underway","underway"), + COMPLETED("已完成","completed","completed"), + ; + + + String cnName; + String enName; + String value; + + private GatherResultEnum(String cnName, String value, String enName) { + this.cnName = cnName; + this.value = value; + this.enName = enName; + } + + public String getCnName() { + return cnName; + } + + public void setCnName(String cnName) { + this.cnName = cnName; + } + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value,String cut) { + GatherResultEnum[] values = values(); + for (GatherResultEnum taskStatusEnum : values) { + if (taskStatusEnum.value.equals(value)) { + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + return taskStatusEnum.cnName; + }else if(StringUtils.equals(cut, CutEnum.EN.getValue())){ + return taskStatusEnum.enName; + } + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsOpinionAssessmentResultEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsOpinionAssessmentResultEOMapper.java new file mode 100644 index 000000000..aca50df1e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsOpinionAssessmentResultEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.lawsOpinionGather.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 法规意见收集-评估结果表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +public interface LawsOpinionAssessmentResultEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsOpinionGatherEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsOpinionGatherEOMapper.java new file mode 100644 index 000000000..3f6ef09fe --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsOpinionGatherEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.lawsOpinionGather.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 法规意见收集表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +public interface LawsOpinionGatherEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsProcessHistoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsProcessHistoryEOMapper.java new file mode 100644 index 000000000..72c33aea1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/LawsProcessHistoryEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.lawsOpinionGather.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.lawsOpinionGather.entity.LawsProcessHistoryEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 法规-流程历史表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +public interface LawsProcessHistoryEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsOpinionAssessmentResultEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsOpinionAssessmentResultEOMapper.xml new file mode 100644 index 000000000..92b82189e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsOpinionAssessmentResultEOMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsOpinionGatherEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsOpinionGatherEOMapper.xml new file mode 100644 index 000000000..0b11179f6 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsOpinionGatherEOMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsProcessHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsProcessHistoryEOMapper.xml new file mode 100644 index 000000000..43244944a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsProcessHistoryEOMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java new file mode 100644 index 000000000..8be4646a9 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.lawsOpinionGather.service; + +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 法规意见收集-评估结果表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +public interface ILawsOpinionAssessmentResultEOService extends IService { + + /** + * 保存 + * + * @param lawsOpinionAssessmentResultEO + * @return + */ + void add(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO); + + /** + * 更新 + * + * @param lawsOpinionAssessmentResultEO + * @return + */ + void editById(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsOpinionAssessmentResultEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java new file mode 100644 index 000000000..cf33efa76 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.lawsOpinionGather.service; + +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 法规意见收集表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +public interface ILawsOpinionGatherEOService extends IService { + + /** + * 保存 + * + * @param lawsOpinionGatherEO + * @return + */ + void add(LawsOpinionGatherEO lawsOpinionGatherEO); + + /** + * 更新 + * + * @param lawsOpinionGatherEO + * @return + */ + void editById(LawsOpinionGatherEO lawsOpinionGatherEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsOpinionGatherEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java new file mode 100644 index 000000000..a0a598e2c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.lawsOpinionGather.service; + +import com.jero.modules.lawsOpinionGather.entity.LawsProcessHistoryEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 法规-流程历史表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +public interface ILawsProcessHistoryEOService extends IService { + + /** + * 保存 + * + * @param lawsProcessHistoryEO + * @return + */ + void add(LawsProcessHistoryEO lawsProcessHistoryEO); + + /** + * 更新 + * + * @param lawsProcessHistoryEO + * @return + */ + void editById(LawsProcessHistoryEO lawsProcessHistoryEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsProcessHistoryEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java new file mode 100644 index 000000000..ee57a53d0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.lawsOpinionGather.service.impl; + +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO; +import com.jero.modules.lawsOpinionGather.mapper.LawsOpinionAssessmentResultEOMapper; +import com.jero.modules.lawsOpinionGather.service.ILawsOpinionAssessmentResultEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 法规意见收集-评估结果表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +@Service +public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl implements ILawsOpinionAssessmentResultEOService { + + /** + * 保存 + * + * @param lawsOpinionAssessmentResultEO + * @return + */ + @Override + public void add(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO) { + Date now = new Date(); + lawsOpinionAssessmentResultEO.setCreateTime(now); + lawsOpinionAssessmentResultEO.setUpdateTime(now); + save(lawsOpinionAssessmentResultEO); + } + + /** + * 更新 + * + * @param lawsOpinionAssessmentResultEO + * @return + */ + @Override + public void editById(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO) { + Date now = new Date(); + lawsOpinionAssessmentResultEO.setUpdateTime(now); + saveOrUpdate(lawsOpinionAssessmentResultEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public LawsOpinionAssessmentResultEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java new file mode 100644 index 000000000..5ff7975ad --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.lawsOpinionGather.service.impl; + +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; +import com.jero.modules.lawsOpinionGather.mapper.LawsOpinionGatherEOMapper; +import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 法规意见收集表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +@Service +public class LawsOpinionGatherEOServiceImpl extends ServiceImpl implements ILawsOpinionGatherEOService { + + /** + * 保存 + * + * @param lawsOpinionGatherEO + * @return + */ + @Override + public void add(LawsOpinionGatherEO lawsOpinionGatherEO) { + Date now = new Date(); + lawsOpinionGatherEO.setCreateTime(now); + lawsOpinionGatherEO.setUpdateTime(now); + save(lawsOpinionGatherEO); + } + + /** + * 更新 + * + * @param lawsOpinionGatherEO + * @return + */ + @Override + public void editById(LawsOpinionGatherEO lawsOpinionGatherEO) { + Date now = new Date(); + lawsOpinionGatherEO.setUpdateTime(now); + saveOrUpdate(lawsOpinionGatherEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public LawsOpinionGatherEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java new file mode 100644 index 000000000..8cfb57597 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.lawsOpinionGather.service.impl; + +import com.jero.modules.lawsOpinionGather.entity.LawsProcessHistoryEO; +import com.jero.modules.lawsOpinionGather.mapper.LawsProcessHistoryEOMapper; +import com.jero.modules.lawsOpinionGather.service.ILawsProcessHistoryEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 法规-流程历史表 + * @Author: jero-boot + * @Date: 2022-06-22 + * @Version: V1.0 + */ +@Service +public class LawsProcessHistoryEOServiceImpl extends ServiceImpl implements ILawsProcessHistoryEOService { + + /** + * 保存 + * + * @param lawsProcessHistoryEO + * @return + */ + @Override + public void add(LawsProcessHistoryEO lawsProcessHistoryEO) { + Date now = new Date(); + lawsProcessHistoryEO.setCreateTime(now); + lawsProcessHistoryEO.setUpdateTime(now); + save(lawsProcessHistoryEO); + } + + /** + * 更新 + * + * @param lawsProcessHistoryEO + * @return + */ + @Override + public void editById(LawsProcessHistoryEO lawsProcessHistoryEO) { + Date now = new Date(); + lawsProcessHistoryEO.setUpdateTime(now); + saveOrUpdate(lawsProcessHistoryEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public LawsProcessHistoryEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} From 72c4f249c0203b15b17ca4904b38bf065f6be864 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 22 Jun 2022 16:38:11 +0800 Subject: [PATCH 047/140] [update] --- jero-web/src/common/lang/en-us.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b8afbfa7e..68ce382c2 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -723,7 +723,7 @@ module.exports = { Dropdownradio: 'Drop down radio', Dropdownmultipleselection: 'Drop down multiple selection', a: '+', - positiveInteger: 'positive integer', + positiveInteger: 'Positive integer', ParameteItemCollectionList: 'Parameter item collection list', Areyousureparameteritems: 'Are you sure to submit the selected parameter items?', @@ -731,8 +731,8 @@ module.exports = { theCurrent: 'The current status of this data is', thisbuttonCompleted: 'This button can only be operated when the status is completed', Frozenstatus: 'Frozen status, can only be viewed', - chinese: 'chinese', - integerOrDecimal: 'integer Or Decimal', + chinese: 'Chinese', + integerOrDecimal: 'Integer Or Decimal', OneDecimalPlace: 'One Decimal Place', TwoDecimalplaces: 'Two Decimal places', Threedecimalplaces: 'Threedecimalplaces', From c9538cfb5a86d8d6397a2fa4e9e8240c061a69d4 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 22 Jun 2022 17:10:41 +0800 Subject: [PATCH 048/140] =?UTF-8?q?[update]=20=E4=B8=8A=E5=AE=9D=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../parameter/escalationlibrary/index.vue | 105 +++--------------- 3 files changed, 16 insertions(+), 91 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 68ce382c2..0f5be5026 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -981,4 +981,5 @@ module.exports = { // 上报库 Enable: 'Enable', Latestupdatetime: 'Latest update time', + Exporthistory: 'Exporthistory', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 0c5eff3cb..1441b8d7a 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -986,4 +986,5 @@ module.exports = { // 上报库 Enable: '启用', Latestupdatetime: '最新更新时间', + Exporthistory: '导出历史', } \ No newline at end of file diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue index e1cb9c182..3b08661c4 100644 --- a/jero-web/src/views/parameter/escalationlibrary/index.vue +++ b/jero-web/src/views/parameter/escalationlibrary/index.vue @@ -4,22 +4,20 @@
-
- {{$t('zoneOfApplication')}} +
+ {{$t('entryName')}}
- +
-
- {{$t('parameterTemplate')}} +
+ {{$t('ListTitle')}}
- +
@@ -30,20 +28,6 @@
-
-
- - {{$t('newlyAdded')}} -
-
- - {{$t('copy')}} -
-
- - {{$t('BatchDelete')}} -
-
30 ? text.slice(0, 29) + '...' : text }} - {{$t('edit')}} - {{$t('deleteLib')}} + {{$t('Exporthistory')}} + {{$t('See')}}
@@ -138,7 +122,7 @@ export default { dataSource: [], confirmLoading: false, url: { - list: 'params/template/page', + list: 'params/report/page', add: 'params/template/add', edit: 'params/template/edit', deleteBatch: 'params/template/delete', @@ -154,19 +138,17 @@ export default { title: this.$t('entryName'), align: 'center', width: '10%', - dataIndex: 'region_dictText', + dataIndex: 'projectName', }, { title: this.$t('ListTitle'), align: 'center', - dataIndex: 'paramsTemplateName', - scopedSlots: { customRender: 'projectName' } + dataIndex: 'title', }, { title: this.$t('Version'), align: 'center', - dataIndex: 'description', - scopedSlots: { customRender: 'titleName' } + dataIndex: 'version', }, { title: this.$t('operation'), @@ -214,68 +196,9 @@ export default { this.selectedRowKeys = value this.selectedRowKeysArray = this.selectedRowKeys.join(',') }, - //添加 - handleAdd() { - this.$refs.addModelRef.addModel() - }, - // 复制 - handlecody(){ - if (this.selectedRowKeys.length > 1) { - this.$message.warning(this.$t('OnlyOneSelected')) - } else if(this.selectedRowKeys.length == 0){ - this.$message.warning(this.$t('pleaseSelectData')) - } else { - this.areaVisible=true - this.formInline = {} - } - }, hideModal(){ this.visible = false; }, - //批量删除 - handleDel() { - let param={ - ids: this.selectedRowKeysArray - } - if (this.selectedRowKeys.length > 0) { - let _this = this - this.$confirm({ - content: _this.$t('ConfirmBatchDeletion'), - onOk() { - axios({ - url: '/jero-boot/params/template/deleteBatch', - method: 'post', - data: param, - transformRequest: [function (data) { - let ret = '' - for (let it in data) { - ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' - } - return ret - }], - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - 'X-Access-Token':_this.token - } - }) - .then( (res) =>{ - if (res.data.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.selectedRowKeys = [] - _this.getList() - }else{ - _this.$message.warning(_this.$t('operationFailed')) - } - }) - .catch( (error) =>{ - console.log(error); - }); - } - }) - } else { - this.$message.warning(this.$t('selectLeastOne')) - } - }, //编辑 edit(item) { this.$refs.addModelRef.editModel(JSON.parse(JSON.stringify(item))) From c9d0a2c8da819bbcd3f5d4c71ec56151876f513e Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Wed, 22 Jun 2022 17:58:11 +0800 Subject: [PATCH 049/140] =?UTF-8?q?[update]=20=E4=B8=8A=E5=AE=9D=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 5 +- jero-web/src/common/lang/zh-cn.js | 3 + .../src/components/exporthistory/index.vue | 361 ++++++++++++++++++ .../parameter/escalationlibrary/index.vue | 47 +-- 4 files changed, 380 insertions(+), 36 deletions(-) create mode 100644 jero-web/src/components/exporthistory/index.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 0f5be5026..f3f8736f8 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -618,7 +618,7 @@ module.exports = { TaskRequirements: 'Task Requirements', CertificationProgress: 'Homologation Progress', CurrentProjectStatusEvaluation: 'Current State', - NiONumber: 'NiO number', + NiONumber: 'NIO number', ParameterName: 'Parameter name', ParameterDescription: 'Parameter description', Version: 'Version', @@ -982,4 +982,7 @@ module.exports = { Enable: 'Enable', Latestupdatetime: 'Latest update time', Exporthistory: 'Exporthistory', + Exporttype: 'Export Type', + Exporttime: 'Export Time', + file: 'File' } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 1441b8d7a..99106720c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -987,4 +987,7 @@ module.exports = { Enable: '启用', Latestupdatetime: '最新更新时间', Exporthistory: '导出历史', + Exporttype: '导出类型', + Exporttime: '导出时间', + file: '文件' } \ No newline at end of file diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue new file mode 100644 index 000000000..2b0eb4638 --- /dev/null +++ b/jero-web/src/components/exporthistory/index.vue @@ -0,0 +1,361 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue index 3b08661c4..900f58345 100644 --- a/jero-web/src/views/parameter/escalationlibrary/index.vue +++ b/jero-web/src/views/parameter/escalationlibrary/index.vue @@ -45,11 +45,8 @@ {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} - - {{ text && text.length > 30 ? text.slice(0, 29) + '...' : text }} - - {{$t('Exporthistory')}} + {{$t('Exporthistory')}} {{$t('See')}} @@ -65,37 +62,16 @@ @showSizeChange="SizeChange" />
- - - - - -
-
- * - {{$t('templateName')}} -
- - - -
- - - -
- {{$t('cancel')}} - {{$t('submit')}} -
+ + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue index 83c82ca50..bbd18a05a 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue @@ -81,6 +81,7 @@
+
@@ -92,8 +93,13 @@ + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue new file mode 100644 index 000000000..87e5a37e6 --- /dev/null +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -0,0 +1,253 @@ + + + + \ No newline at end of file diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue new file mode 100644 index 000000000..1fa3f63df --- /dev/null +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -0,0 +1,31 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index 541712e30..51f3a47b0 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -195,11 +195,14 @@ clearSelected() { }, - pageOnChange() { - + pageOnChange(page) { + this.pageNo = page + this.getList() }, - SizeChange() { - + SizeChange(pageSize) { + this.pageNo = 1 + this.pageSize = pageSize + this.getList() }, getList() { From 9780181e749519f6e66ee7ff88ab5a6559311e50 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 23 Jun 2022 11:01:25 +0800 Subject: [PATCH 061/140] [update] 54832 --- jero-web/src/common/lang/en-us.js | 5 ++++- jero-web/src/common/lang/zh-cn.js | 5 ++++- .../dialog/ProjectCollectionParameters.vue | 8 ++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index aa0dd1ad9..e1d23071f 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1000,5 +1000,8 @@ module.exports = { Exporthistory: 'Exporthistory', Exporttype: 'Export Type', Exporttime: 'Export Time', - file: 'File' + file: 'File', + // 中英修改-全局 + Copysuccessful: 'Copy Successful', + Copyfailed: 'Copy Failed', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 3ae3dfc47..17ccf64d6 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1005,5 +1005,8 @@ module.exports = { Exporthistory: '导出历史', Exporttype: '导出类型', Exporttime: '导出时间', - file: '文件' + file: '文件', +// 中英修改-全局 + Copysuccessful: '复制成功', + Copyfailed: '复制失败', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue index d49e860cd..85431116e 100644 --- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue +++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue @@ -270,20 +270,20 @@ export default { this.confirmLoading = true let _tt = { paramsTemplateId: this.selectedRowKeysDate[0].paramsTemplateId, - projectId: this.selectedRowKeysDate[0].projectId, - title: this.selectedRowKeysDate[0].title, + projectId: this.projectId, + title: this.formData.title, paramsTemplatePublishVersion: this.selectedRowKeysDate[0].paramsTemplatePublishVersion, sourceManifestId: this.selectedRowKeysDate[0].id, } postAction('params/manifest/copy', _tt).then((res) => { if (res.success) { this.$emit('copysubmit') - this.$message.success(res.message) + this.$message.success(this.$t('Copysuccessful')) this.flag = false this.spinLoading = false this.confirmLoading = false } else { - this.$message.warning(res.message) + this.$message.warning(this.$t('Copyfailed')) this.flag = false this.spinLoading = false this.confirmLoading = false From a514447b50c0b3ad771c28a292c313e232a1f1e0 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 23 Jun 2022 11:10:11 +0800 Subject: [PATCH 062/140] [update] 54842 --- jero-web/src/common/lang/en-us.js | 2 ++ jero-web/src/common/lang/zh-cn.js | 2 ++ .../src/components/SynchronousSubmissionLibrary/index.vue | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index e1d23071f..fd7c64175 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1004,4 +1004,6 @@ module.exports = { // 中英修改-全局 Copysuccessful: 'Copy Successful', Copyfailed: 'Copy Failed', + Synchronizedatabase: 'Synchronize the data of the selected row to the database?', + Aftersynchronization: 'After synchronization, the parameter items cannot be modified. Only the collection can be redistributed. The parameters have been updated', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 17ccf64d6..b629afccb 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1009,4 +1009,6 @@ module.exports = { // 中英修改-全局 Copysuccessful: '复制成功', Copyfailed: '复制失败', + Synchronizedatabase: '是否同步选中行数据至上报库?', + Aftersynchronization: '同步后的参数项将不可修改,仅能重新下发收集,已更新参数', } \ No newline at end of file diff --git a/jero-web/src/components/SynchronousSubmissionLibrary/index.vue b/jero-web/src/components/SynchronousSubmissionLibrary/index.vue index 6760052e7..41fe4c090 100644 --- a/jero-web/src/components/SynchronousSubmissionLibrary/index.vue +++ b/jero-web/src/components/SynchronousSubmissionLibrary/index.vue @@ -11,8 +11,8 @@ > -
是否同步选中行数据至上报库?
-
同步后的参数项将不可修改,仅能重新下发收集,已更新参数
+
{{ $t('Synchronizedatabase') }}
+
{{ $t('Aftersynchronization') }}
 From 1fb55bca77767583a7fc685a8689e9535c484c18 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 23 Jun 2022 11:17:38 +0800 Subject: [PATCH 063/140] [update] 54839 --- .../projectManagement/components/TaskParameterCollection.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 6e80ce64e..831533fe6 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -211,7 +211,7 @@ window.open(newUrl.href, '_blank') }, deleteLib(val) { - if(val.state === '已完成') { + if(val.state === '已完成' || val.state === 'Finished' ) { let _this = this this.$confirm({ content: _this.$t('ConfirmDelete'), @@ -304,7 +304,7 @@ // 默认为0 可全部删除 let flag = 1 this.selectedRowKeysvalArray.forEach((item) => { - if(item.state !== '已完成'){ + if(item.state !== '已完成' && val.state !== 'Finished' ){ flag = 0 } }) From 234a1d42f14569669252df4ea4c2f32237b10e0a Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 23 Jun 2022 11:38:22 +0800 Subject: [PATCH 064/140] [update] 54834 --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + jero-web/src/components/AssignedBy/index.vue | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index fd7c64175..1d67d0331 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1006,4 +1006,5 @@ module.exports = { Copyfailed: 'Copy Failed', Synchronizedatabase: 'Synchronize the data of the selected row to the database?', Aftersynchronization: 'After synchronization, the parameter items cannot be modified. Only the collection can be redistributed. The parameters have been updated', + FNumber: 'Number', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index b629afccb..bd7f2fa0a 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1011,4 +1011,5 @@ module.exports = { Copyfailed: '复制失败', Synchronizedatabase: '是否同步选中行数据至上报库?', Aftersynchronization: '同步后的参数项将不可修改,仅能重新下发收集,已更新参数', + FNumber: '账号', } \ No newline at end of file diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue index 2fcef6a5a..062ac424f 100644 --- a/jero-web/src/components/AssignedBy/index.vue +++ b/jero-web/src/components/AssignedBy/index.vue @@ -11,13 +11,13 @@ > - + - + @@ -78,14 +78,14 @@ export default { editId: '', columns: [ { - title: this.$t('fullName'), + title: this.$t('name'), dataIndex: 'realname', key: 'showArea', align: 'center', ellipsis: true }, { - title: this.$t('accountNumber'), + title: this.$t('FNumber'), align: 'center', dataIndex: 'username', ellipsis: true From 28db9e0daf65fa3ee041bca9990badb4d6d23fa3 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 23 Jun 2022 11:39:19 +0800 Subject: [PATCH 065/140] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 5 + jero-web/src/common/lang/zh-cn.js | 5 + .../components/feedbackInformation.vue | 233 ++++++++++++++++++ .../processForm/regulatoryProcess/index.vue | 103 +++++++- 4 files changed, 338 insertions(+), 8 deletions(-) create mode 100644 jero-web/src/views/processCenter/components/feedbackInformation.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1d67d0331..2ea80f33f 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -993,6 +993,11 @@ module.exports = { evaluationResults:'Evaluation results', Assessor:'Assessor', collectionOfRegulatoryOpinions:'Collection Of Regulatory Opinions', + feedbackInformation:'Feedback Information', + relevantSections:'Relevant sections', + questionsSuggestions:'Questions or Suggestions', + reason:'Reason', + feedbackPoint:'Feedback point', link:'Link', // 上报库 Enable: 'Enable', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index bd7f2fa0a..4f7dd9e91 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -998,7 +998,12 @@ module.exports = { evaluationResults: '评估结果', Assessor:'评估人', collectionOfRegulatoryOpinions:'法规意见收集', + feedbackInformation:'反馈信息', + relevantSections:'相关章节', + questionsSuggestions:'问题/建议', link: '链接', + reason:'附件', + feedbackPoint:'反馈点', // 上报库 Enable: '启用', Latestupdatetime: '最新更新时间', diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue new file mode 100644 index 000000000..959ff4f07 --- /dev/null +++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue @@ -0,0 +1,233 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index 1fa3f63df..7c8e09c40 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -4,8 +4,26 @@ :title="title" />
-
- +
+ + + +
@@ -13,19 +31,88 @@ \ No newline at end of file From fb96cf13f34d0d14d02caddad7204a59a5295e9f Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 23 Jun 2022 11:54:52 +0800 Subject: [PATCH 066/140] [update] 54849 --- jero-web/src/views/projectManagement/dialog/configure.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue index 410a485ad..a9e61a78b 100644 --- a/jero-web/src/views/projectManagement/dialog/configure.vue +++ b/jero-web/src/views/projectManagement/dialog/configure.vue @@ -238,6 +238,9 @@ export default { _this.deleteConfigIdsArray.push(displaySeq) _this.deleteConfigIds = _this.deleteConfigIdsArray.join(',') let _tt = _this.paramsConfigEOList.splice(index,1) + if(_tt.length === 1) { + _this.$message.success(_this.$t('DeleteSucceeded')) + } } }) }, From 15ba0ee98f3aaf16bf949a7eb5b9bf6e07d93d39 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 23 Jun 2022 12:08:00 +0800 Subject: [PATCH 067/140] [update] 54853 --- .../src/components/tableCollection/index.vue | 66 ++++++++++--------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 82260a907..1f7548d3c 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -55,7 +55,7 @@ > - + @@ -212,9 +212,9 @@ areaVisible: false, form: {}, rules: { - // templatetitle: [ - // { required: true, message: this.$t('enterTitle'), trigger: 'blur' } - // ] + querySdt: [ + { required: true, message: this.$t('PleaseSelect')+this.$t('engineeringInterfacePerson'), trigger: 'blur' } + ] }, wrapperCol: { xs: { span: 24 }, @@ -285,35 +285,39 @@ handleSubmit(record) { let _this = this let param = { sdt: this.Dateline.querySdt, ids: this.getquerySdtId } - axios({ - url: '/jero-boot/params/collectManifest/updateSdt', - method: 'post', - data: param, - transformRequest: [function(data) { - let ret = '' - for (let it in data) { - ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' - } - return ret - }], - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - 'X-Access-Token': _this.token + this.$refs.ruleForm.validate(valid => { + if (valid) { + axios({ + url: '/jero-boot/params/collectManifest/updateSdt', + method: 'post', + data: param, + transformRequest: [function(data) { + let ret = '' + for (let it in data) { + ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' + } + return ret + }], + headers: { + 'Content-Type': 'application/x-www-form-urlencoded', + 'X-Access-Token': _this.token + } + }) + .then((res) => { + console.log(res) + if (res.data.success) { + _this.$message.success(res.data.result) + _this.areaVisible = false + this.getLoginUserType() + } else { + _this.$message.warning(res.data.result) + } + }) + .catch((error) => { + console.log(error) + }) } }) - .then((res) => { - console.log(res) - if (res.data.success) { - _this.$message.success(res.data.result) - _this.areaVisible = false - this.getLoginUserType() - } else { - _this.$message.warning(res.data.result) - } - }) - .catch((error) => { - console.log(error) - }) }, // 工程接口人 取消 cancleImports() { From be4b3bb7d5b5dd2eeecdbfaad544000fab16b9c5 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 23 Jun 2022 14:10:37 +0800 Subject: [PATCH 068/140] =?UTF-8?q?[update]=20=E4=B8=AD=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 12 ++++ jero-web/src/common/lang/zh-cn.js | 12 ++++ .../parameterlist/components/addModel.vue | 58 +++++++++---------- 3 files changed, 53 insertions(+), 29 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 2ea80f33f..48c00a229 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1012,4 +1012,16 @@ module.exports = { Synchronizedatabase: 'Synchronize the data of the selected row to the database?', Aftersynchronization: 'After synchronization, the parameter items cannot be modified. Only the collection can be redistributed. The parameters have been updated', FNumber: 'Number', + NNiONumber: 'NIO Number', + NRequired: 'Is Must', + NParameterName: 'Params Name', + NtechnicalField: 'Technical Field', + NparameterBatch: 'Params Batch', + NareaOfResponsibility: 'Duty Territory', + NParameterDescription: 'Description', + NcertificationCategory: 'Cert Category', + NcontrolType: 'Control Type', + NcontrolVerification: 'Control Verify', + NcontrolAlternatives: 'Control Values', + NattachmentTemplate: 'File Template', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 4f7dd9e91..4807a1132 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1017,4 +1017,16 @@ module.exports = { Synchronizedatabase: '是否同步选中行数据至上报库?', Aftersynchronization: '同步后的参数项将不可修改,仅能重新下发收集,已更新参数', FNumber: '账号', + NNiONumber: 'NIO编号', + NRequired: '是否必填', + NParameterName: '参数名称', + NtechnicalField: '技术领域', + NparameterBatch: '参数批次', + NareaOfResponsibility: '责任领域', + NParameterDescription: '参数说明', + NcertificationCategory: '认证类别', + NcontrolType: '控件类型', + NcontrolVerification: '控件校验', + NcontrolAlternatives: '控件备选值', + NattachmentTemplate: '附件模板', } \ No newline at end of file diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 75567f562..24f0a5c3e 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -17,13 +17,13 @@
* {{$t('NiONumber')}} + :title="$t('NNiONumber')">{{$t('NNiONumber')}}
+ :placeholder="$t('PleaseEnter')+$t('NNiONumber')"/>
@@ -31,10 +31,10 @@
* - {{$t('Required')}} + {{$t('NRequired')}}
- + {{$t('yes')}} {{$t('notOnlyRz')}} @@ -50,13 +50,13 @@
* {{$t('ParameterName')}} + :title="$t('NParameterName')">{{$t('NParameterName')}}
+ :placeholder="$t('PleaseEnter')+$t('NParameterName')"/>
@@ -64,7 +64,7 @@
* - {{$t('technicalField')}} + {{$t('NtechnicalField')}}
@@ -88,12 +88,12 @@
* {{$t('parameterBatch')}} + :title="$t('NparameterBatch')">{{$t('NparameterBatch')}}
@@ -103,12 +103,12 @@
* - {{$t('areaOfResponsibility')}} + {{$t('NareaOfResponsibility')}}
@@ -120,7 +120,7 @@
{{$t('ParameterDescription')}} + :title="$t('NParameterDescription')">{{$t('NParameterDescription')}}
+ :placeholder="$t('PleaseEnter')+$t('NParameterDescription')"/>
@@ -139,14 +139,14 @@
* {{$t('certificationCategory')}} + :title="$t('NcertificationCategory')">{{$t('NcertificationCategory')}}
@@ -159,10 +159,10 @@
* {{$t('controlType')}} + :title="$t('NcontrolType')">{{$t('NcontrolType')}}
- + {{ item.label }} @@ -177,10 +177,10 @@
* - {{$t('controlVerification')}} + {{$t('NcontrolVerification')}}
- + {{ item.label }} @@ -198,14 +198,14 @@
* {{$t('controlAlternatives')}} + :title="$t('NcontrolAlternatives')">{{$t('NcontrolAlternatives')}}
+ :placeholder="$t('PleaseEnter')+$t('NcontrolAlternatives')"/>
@@ -214,7 +214,7 @@
{{$t('attachmentTemplate')}} + :title="$t('NattachmentTemplate')">{{$t('NattachmentTemplate')}}
* {{$t('standard')}} + :title="$t('NNiONumber')">{{$t('NNiONumber')}}
+ :placeholder="$t('PleaseEnter')+$t('NNiONumber')"/>
@@ -250,13 +250,13 @@
* - {{$t('ParameterName')}} + {{$t('NParameterName')}}
+ :placeholder="$t('PleaseEnter')+$t('NParameterName')"/>
@@ -266,7 +266,7 @@
{{$t('ParameterDescription')}} + :title="$t('NParameterDescription')">{{$t('NParameterDescription')}}
+ :placeholder="$t('PleaseEnter')+$t('NParameterDescription')"/>
From 9d79be2ea548099da9f879d262e32cd427f31957 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 23 Jun 2022 14:39:07 +0800 Subject: [PATCH 069/140] =?UTF-8?q?[update]=20=E4=B8=AD=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 19 ++++++++++ jero-web/src/common/lang/zh-cn.js | 19 ++++++++++ .../parameterlist/components/addModel.vue | 38 +++++++++---------- 3 files changed, 57 insertions(+), 19 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 48c00a229..4d93a5b80 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1024,4 +1024,23 @@ module.exports = { NcontrolVerification: 'Control Verify', NcontrolAlternatives: 'Control Values', NattachmentTemplate: 'File Template', + Ntext: 'Text', + NDropdownradio: 'Pull single', + NDropdownmultipleselection: 'Pull more', + Nenclosure: 'File', + Atext: 'Text+Pull single', + Btext: 'Text+Pull more', + Ctext: 'Text+File', + Dtext: 'Pull single+File', + Etext:'Pull more+File', + Ftext: 'Text+Pull single+File', + Nnothing: 'Null', + Nchinese: 'Chinese', + NpositiveInteger: 'Positive integer', + NPositivefloatingpointnumber: 'Positive float', + NintegerOrDecimal: 'Integer decimal', + NOneDecimalPlace: 'Decimal one', + NTwoDecimalplaces: 'Decimal two', + NThreedecimalplaces: 'Decimal three', + NFourDecimalplaces: 'Decimal four' } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 4807a1132..dedee38fa 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1029,4 +1029,23 @@ module.exports = { NcontrolVerification: '控件校验', NcontrolAlternatives: '控件备选值', NattachmentTemplate: '附件模板', + Ntext: '文本', + NDropdownradio: '下拉单选', + NDropdownmultipleselection: '下拉多选', + Nenclosure: '附件', + Atext: '文本+下拉单选', + Btext: '文本+下拉多选', + Ctext: '文本+附件', + Dtext: '下拉单选+附件', + Etext:'下拉多选+附件', + Ftext: '文本+下拉单选+附件', + Nnothing: '无', + Nchinese: '中文', + NpositiveInteger: '正整数', + NPositivefloatingpointnumber: '正浮点数', + NintegerOrDecimal: '整数或小数', + NOneDecimalPlace: '一位小数', + NTwoDecimalplaces: '两位小数', + NThreedecimalplaces: '三位小数', + NFourDecimalplaces: '四位小数' } \ No newline at end of file diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 24f0a5c3e..3fef55e8f 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -320,27 +320,27 @@ export default { data() { return { controlType: [ // 控件类型 - {value:'1', label: this.$t('text') }, - {value:'2', label: this.$t('Dropdownradio') }, - {value:'3', label: this.$t('Dropdownmultipleselection') }, - {value:'4', label: this.$t('enclosure') }, - {value:'5', label: this.$t('text')+ this.$t('a')+this.$t('Dropdownradio') }, - {value:'6', label: this.$t('text')+ this.$t('a')+this.$t('Dropdownmultipleselection') }, - {value:'7', label: this.$t('text')+ this.$t('a')+this.$t('enclosure') }, - {value:'8', label: this.$t('Dropdownradio')+ this.$t('a')+this.$t('enclosure') }, - {value:'9', label: this.$t('Dropdownmultipleselection')+ this.$t('a')+this.$t('enclosure') }, - {value:'10', label: this.$t('text')+ this.$t('a')+this.$t('Dropdownradio')+ this.$t('a')+this.$t('enclosure') }, + {value:'1', label: this.$t('Ntext') }, + {value:'2', label: this.$t('NDropdownradio') }, + {value:'3', label: this.$t('NDropdownmultipleselection') }, + {value:'4', label: this.$t('Nenclosure') }, + {value:'5', label: this.$t('Atext') }, + {value:'6', label: this.$t('Btext') }, + {value:'7', label: this.$t('Ctext') }, + {value:'8', label: this.$t('Dtext') }, + {value:'9', label: this.$t('Etext') }, + {value:'10', label: this.$t('Ftext') }, ], controlVerification: [ // 控件校验 - {value:'1', label: this.$t('nothing') }, - {value:'2', label: this.$t('chinese') }, - {value:'3', label: this.$t('positiveInteger') }, - {value:'4', label: this.$t('Positivefloatingpointnumber') }, - {value:'5', label: this.$t('integerOrDecimal')}, - {value:'6', label: this.$t('OneDecimalPlace') }, - {value:'7', label: this.$t('TwoDecimalplaces') }, - {value:'8', label: this.$t('Threedecimalplaces') }, - {value:'9', label: this.$t('FourDecimalplaces') }, + {value:'1', label: this.$t('Nnothing') }, + {value:'2', label: this.$t('Nchinese') }, + {value:'3', label: this.$t('NpositiveInteger') }, + {value:'4', label: this.$t('NPositivefloatingpointnumber') }, + {value:'5', label: this.$t('NintegerOrDecimal')}, + {value:'6', label: this.$t('NOneDecimalPlace') }, + {value:'7', label: this.$t('NTwoDecimalplaces') }, + {value:'8', label: this.$t('NThreedecimalplaces') }, + {value:'9', label: this.$t('NFourDecimalplaces') }, ], CategoryTreeList: [], // 技术领域 certCategoryParamsInfoEOList: [], // 认证类别得tab栏 From 35f60cc15f24937093494c2121299f776c9e26b0 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 23 Jun 2022 14:41:41 +0800 Subject: [PATCH 070/140] [update] --- jero-web/src/common/lang/en-us.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 4d93a5b80..e9aed8ea9 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -74,7 +74,7 @@ module.exports = { user: 'User', numericalValue: 'Numerical Value', not: 'No.', - notOnlyRz: 'no', + notOnlyRz: 'No', EnterValue: 'Please Enter a Value', SavedQuery: 'Saved Search', NoQueriesSaved: 'No Queries Were Saved', @@ -1042,5 +1042,6 @@ module.exports = { NOneDecimalPlace: 'Decimal one', NTwoDecimalplaces: 'Decimal two', NThreedecimalplaces: 'Decimal three', - NFourDecimalplaces: 'Decimal four' + NFourDecimalplaces: 'Decimal four', + yes: 'Yes', } \ No newline at end of file From ba05f52c005fb4a480e43b2c1bd91323bef4e3db Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 23 Jun 2022 14:56:37 +0800 Subject: [PATCH 071/140] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E6=B5=81=E7=A8=8B=E7=9B=B8=E5=85=B3=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsOpinionGatherEOController.java | 16 +++++++- .../LawsProcessHistoryEOController.java | 18 ++++++++- .../service/ILawsOpinionGatherEOService.java | 9 +++++ .../service/ILawsProcessHistoryEOService.java | 9 +++++ .../impl/LawsOpinionGatherEOServiceImpl.java | 38 +++++++++++++++++++ .../impl/LawsProcessHistoryEOServiceImpl.java | 37 ++++++++++++++++++ .../project/enums/OperatorTypeEnum.java | 3 ++ .../wkflow/controller/workFlowController.java | 3 ++ .../modules/wkflow/enums/FlowTypeEnum.java | 1 + 9 files changed, 131 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java index d14d4172a..922d15e25 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java @@ -4,6 +4,8 @@ import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; @@ -35,7 +37,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class LawsOpinionGatherEOController extends JeroController { @Autowired private ILawsOpinionGatherEOService lawsOpinionGatherEOService; - + /** * 分页列表查询 * @@ -167,4 +169,16 @@ public class LawsOpinionGatherEOController extends JeroController processCall(@RequestBody JSONObject jsonObject){ + return this.lawsOpinionGatherEOService.processCall(jsonObject); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java index 876aa1187..15ec36e61 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java @@ -4,6 +4,8 @@ import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.lawsOpinionGather.entity.LawsProcessHistoryEO; @@ -35,7 +37,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class LawsProcessHistoryEOController extends JeroController { @Autowired private ILawsProcessHistoryEOService lawsProcessHistoryEOService; - + /** * 分页列表查询 * @@ -167,4 +169,16 @@ public class LawsProcessHistoryEOController extends JeroController processCall(@RequestBody JSONObject jsonObject){ + return this.lawsProcessHistoryEOService.processCall(jsonObject); + } + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java index cf33efa76..e1a0cbe59 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java @@ -1,5 +1,7 @@ package com.jero.modules.lawsOpinionGather.service; +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -58,4 +60,11 @@ public interface ILawsOpinionGatherEOService extends IService queryList(); + + /** + * 流程调用 + * @param jsonObject + * @return + */ + Result processCall(JSONObject jsonObject); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java index a0a598e2c..7d52e881e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java @@ -1,5 +1,7 @@ package com.jero.modules.lawsOpinionGather.service; +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; import com.jero.modules.lawsOpinionGather.entity.LawsProcessHistoryEO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -58,4 +60,11 @@ public interface ILawsProcessHistoryEOService extends IService queryList(); + + /** + * 流程调用 + * @param jsonObject + * @return + */ + Result processCall(JSONObject jsonObject); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java index 5ff7975ad..f1b8735fd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java @@ -1,8 +1,14 @@ package com.jero.modules.lawsOpinionGather.service.impl; +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.common.exception.JeroBootException; import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; import com.jero.modules.lawsOpinionGather.mapper.LawsOpinionGatherEOMapper; import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService; +import com.jero.modules.project.enums.OperatorTypeEnum; +import com.jero.modules.project.enums.RequestSourceEnum; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; @@ -86,4 +92,36 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public Result processCall(JSONObject jsonObject) { + String requestSource = jsonObject.getString("requestSource"); + if(StringUtils.isEmpty(requestSource)){ + throw new JeroBootException("请求来源不能为空！"); + } + if(!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())){ + throw new JeroBootException("来源有误，没有权限调用该接口！"); + } + + String operatorType = jsonObject.getString("operatorType"); + if(StringUtils.isEmpty(operatorType)){ + throw new JeroBootException("操作类型不能为空！"); + } + + if(StringUtils.equals(operatorType, OperatorTypeEnum.ADD_LAWS_OPINION_GATHER.getValue())){ + Object lawsOpinionGatherInfoJson = jsonObject.get("lawsOpinionGatherInfo"); + LawsOpinionGatherEO lawsOpinionGatherEO = JSONObject.parseObject( + JSONObject.toJSONString(lawsOpinionGatherInfoJson),LawsOpinionGatherEO.class + ); + this.baseMapper.insert(lawsOpinionGatherEO); + } + + if(StringUtils.equals(operatorType, OperatorTypeEnum.UPDATE_LAWS_OPINION_GATHER_GATHER_RESULT.getValue())){ + LawsOpinionGatherEO lawsOpinionGatherEO = new LawsOpinionGatherEO(); + lawsOpinionGatherEO.setId(jsonObject.getString("id")); + lawsOpinionGatherEO.setGatherResult(jsonObject.getString("gatherResult")); + this.baseMapper.updateById(lawsOpinionGatherEO); + } + return new Result<>().success("调用成功！"); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java index 8cfb57597..77599194d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java @@ -1,9 +1,18 @@ package com.jero.modules.lawsOpinionGather.service.impl; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.common.exception.JeroBootException; import com.jero.modules.lawsOpinionGather.entity.LawsProcessHistoryEO; import com.jero.modules.lawsOpinionGather.mapper.LawsProcessHistoryEOMapper; import com.jero.modules.lawsOpinionGather.service.ILawsProcessHistoryEOService; +import com.jero.modules.project.enums.OperatorTypeEnum; +import com.jero.modules.project.enums.RequestSourceEnum; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; + +import java.util.ArrayList; import java.util.List; import java.util.Date; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -86,4 +95,32 @@ public class LawsProcessHistoryEOServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public Result processCall(JSONObject jsonObject) { + String requestSource = jsonObject.getString("requestSource"); + if(StringUtils.isEmpty(requestSource)){ + throw new JeroBootException("请求来源不能为空！"); + } + if(!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())){ + throw new JeroBootException("来源有误，没有权限调用该接口！"); + } + + String operatorType = jsonObject.getString("operatorType"); + if(StringUtils.isEmpty(operatorType)){ + throw new JeroBootException("操作类型不能为空！"); + } + if(StringUtils.equals(operatorType, OperatorTypeEnum.ADD.getValue())){ + JSONArray lawsProcessHistoryEOArray = jsonObject.getJSONArray("lawsProcessHistoryEOList"); + List lawsProcessHistoryEOList = new ArrayList<>(); + LawsProcessHistoryEO lawsProcessHistoryEO = null; + for (Object lawsProcessHistory : lawsProcessHistoryEOArray) { + lawsProcessHistoryEO = JSONObject.parseObject(JSONObject.toJSONString(lawsProcessHistory),LawsProcessHistoryEO.class); + lawsProcessHistoryEOList.add(lawsProcessHistoryEO); + } + this.saveBatch(lawsProcessHistoryEOList); + } + + return new Result<>().success("调用成功！"); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java index 7ec3d757c..145dfceda 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java @@ -36,6 +36,9 @@ public enum OperatorTypeEnum { QUERY_PREHOMO_STATISTICS("查询prehomo统计","queryPrehomoStatistics"), QUERY_VERIFY_STATISTICS("查询验证符合性统计","queryVerifyStatistics"), QUERY_CERTIFICATION_PROGRESS_STATISTICS("查询认证进度统计","queryCertificationProgressStatistics"), + + ADD_LAWS_OPINION_GATHER("添加法规意见收集数据","addLawsOpinionGather"), + UPDATE_LAWS_OPINION_GATHER_GATHER_RESULT("更新法规意见收集数据收集结果","updateLawsOpinionGatherGatherResult"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java index 704ac4a14..bf3b4ca11 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java @@ -68,6 +68,9 @@ public class workFlowController { jsonObject.put("id", FlowTypeEnum.YZFHXSCLC.getProcessDefinitionKey()); initConditionAssessmentEO(jsonObject); return this.activiti_define_start(jsonObject); + }else if(StringUtils.equals(type,FlowTypeEnum.FGYJSJLC.getValue())){ + jsonObject.put("id", FlowTypeEnum.FGYJSJLC.getProcessDefinitionKey()); + return this.activiti_define_start(jsonObject); }else{ return null; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java index 321b10971..159c3a27b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java @@ -9,6 +9,7 @@ public enum FlowTypeEnum { SJFHXSHLC("2","设计符合性审查流程","SJFHXSHLC","设计符合性审查流程","sjfhxlc"), PREHOMOQRLC("3","prehomo确认流程","PREHOMOQRLC","prehomo确认流程","prehomoqrlc"), YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc"), + FGYJSJLC("5","法规意见收集流程","FGYJSJLC","法规意见收集流程","fgyjsjlc"), ; private String value; From 2c0a57ffd3ec96f53e76f46583e283a3326dfe41 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 23 Jun 2022 15:16:57 +0800 Subject: [PATCH 072/140] [update] --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- jero-web/src/components/AssignedBy/index.vue | 4 ++-- jero-web/src/components/ReferenceParameter/index.vue | 8 ++++---- .../components/ParameterItemCollectionList.vue | 12 ++++++------ 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index e9aed8ea9..d691127e2 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -746,7 +746,7 @@ module.exports = { ListTitle: 'List Title', CopyProjectCollectionparameters: 'Copy Project Collection parameters', from: 'From', - ReferenceTo: 'Reference To', + ReferenceTo: 'To', checkTheDeadline: 'Select the collection deadline of the parameter item', accountNumber: 'Account Number', fullName: 'Full Name', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index dedee38fa..73b064809 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1047,5 +1047,5 @@ module.exports = { NOneDecimalPlace: '一位小数', NTwoDecimalplaces: '两位小数', NThreedecimalplaces: '三位小数', - NFourDecimalplaces: '四位小数' + NFourDecimalplaces: '四位小数', } \ No newline at end of file diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue index 062ac424f..044ea2d15 100644 --- a/jero-web/src/components/AssignedBy/index.vue +++ b/jero-web/src/components/AssignedBy/index.vue @@ -196,14 +196,14 @@ export default { }) .then( (res) =>{ if (res.data.success) { - _this.$message.success(res.data.result) + _this.$message.success(_this.$t('OperationSuccessful')) // 填写人 // 获取当前登陆人 this.$emit('GetgetLoginUserType') this.$emit('GetgetTableList') this.$emit('areaVisibleAssignedbyflag', false) }else{ - _this.$message.warning(res.data.result) + _this.$message.warning(_this.$t('operationFailed')) } }) .catch( (error) =>{ diff --git a/jero-web/src/components/ReferenceParameter/index.vue b/jero-web/src/components/ReferenceParameter/index.vue index 9c9b0a56b..5fe48ecdf 100644 --- a/jero-web/src/components/ReferenceParameter/index.vue +++ b/jero-web/src/components/ReferenceParameter/index.vue @@ -14,7 +14,7 @@
* -
从   
+
{{ $t('from') }}   
@@ -22,7 +22,7 @@ -
    配置
+
    {{ $t('configure') }}
 @@ -30,7 +30,7 @@
* -
引用到   
+
{{ $t('ReferenceTo') }}   
@@ -38,7 +38,7 @@ -
    配置
+
    {{ $t('configure') }}
 diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index e1e7a2918..26ae2de11 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -896,11 +896,11 @@ export default { }) .then( (res) =>{ if (res.data.success) { - _this.$message.success(res.data.message) + _this.$message.success(this.$t('OperationSuccessful')) _this.areaVisible = false _this.GetgetTableList() }else{ - _this.$message.warning(res.data.message) + _this.$message.warning(this.$t('operationFailed')) } }) .catch( (error) =>{ @@ -970,10 +970,10 @@ export default { onOk() { postAction(_this.url.add, configDataList).then((res) => { if (res.success) { - _this.$message.success(res.result) + _this.$message.success(_this.$t('OperationSuccessful')) _this.GetgetTableList() } else { - _this.$message.warning(this.$t('operationFailed')) + _this.$message.warning(_this.$t('operationFailed')) } }) } @@ -1016,7 +1016,7 @@ export default { }) .then( (res) =>{ if (res.data.success) { - _this.$message.success(res.data.result) + _this.$message.success(_this.$t('OperationSuccessful')) _this.GetgetTableList() _this.selectedRowKeysValue=[] }else{ @@ -1061,7 +1061,7 @@ export default { }) .then( (res) =>{ if (res.data.success) { - _this.$message.success(res.data.result) + _this.$message.success(_this.$t('OperationSuccessful')) _this.GetgetTableList() _this.selectedRowKeysValue=[] }else{ From b20978d0c128c246bfd341ebeefbc70bba3f070d Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 23 Jun 2022 15:35:26 +0800 Subject: [PATCH 073/140] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 6 + jero-web/src/common/lang/zh-cn.js | 6 + .../components/modules/fillAdd.vue | 39 +++- .../components/modules/releaseStandard.vue | 207 ++++++++++++++++++ .../components/modules/solicitOpinions.vue | 189 ++++++++++++++++ 5 files changed, 438 insertions(+), 9 deletions(-) create mode 100644 jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue create mode 100644 jero-web/src/views/businessSupport/regulationReport/components/modules/solicitOpinions.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index d691127e2..5cd056194 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -999,6 +999,12 @@ module.exports = { reason:'Reason', feedbackPoint:'Feedback point', link:'Link', + planNoChinese:'Plan No.', + standardNameCn:'Standard Name Cn', + standardNameEn:'Standard Name En', + deadlineForComments:'Deadline for comments', + standardNo:'Standard No', + implemenDate:'Implementation Date', // 上报库 Enable: 'Enable', Latestupdatetime: 'Latest update time', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 73b064809..5d89b3ac5 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1003,7 +1003,13 @@ module.exports = { questionsSuggestions:'问题/建议', link: '链接', reason:'附件', + planNoChinese:'计划号', feedbackPoint:'反馈点', + standardNameCn:'标准名称中文', + standardNameEn:'标准名称英文', + deadlineForComments:'征求意见截止日期', + standardNo:'标准编号', + implemenDate:'实施日期', // 上报库 Enable: '启用', Latestupdatetime: '最新更新时间', diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue index bbd18a05a..0725fd8db 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue @@ -25,7 +25,7 @@
- +
{{$t('bringInStandardInformation')}}
@@ -68,12 +68,12 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - v-model="formInline.chapterContents"> + v-model="formInline.contentTemplate"> - - {{ item.name }} + :key="item.id" + :value="item.id"> + + {{ item.text }} @@ -81,7 +81,9 @@ - + + +
@@ -94,11 +96,15 @@ + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/solicitOpinions.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/solicitOpinions.vue new file mode 100644 index 000000000..c0385f279 --- /dev/null +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/solicitOpinions.vue @@ -0,0 +1,189 @@ + + + + + + \ No newline at end of file From 9cc7b57b5cdf8587af332af48e9d1a7aafd127de Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 23 Jun 2022 15:42:34 +0800 Subject: [PATCH 074/140] [update] --- jero-web/src/common/lang/en-us.js | 5 +++-- jero-web/src/common/lang/zh-cn.js | 1 + .../components/TaskParameterCollection.vue | 3 +-- .../dialog/ProjectCollectionParameters.vue | 8 ++++---- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 5cd056194..2ff16be35 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -601,7 +601,7 @@ module.exports = { engineeringInterfacePerson: 'Engineering Interface', typeOfDeliverables: 'Deliverable Type', deliverableTemplate: 'Deliverable Template', - entryName: 'Project Name', + entryName: 'Name', targetMarket: 'Target Market', projectStatus: 'Status', StudioEngineer: 'R&H Studio', @@ -821,7 +821,7 @@ module.exports = { technicalEvaluationResults: 'Technical Evaluation Results', engineeringConfirmation: 'Engineering Deliverables', feedbackFromTheEngineer: 'Engineer Comment', - completedBy: 'Completed By', + completedBy: 'Sdt People', completedTime: 'Completed Time', replyFromProjectContactPerson: 'Assignee Reply', answer: 'Answer', @@ -1050,4 +1050,5 @@ module.exports = { NThreedecimalplaces: 'Decimal three', NFourDecimalplaces: 'Decimal four', yes: 'Yes', + Copyparameterlist: 'Copy parameter list', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 5d89b3ac5..24b4a2313 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1054,4 +1054,5 @@ module.exports = { NTwoDecimalplaces: '两位小数', NThreedecimalplaces: '三位小数', NFourDecimalplaces: '四位小数', + Copyparameterlist: '复制参数清单', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 831533fe6..d36609392 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -86,7 +86,7 @@ - + @@ -336,7 +336,6 @@ }, handleCody() { this.drawerVisible = true - this.titleTag = '项目收集参数' }, pageOnChange(page, pageSize) { this.pageNo = page diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue index 85431116e..ed106d350 100644 --- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue +++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue @@ -10,7 +10,7 @@ :wrapper-col='wrapperCol' > - + - + - + - + {{ $t('query') }} {{ $t('reset') }} From f1a49e407090200318903e6e4264d7e2f03aba59 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 23 Jun 2022 16:12:06 +0800 Subject: [PATCH 075/140] [update] --- .../src/views/parameter/parameterlist/index.vue | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 97febff5b..05402c7a7 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -197,8 +197,16 @@ export default { console.log(val,kk) }, handleTableChange(pagination, filters, sorter) { - this.queryParam.orderByField = 'nioNumber' - this.queryParam.orderBy = (sorter.order === 'descend' ? 'asc': 'desc') + let _i = sorter.order === 'descend' ? 'asc': 'desc' + let _tt = { + orderByField: 'nioNumber', + orderBy: _i + } + this.queryParam = { + ...this.queryParam, ..._tt + } + // this.queryParam.orderByField = 'nioNumber' + // this.queryParam.orderBy = (sorter.order === 'descend' ? 'asc': 'desc') this.getList() }, onClick(val,kk) { @@ -340,6 +348,8 @@ export default { }, addModelList() { this.pageNo = 1 + delete this.queryParam.orderBy + delete this.queryParam.orderByField this.getList() }, PersonnelSelectionChange(value, id) { From ce78b75ee582ac8e00d2066da80fd3b14f38d91f Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 23 Jun 2022 16:55:32 +0800 Subject: [PATCH 076/140] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93-=E5=B8=B8=E8=A7=84=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsReportDetailEOController.java | 34 +- .../report/entity/ParamsReportDetailEO.java | 1 + .../ParamsReportConfigDataEOMapper.java | 5 + .../mapper/ParamsReportDetailEOMapper.java | 8 +- .../xml/ParamsReportConfigDataEOMapper.xml | 12 + .../mapper/xml/ParamsReportDetailEOMapper.xml | 46 +++ .../IParamsReportConfigDataEOService.java | 4 + .../service/IParamsReportDetailEOService.java | 9 +- .../ParamsReportConfigDataEOServiceImpl.java | 7 + .../impl/ParamsReportDetailEOServiceImpl.java | 357 +++++++++++++++++- .../cert/report/vo/ParamsReportDetailVO.java | 51 +++ 11 files changed, 518 insertions(+), 16 deletions(-) create mode 100644 jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java index 9a77fc4bd..806a2b4e4 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java @@ -1,21 +1,26 @@ package com.jero.modules.cert.report.controller; +import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.jero.modules.cert.report.entity.ParamsReportDetailEO; import com.jero.modules.cert.report.service.IParamsReportDetailEOService; +import com.jero.modules.cert.report.vo.ParamsReportDetailVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -59,23 +64,32 @@ public class ParamsReportDetailEOController extends JeroController>> queryList(ParamsCollectManifestEO paramsCollectManifestEO, + public Result>> queryList(ParamsReportDetailEO paramsReportDetailEO, @RequestParam(name = "cut") String cut) { - if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) { - paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%")); + if (StringUtils.isNotEmpty(paramsReportDetailEO.getNioNumber())) { + paramsReportDetailEO.setNioNumber(paramsReportDetailEO.getNioNumber().replace("%","\\%")); } - if (StringUtils.isNotEmpty(paramsCollectManifestEO.getParamsName())) { - paramsCollectManifestEO.setParamsName(paramsCollectManifestEO.getParamsName().replace("%","\\%")); + if (StringUtils.isNotEmpty(paramsReportDetailEO.getParamsName())) { + paramsReportDetailEO.setParamsName(paramsReportDetailEO.getParamsName().replace("%","\\%")); } - if (StringUtils.isNotEmpty(paramsCollectManifestEO.getSdt())) { - paramsCollectManifestEO.setSdt(paramsCollectManifestEO.getSdt().replace("%","\\%")); + if (StringUtils.isNotEmpty(paramsReportDetailEO.getSdt())) { + paramsReportDetailEO.setSdt(paramsReportDetailEO.getSdt().replace("%","\\%")); } - if (StringUtils.isNotEmpty(paramsCollectManifestEO.getDre())) { - paramsCollectManifestEO.setDre(paramsCollectManifestEO.getDre().replace("%","\\%")); + if (StringUtils.isNotEmpty(paramsReportDetailEO.getDre())) { + paramsReportDetailEO.setDre(paramsReportDetailEO.getDre().replace("%","\\%")); } - List> list = paramsReportDetailEOService.queryList(paramsCollectManifestEO, cut); + List> list = paramsReportDetailEOService.queryList(paramsReportDetailEO, cut); return Result.OK(list); } + @ApiOperation(value = "上报库参数项-常规导出") + @GetMapping(value = "/exportNormal") +// @RequiresPermissions("report:detail:export:normal") + public void exportSplitInfoZip(ParamsReportDetailVO paramsReportDetailVO, + HttpServletResponse response, + HttpServletRequest request) { + paramsReportDetailEOService.exportNormal(paramsReportDetailVO, response, request); + } + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java index 4cf48e223..8c5168c7f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java @@ -1,5 +1,6 @@ package com.jero.modules.cert.report.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.modules.cert.collect.entity.ParamsCollectManifestBaseEO; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java index e2dbfceb8..7a8e4de2c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java @@ -2,6 +2,9 @@ package com.jero.modules.cert.report.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @Description: 上报库参数配置数据 @@ -11,4 +14,6 @@ import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO; */ public interface ParamsReportConfigDataEOMapper extends BaseMapper { + List selectByConfigIdListAndCollectManifestId(@Param("configIdList") List configIdList, + @Param("paramsCollectManifestId") String paramsCollectManifestId); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java index 811e0fc0f..fd988ecef 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java @@ -3,9 +3,11 @@ package com.jero.modules.cert.report.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.jero.modules.cert.report.entity.ParamsReportDetailEO; +import com.jero.modules.cert.report.vo.ParamsReportDetailVO; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * @Description: 上报库参数项 @@ -15,5 +17,9 @@ import java.util.List; */ public interface ParamsReportDetailEOMapper extends BaseMapper { - List listInfo(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO); + List listInfo(@Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO); + + List> listInfoForExport(@Param("idList") List idList, + @Param("paramsReportDetailEO") ParamsReportDetailVO paramsReportDetailEO); + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml index 2c27ef2ef..d21462bf6 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml @@ -14,4 +14,16 @@ + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml index ac6fd652e..0d1c94415 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml @@ -55,10 +55,56 @@ + + + + + AND prd.nio_number LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.nioNumber}),'%') + + + AND prd.params_name LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.paramsName}),'%') + + + AND prd.cert_category LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.certCategory}),'%') + + + AND prd.sdt LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.sdt}),'%') + + + AND prd.dre LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dre}),'%') + + + AND prd.params_manifest_id = #{paramsCollectManifestEO.paramsManifestId} + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java index ec80f7bf7..16dce9473 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java @@ -3,6 +3,8 @@ package com.jero.modules.cert.report.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO; +import java.util.List; + /** * @Description: 上报库参数配置数据 * @Author: jero-boot @@ -19,4 +21,6 @@ public interface IParamsReportConfigDataEOService extends IService queryByConfigIdListAndCollectManifestId(List paramsConfigIdList, String paramsCollectManifestId); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java index 382a8b276..e9378b330 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java @@ -3,7 +3,10 @@ package com.jero.modules.cert.report.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.jero.modules.cert.report.entity.ParamsReportDetailEO; +import com.jero.modules.cert.report.vo.ParamsReportDetailVO; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -17,11 +20,11 @@ public interface IParamsReportDetailEOService extends IService> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut); + List> queryList(ParamsReportDetailEO paramsReportDetailEO, String cut); /** * 列表表头中英文切换 @@ -31,4 +34,6 @@ public interface IParamsReportDetailEOService extends IService> getHeader(String paramsManifestId, String flag, String cut); + + void exportNormal(ParamsReportDetailVO paramsReportDetailVO, HttpServletResponse response, HttpServletRequest request); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java index 72134af05..ac69c6438 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java @@ -7,6 +7,8 @@ import com.jero.modules.cert.report.mapper.ParamsReportConfigDataEOMapper; import com.jero.modules.cert.report.service.IParamsReportConfigDataEOService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description: 上报库参数配置数据 * @Author: jero-boot @@ -31,4 +33,9 @@ public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl queryByConfigIdListAndCollectManifestId(List paramsConfigIdList, String paramsCollectManifestId) { + return baseMapper.selectByConfigIdListAndCollectManifestId(paramsConfigIdList, paramsCollectManifestId); + } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 53676b424..97a9c0be6 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -2,10 +2,14 @@ package com.jero.modules.cert.report.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ZipUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.constant.enums.YesOrNoEnum; +import com.jero.common.exception.JeroBootException; +import com.jero.common.util.oss.CosBootUtil; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; import com.jero.modules.cert.collect.entity.*; @@ -19,17 +23,42 @@ import com.jero.modules.cert.report.mapper.ParamsReportDetailEOMapper; import com.jero.modules.cert.report.service.IParamsReportConfigDataEOService; import com.jero.modules.cert.report.service.IParamsReportConfigEOService; import com.jero.modules.cert.report.service.IParamsReportDetailEOService; +import com.jero.modules.cert.report.vo.ParamsReportDetailVO; import com.jero.modules.cert.template.enums.ControlTypeEnum; +import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.ocr.util.LineHumpUtil; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.split.common.ConvertHtml2Excel; +import com.jero.modules.split.common.ReadExcel; +import com.jero.modules.split.dto.FileSpiltValTableExportDto; +import com.jero.modules.split.dto.FileSplitValExportDto; +import com.jero.modules.split.dto.FileSplitValImgExportDto; +import com.jero.modules.split.entity.SarFileSplitItemsValEO; +import com.jero.modules.split.page.SarFileSplitItemsEOPage; +import com.jero.modules.split.page.SarFileSplitItemsValEOPage; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.ISysDictItemService; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.common.usermodel.HyperlinkType; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.hssf.util.HSSFColor; +import org.apache.poi.ss.usermodel.CreationHelper; +import org.apache.poi.ss.usermodel.Hyperlink; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; import java.lang.reflect.Field; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; import java.util.*; import java.util.stream.Collectors; @@ -60,6 +89,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut) { - String paramsManifestId = paramsCollectManifestEO.getParamsManifestId(); + public List> queryList(ParamsReportDetailEO paramsReportDetailEO, String cut) { + String paramsManifestId = paramsReportDetailEO.getParamsManifestId(); - List list = paramsReportDetailEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 + List list = paramsReportDetailEOMapper.listInfo(paramsReportDetailEO); // 查询固定列 List paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); // 查询配置列 // 普通数据字典 @@ -442,6 +473,326 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl fieldList = Arrays.asList(field.split(",")); // list形式 + + // 查询导出数据 + List> allParamsInfoList = queryForExport(paramsReportDetailVO); // id记得去掉 + + // 开始处理工作表 + List allRelevFileList = new ArrayList<>(); + + // 在excel表中添加表头 + XSSFRow row = sheetItems.createRow(0); + for (int i = 0; i < headers.length; i++) { + XSSFCell cell = row.createCell(i); + HSSFRichTextString text = new HSSFRichTextString(headers[i]); + cell.setCellValue(text); + cell.setCellStyle(cellStyle1); + // 设置单元格宽度 + if("参数值".equals(headers[i])) { + sheetItems.setColumnWidth(i, 80 * 256); + } else { + sheetItems.setColumnWidth(i, 20 * 256); + } + } + //放文字内容 + int allRow = 0; + for(int rowNum = 0;rowNum < allParamsInfoList.size(); rowNum++){ + Map exportDto = allParamsInfoList.get(rowNum); + + // 处理文件 + List fileList = (List) exportDto.get("fileList"); + if (CollectionUtil.isNotEmpty(fileList)) { + allRelevFileList.addAll(fileList); + } + + allRow++; + XSSFRow row1 = sheetItems.createRow(allRow); + for(int cellNum = 0; cellNum < fieldList.size(); cellNum++){ + if (ObjectUtils.isNotEmpty(exportDto.get(fieldList.get(cellNum)))) { + row1.createCell(cellNum).setCellValue(exportDto.get(fieldList.get(cellNum)).toString()); + row1.getCell(cellNum).setCellStyle(cellStyle); + + } + } + + } + + //下载关联文件内容 + if (allRelevFileList != null && !allRelevFileList.isEmpty()) { + allRelevFileList = allRelevFileList.stream().distinct().collect(Collectors.toList()); + downLoadFileList(allRelevFileList,fileNowPath + File.separator + "导出文件"); + } + + String repFileName = fileName.replaceAll("/","_"); + excelOS = new FileOutputStream(fileNowPath + File.separator + repFileName); + response.setHeader("Content-Disposition", + "attachment; filename=\""+ ReadExcel.encodeFileName(fileOriName+".zip", request) +"\""); + response.setContentType("application/force-download"); + response.flushBuffer(); + os = response.getOutputStream(); + workbook.write(excelOS); + excelOS.flush(); + excelOS.close(); + ZipUtil.zip(fileNowPath,fileNowPath+".zip"); + FileInputStream fis = new FileInputStream(fileNowPath+".zip"); + int len = 0; + while ((len = fis.read()) != -1) { + os.write(len); + } + os.flush(); + os.close(); // 后开先关 + fis.close(); // 先开后关 + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new JeroBootException("下载文件失败，请重试"); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(os); + org.apache.poi.util.IOUtils.closeQuietly(excelOS); + } + } + + private void downLoadFileList(List allRelevFileList,String fileNowPath) { + for(OSSFile fileExportDto : allRelevFileList){ + String oldPath = fileExportDto.getUrl(); + String newPath = fileNowPath + File.separator + fileExportDto.getFileName(); + if (CosBootUtil.doesObjectExist(oldPath)){ + try (InputStream in = CosBootUtil.download(oldPath);) { + copyFile1(in, newPath); + } catch (IOException e) { + e.printStackTrace(); + log.error(e.getMessage(), e); + } + } + } + + } + + public void copyFile1(InputStream in, String destPath) throws IOException { + BufferedInputStream bis = new BufferedInputStream(in); + BufferedOutputStream bos = + new BufferedOutputStream(Files.newOutputStream(Paths.get(destPath), + StandardOpenOption.CREATE, + StandardOpenOption.TRUNCATE_EXISTING, + StandardOpenOption.WRITE)); + // 打开输入流 +// FileInputStream fis = new FileInputStream(srcPath); + // 打开输出流 +// FileOutputStream fos = new FileOutputStream(destPath); + // 读取和写入信息 + byte[] bytes = new byte[1024 * 1024]; + int len; + while ((len = bis.read(bytes)) > 0) { + bos.write(bytes, 0, len); + } + // 关闭流 先开后关 后开先关 + // 先开后关，先开的输入流，再开的输出流，那么应该先关输出流，再关输入流 + // 先关外层，再关内层。如BufferedInputStream包装了一个FileInputStream，那么先关BufferedInputStream，再关FileInputStream。 + bos.close(); // 后开先关 + bis.close(); // 先开后关 + } + + private List> queryForExport(ParamsReportDetailVO paramsReportDetailVO) { + List idList = Arrays.asList(paramsReportDetailVO.getIds()); + List configIdList = Arrays.asList(paramsReportDetailVO.getConfigIds()); + List> dataList = paramsReportDetailEOMapper.listInfoForExport(idList, paramsReportDetailVO); + + List paramsConfigEOList = paramsReportConfigEOService.queryList(paramsReportDetailVO.getParamsManifestId()); // 查询所有配置列 + List fileList = new ArrayList<>(); + // 查询配置列数据 + for (Map record1 : dataList) { + + String paramsCollectManifestId = (String) record1.get("id"); + + if (CollectionUtil.isNotEmpty(paramsConfigEOList)) { + //不合并 + if ("1".equals(paramsReportDetailVO.getCombineFlag())) { + paramsConfigEOList = paramsConfigEOList.stream().filter(e->configIdList.contains(e.getId())).collect(Collectors.toList()); // 过滤出要导出的配置列 + paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置 + + String paramsConfigId = paramsConfigEO.getId(); + ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 + StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 + if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { + configDataBuilder.append(paramsConfigDataEO.getTextData()).append("&"); + } + if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { + configDataBuilder.append(paramsConfigDataEO.getPullData()).append("&"); + } + if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) { + List ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId()); + if (CollectionUtil.isNotEmpty(ossFileList)) { + configDataBuilder.append(ossFileList.get(0).getFileName()).append("&"); + + fileList.addAll(ossFileList); + } + } + + String configData = configDataBuilder.toString(); + if (configData.contains("&")) { + configData = configData.substring(0, configData.lastIndexOf("&")); + } + + record1.put(paramsConfigEO.getId(), configData); + }); + + } else if ("2".equals(paramsReportDetailVO.getCombineFlag())) { // 合并 + String configData = ""; + List paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId); + + String textDatas = paramsReportConfigDataEOS.stream() + .map(ParamsReportConfigDataEO::getTextData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); + + String pullDatas = paramsReportConfigDataEOS.stream() + .map(ParamsReportConfigDataEO::getPullData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); + + List fileNameList = new ArrayList<>(); + paramsReportConfigDataEOS.forEach(paramsReportConfigDataEO -> { + if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) { + List ossFileList = ossFileService.getFileInfosByConnectId(paramsReportConfigDataEO.getFileConnectId()); + if (CollectionUtil.isNotEmpty(ossFileList)) { + fileNameList.add(ossFileList.get(0).getFileName()); + + fileList.addAll(ossFileList); + } + } + }); + + StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 + if (StringUtils.isNotEmpty(textDatas)) { + configDataBuilder.append(textDatas).append("&"); + } + if (StringUtils.isNotEmpty(pullDatas)) { + configDataBuilder.append(pullDatas).append("&"); + } + if (CollectionUtil.isNotEmpty(fileNameList)) { + configDataBuilder.append(StringUtils.join(fileNameList, ",")).append("&"); + } + configData = configDataBuilder.toString(); + if (configData.contains("&")) { + configData = configData.substring(0, configData.lastIndexOf("&")); + } + record1.put("params_value", configData); + + } + } + record1.put("fileList", fileList); + } + return dataList; + } + + /** + * 获取导出文件的表头 + * + * @return + */ + private String[] getWorkbookTitleForExport(ParamsReportDetailVO paramsReportDetailVO) { + String cut = paramsReportDetailVO.getCut(); + String certCategoryName = paramsReportDetailVO.getCertCategoryName(); + String paramsManifestId = paramsReportDetailVO.getParamsManifestId(); + String combineFlag = paramsReportDetailVO.getCombineFlag(); + List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.PARAMS_REPORT_DETAIL.getValue()); + + List dbFieldNameList = new ArrayList<>(); + List dbFieldList = new ArrayList<>(); + + if (fieldList.size() != 0) { + //过滤列表字段(is_show_list-->列表是否显示0否 1是) + fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); + } + + // 固定列 + List> list = new LinkedList<>(); + for (int i = 0; i < fieldList.size(); i++) { + OnlCgformField onlCgformField = fieldList.get(i); + Map map = new HashMap<>(); + String dbFieldName = onlCgformField.getDbFieldName(); + if ("nio_number".equals(dbFieldName) || "params_name".equals(dbFieldName)) { + dbFieldList.add(dbFieldName); + + if(CutEnum.CN.getValue().equals(cut)){ + dbFieldNameList.add(onlCgformField.getDbFieldTxt()); // 字段中文名 + }else{ + dbFieldNameList.add(onlCgformField.getDbFieldEnName()); // 字段英文名 + } + } + } + + // 认证类别列 + dbFieldList.add("cert_number"); + dbFieldList.add("cert_params_name"); + if(CutEnum.CN.getValue().equals(cut)){ + dbFieldNameList.add(certCategoryName + "编号"); // 字段中文名 + dbFieldNameList.add(certCategoryName + "参数名称"); // 字段中文名 + }else{ + dbFieldNameList.add(certCategoryName + " Number"); // 字段中文名 + dbFieldNameList.add(certCategoryName + " Params Name"); // 字段中文名 + } + + // 配置列 + if ("1".equals(combineFlag)) { + List paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); + List> listConfig = new LinkedList<>(); + for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) { + dbFieldList.add(paramsConfigEO.getId()); + dbFieldNameList.add(paramsConfigEO.getConfigName()); + } + } else if ("2".equals(combineFlag)) { + dbFieldList.add("params_value"); + if(CutEnum.CN.getValue().equals(cut)){ + dbFieldNameList.add("参数值"); // 字段中文名 + }else{ + dbFieldNameList.add("Params Values"); // 字段中文名 + } + } + + String[] title = new String[2]; + String dbFieldStr = StringUtils.join(dbFieldList, ","); + String dbFieldNameStr = StringUtils.join(dbFieldNameList, ","); + + title[0] = dbFieldStr; + title[1] = dbFieldNameStr; + return title; + } + /** * 获取一个类和其父类的所有属性 * diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java new file mode 100644 index 000000000..83d6c61ad --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java @@ -0,0 +1,51 @@ +package com.jero.modules.cert.report.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +@Data +public class ParamsReportDetailVO { + + /**nio编号*/ + @ApiModelProperty(value = "nio编号") + private String nioNumber; + + /**参数名称*/ + @ApiModelProperty(value = "参数名称") + private String paramsName; + + /**认证类别*/ + @ApiModelProperty(value = "认证类别") + private String certCategory; + + + /**工程接口人*/ + @ApiModelProperty(value = "工程接口人") + private String sdt; + + /**填写人*/ + @ApiModelProperty(value = "填写人") + private String dre; + + + @ApiModelProperty(value = "参数清单id") + private String paramsManifestId; + + @ApiModelProperty(value = "认证类别名称") + private String certCategoryName; + + private String ids; // 勾选导出 + private String configIds; // 导出的配置列 + private String combineFlag; // 合并标识 1-不合并，2-合并 + private String separator; // 分隔符 + + private String cut; + private String exportName; + +} From 84c6f03ee32fb04fac504362f35ea2308ac125af Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 23 Jun 2022 16:57:01 +0800 Subject: [PATCH 077/140] [update] --- .../views/projectManagement/dialog/ParameterTemplateAdd.vue | 4 +++- jero-web/src/views/projectManagement/dialog/configure.vue | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue index 10676ee15..b8ce6d873 100644 --- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue +++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue @@ -213,7 +213,9 @@ export default { } else if (this.selectedRowKeys.length > 1) { this.$message.warning(this.$t('OnlyOneSelected')) } else { - this.formData.title = this.formData.title.trim() + if(this.formData.title !== undefined) { + this.formData.title = this.formData.title.trim() + } this.$refs.ruleForm.validate(valid => { if (valid) { this.flag = true diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue index a9e61a78b..7a5aefc56 100644 --- a/jero-web/src/views/projectManagement/dialog/configure.vue +++ b/jero-web/src/views/projectManagement/dialog/configure.vue @@ -311,6 +311,7 @@ export default { deleteConfigIds: this.deleteConfigIds } let querycontentListItem = { ...querycontentList, ...paramsManifestId } + this.confirmLoading = true postAction(this.url.conAdd, querycontentListItem).then((res) => { if (res.success) { this.confirmLoading = false From 07476d3550e85d1b3ca601d1c5a78a9a267fe3b2 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 23 Jun 2022 18:01:25 +0800 Subject: [PATCH 078/140] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/regulatoryEarlyWarning/index.vue | 35 +++++++++++++++++-- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index 51f3a47b0..399f2b721 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -73,7 +73,8 @@ return { //url传参严格按照当前命名 url: { - seachList: 'document/bussDocumentLibraryEO/queryCondition' //搜索字段 + seachList: 'document/bussDocumentLibraryEO/queryCondition', //搜索字段 + list: '/LawsWarn/queryPageInfo' }, activeTab: this.$t('ImplementationDate'), loading: false, @@ -82,11 +83,12 @@ total: 0, pageSize: 10, pageNo: 1, + searchParmes: {}, searchQueryList: [ { field_show_type: 6, db_field_txt: this.$t('warningTime'), - db_field_name: 'warningTime' + db_field_name: 'WarnTime' } ], @@ -165,23 +167,27 @@ } }, mounted() { + this.getList() eventBUs.$on('searchQuery', search => { Object.keys(search).forEach(res => { if (search[res] instanceof Array) { search[res] = search[res].join(',') } }) + this.pageNo = 1 this.searchParmes = search this.getList() }) eventBUs.$on('searchReset', target => { this.searchParmes = {} + this.pageNo = 1 this.getList() }) }, methods: { callback(tab) { this.activeTab = tab + this.getList() }, onSelectChange(value) { this.selectedRowKeys = value @@ -205,7 +211,30 @@ this.getList() }, getList() { - + let flag + if (this.activeTab == this.$t('ImplementationDate')) { + flag = 0 + } else { + flag = 1 + } + let params = { + ...this.searchParmes, + pageNo: this.pageNo, + pageSize: this.pageSize, + flag: flag + } + this.loading = true + postAction(this.url.list, params).then((res) => { + if (res.success) { + this.dataSource = res.result.records + this.total = res.result.total + this.loading = false + } else { + this.loading = false + } + }).finally(() => { + this.loading = false + }) } } } From ac030c45fee8f4ab72127e196abb4693ad4e0cf2 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 23 Jun 2022 18:15:16 +0800 Subject: [PATCH 079/140] [update] --- jero-web/src/config/router.config.js | 5 + .../parameter/escalationlibrary/index.vue | 17 +- .../parameter/managementdetails/index.vue | 456 ++++++++++++++++++ 3 files changed, 465 insertions(+), 13 deletions(-) create mode 100644 jero-web/src/views/parameter/managementdetails/index.vue diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index c00cf28f2..bbe11e197 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -352,6 +352,11 @@ export const constantRouterMap = [ name: 'ParameterItemCollection', component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/components/ParameterItemCollectionList') }, + { + path: '/managementdetails', + name: 'managementdetails', + component: () => import(/* webpackChunkName: "user" */ '@/views/parameter/managementdetails/index') + }, { path: '/taskListProcess', name: 'taskListProcess', diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue index 900f58345..65bf2c916 100644 --- a/jero-web/src/views/parameter/escalationlibrary/index.vue +++ b/jero-web/src/views/parameter/escalationlibrary/index.vue @@ -182,20 +182,11 @@ export default { }, //删除 deleteLib(val) { - let _this = this - this.$confirm({ - content: _this.$t('ConfirmDelete'), - onOk() { - getAction(_this.url.deleteBatch, { id: val.id }).then((res) => { - if (res.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.getList() - } else { - _this.$message.warning(_this.$t('operationFailed')) - } - }) - } + let newUrl = this.$router.resolve({ + path: '/managementdetails', + query: val }) + window.open(newUrl.href, '_blank') }, //虚拟清单名称事件 entryNameClick(item) { diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue new file mode 100644 index 000000000..d09c296c8 --- /dev/null +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -0,0 +1,456 @@ + + + + + \ No newline at end of file From be9d3cc85b3a4ca8914790dc22719c24ad92ab5b Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 23 Jun 2022 18:19:55 +0800 Subject: [PATCH 080/140] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93-=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/ParamsReportDetailEOMapper.java | 2 +- .../mapper/xml/ParamsReportDetailEOMapper.xml | 52 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java index fd988ecef..ec54aeed7 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java @@ -20,6 +20,6 @@ public interface ParamsReportDetailEOMapper extends BaseMapper listInfo(@Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO); List> listInfoForExport(@Param("idList") List idList, - @Param("paramsReportDetailEO") ParamsReportDetailVO paramsReportDetailEO); + @Param("paramsReportDetailVO") ParamsReportDetailVO paramsReportDetailVO); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml index 0d1c94415..084de679a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml @@ -31,24 +31,24 @@ - - - AND nio_number LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.nioNumber}),'%') + + + AND nio_number LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.nioNumber}),'%') - - AND params_name LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.paramsName}),'%') + + AND params_name LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.paramsName}),'%') - - AND cert_category LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.certCategory}),'%') + + AND cert_category LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.certCategory}),'%') - - AND sdt LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.sdt}),'%') + + AND sdt LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.sdt}),'%') - - AND dre LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dre}),'%') + + AND dre LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.dre}),'%') - - AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId} + + AND params_manifest_id = #{paramsReportDetailEO.paramsManifestId} @@ -57,24 +57,24 @@ - - - AND prd.nio_number LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.nioNumber}),'%') + + + AND prd.nio_number LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.nioNumber}),'%') - - AND prd.params_name LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.paramsName}),'%') + + AND prd.params_name LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.paramsName}),'%') - - AND prd.cert_category LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.certCategory}),'%') + + AND prd.cert_category LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.certCategory}),'%') - - AND prd.sdt LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.sdt}),'%') + + AND prd.sdt LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.sdt}),'%') - - AND prd.dre LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dre}),'%') + + AND prd.dre LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.dre}),'%') - - AND prd.params_manifest_id = #{paramsCollectManifestEO.paramsManifestId} + + AND prd.params_manifest_id = #{paramsReportDetailVO.paramsManifestId} From 380d62d79719303f4bde99adf57009369c06ca8a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 23 Jun 2022 19:18:44 +0800 Subject: [PATCH 081/140] =?UTF-8?q?=E6=B3=95=E8=A7=84=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 25 ++++- .../warn/controller/LawsWarnController.java | 49 ++++++++++ .../modules/warn/service/LawsWarnService.java | 95 +++++++++++++++++++ 3 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index fe6c9e3f8..2a201f721 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -3574,8 +3574,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl parameter) { + public String getConditionStr(Map parameter) { String cut = (String) parameter.get("cut"); + String flag = String.valueOf(parameter.get("flag")); //查询条件 StringBuilder conditionSb = new StringBuilder("where 1 = 1"); @@ -3640,6 +3641,28 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl= '" + warnTime.split(",")[0] + "'" + + " and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'"); + } else { + conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') = '" + warnTime + "'"); + } + }else{ + //日期(区分单日期还时间范围) + if (warnTime.contains(",")) { + conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'" + + " and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'"); + } else { + conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') = '" + warnTime + "'"); + } + } + } + //高级搜索 queryConditionVOList List if(ObjectUtils.isNotEmpty(parameter.get("queryConditionVOList"))){ String queryConditionVOListStr = (String) parameter.get("queryConditionVOList"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java new file mode 100644 index 000000000..90f86844f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java @@ -0,0 +1,49 @@ +package com.jero.modules.warn.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.modules.warn.service.LawsWarnService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import net.sf.json.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +/** + * @description + * @date 2022/6/20 11:54 + * @auth zhn + */ +@Api(tags="法规预警") +@RestController +@RequestMapping("/LawsWarn") +@Slf4j +public class LawsWarnController { + + @Autowired + private LawsWarnService lawsWarnService; + + + /** + * 分页列表查询 + * @param parameter + * @return + */ + @ApiOperation(value="分页查询", notes="分页查询") + @PostMapping(value = "/queryPageInfo") + @ResponseBody +// @RequiresPermissions("document:queryPageInfo") + public JSONObject queryPageInfo(@RequestBody Map parameter) { + IPage infoPage = lawsWarnService.getInfoPage(parameter); + Result ok = Result.OK(infoPage); + JSONObject jsonResult = JSONObject.fromObject(ok); + return jsonResult; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java new file mode 100644 index 000000000..fabab41bc --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -0,0 +1,95 @@ +package com.jero.modules.warn.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.ModuleEnum; +import com.jero.generater.modules.online.cgform.entity.OnlCgformField; +import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; +import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; +import com.jero.modules.system.entity.SysCategory; +import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.service.impl.SysCategoryServiceImpl; +import com.jero.modules.system.service.impl.SysDictItemServiceImpl; +import com.jero.modules.system.util.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @description + * @date 2022/6/20 11:55 + * @auth zhn + */ +@Service +public class LawsWarnService { + @Autowired + private BussDocumentLibraryEOServiceImpl bussDocumentLibraryEOService; + @Autowired + private BussDocumentLibraryEOMapper bussDocumentLibraryEOMapper; + @Autowired + private SysCategoryServiceImpl sysCategoryService; + @Autowired + private SysDictItemServiceImpl sysDictItemServiceImpl; + @Autowired + private OnlCgformFieldServiceImpl onlCgformFieldService; + + public IPage getInfoPage(Map parameter) { + String cut = (String) parameter.get("cut");//中英文切换标识 + List onlCgformFieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); + //查询的字段 + String fieldQuery = "id,serial_number,title,title_en,state,region,technology_territory,xin1_che1_xing2_shi2_shi1_ri4_qi1,implement_time"; + List fieldList = Arrays.asList(fieldQuery.split(",")); + + List fieldListNew = new ArrayList<>(); + for (String field : fieldList) { + String fieldTemp = null; + if ("xin1_che1_xing2_shi2_shi1_ri4_qi1".equals(field) || "implement_time".equals(field)) { + String fieldNew = "date_format(" + field + ", '%Y-%m-%d')"; + fieldTemp = "case when " + fieldNew + " is null then \"\" else " + fieldNew + " end " + field; + fieldListNew.add(fieldTemp); + } else { + fieldTemp = "case when " + field + " is null then \"\" else " + field + " end " + field; + fieldListNew.add(fieldTemp); + } + } + parameter.remove("warnTime"); + //封装查询条件(包含高级搜索) + String condition = bussDocumentLibraryEOService.getConditionStr(parameter); + int pageNo = Integer.parseInt(parameter.get("pageNo").toString()); + int pageSize = Integer.parseInt(parameter.get("pageSize").toString()); + IPage page = new Page(pageNo, pageSize); + IPage infoPage = bussDocumentLibraryEOMapper.getInfoPage(page, " " + StringUtils.join(fieldListNew, ","), condition); + + + //树形数据字典 + List categoryList = sysCategoryService.list(); + //数据字典 + List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); + List onlCgformFieldListTemp = onlCgformFieldList.stream().filter(e -> fieldList.contains(e.getDbFieldName())).collect(Collectors.toList()); + List records = infoPage.getRecords(); + for (Map record : records) { + //处理标题 + if(CutEnum.EN.getValue().equals(cut)){ + record.put("title",record.get("title_en")); + } + Map record1 = (Map) record; + List treeFieldList = new ArrayList<>(); + OnlCgformField onlCgformField = new OnlCgformField(); + onlCgformField.setDbFieldName("technology_territory"); + treeFieldList.add(onlCgformField); + for (Map.Entry entry : record1.entrySet()) { + //下拉选处理数据字典 + bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, onlCgformFieldListTemp,null); + bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null); + } + } + return infoPage; + } +} From dd5db0cbeba9b22b936fd1e384f08daf3902d980 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 23 Jun 2022 21:30:58 +0800 Subject: [PATCH 082/140] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warn/controller/LawsWarnController.java | 14 ++ .../modules/warn/service/LawsWarnService.java | 162 +++++++++++++++++- 2 files changed, 174 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java index 90f86844f..e74043811 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java @@ -8,12 +8,16 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import net.sf.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.Map; /** @@ -46,4 +50,14 @@ public class LawsWarnController { JSONObject jsonResult = JSONObject.fromObject(ok); return jsonResult; } + + @ApiOperation(value = "导出excel") + @GetMapping(value = "/exportExcel") +// @RequiresPermissions("document:exportExcel") + public void exportExcel(@RequestParam Map map, + HttpServletResponse response, + HttpServletRequest request){ + lawsWarnService.exportExcel(map,response,request); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index fabab41bc..21215861f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.constant.enums.CutEnum; import com.jero.common.constant.enums.ModuleEnum; +import com.jero.common.exception.JeroBootException; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; import com.jero.modules.system.entity.SysCategory; @@ -13,11 +15,24 @@ import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -59,8 +74,7 @@ public class LawsWarnService { fieldListNew.add(fieldTemp); } } - parameter.remove("warnTime"); - //封装查询条件(包含高级搜索) + //封装查询条件 String condition = bussDocumentLibraryEOService.getConditionStr(parameter); int pageNo = Integer.parseInt(parameter.get("pageNo").toString()); int pageSize = Integer.parseInt(parameter.get("pageSize").toString()); @@ -92,4 +106,148 @@ public class LawsWarnService { } return infoPage; } + + public void exportExcel(Map map, HttpServletResponse response, HttpServletRequest request) { + String cut = (String) map.get("cut"); + String flag = String.valueOf(map.get("flag")); + List onlCgformFieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); + onlCgformFieldList = onlCgformFieldList.stream().filter(e -> !"id".equals(e.getDbFieldName()) + && !"create_by".equals(e.getDbFieldName()) + && !"create_time".equals(e.getDbFieldName()) + && !"update_by".equals(e.getDbFieldName()) + && !"update_time".equals(e.getDbFieldName()) + && !"sys_org_code".equals(e.getDbFieldName())).collect(Collectors.toList()); + //要查询的字段 + String fieldQuery = "id,serial_number,title,title_en,state,region,technology_territory,xin1_che1_xing2_shi2_shi1_ri4_qi1,implement_time"; + List fieldList = Arrays.asList(fieldQuery.split(",")); + //封装查询条件(包含高级搜索) + String condition = bussDocumentLibraryEOService.getConditionStr(map); + List> datas = bussDocumentLibraryEOMapper.getInfoList(" " + StringUtils.join(fieldList, ","), condition); + //部分导出 + String partId = (String) map.get("id"); + if (StringUtils.isNotBlank(partId)) { + //部门导出的数据 + datas = datas.stream().filter(entry -> partId.contains((String) entry.get("id"))).collect(Collectors.toList()); + } + OutputStream os = null; + Workbook workbook = new XSSFWorkbook(); + //创建工作表对象 + Sheet sheet = workbook.createSheet(); + String dateName = ""; + + // 创建头部 + String header = ""; + if(CutEnum.CN.getValue().equals(cut)){ + header = "编号,标题,状态,适用地区,技术领域,"; + if("0".equals(flag)){ + dateName = "新车型实施日期"; + }else{ + dateName = "在产车实施日期"; + } + }else{ + header = "Number,Title,Status,region,Technical Field,"; + if("0".equals(flag)){ + dateName = "New Type Execution Date"; + }else{ + dateName = "New Vehicle Execution Date"; + } + } + header = header +dateName; + + bussDocumentLibraryEOService.createHeader(workbook, sheet, header); + List onlCgformFieldListTemp = new LinkedList<>(); + List numberOnlCgformField = onlCgformFieldList.stream().filter(e -> "serial_number".equals(e.getDbFieldName())).collect(Collectors.toList()); + List titleOnlCgformField = onlCgformFieldList.stream().filter(e -> "title".equals(e.getDbFieldName())).collect(Collectors.toList()); + List titleEnOnlCgformField = onlCgformFieldList.stream().filter(e -> "title_en".equals(e.getDbFieldName())).collect(Collectors.toList()); + List stateOnlCgformField = onlCgformFieldList.stream().filter(e -> "state".equals(e.getDbFieldName())).collect(Collectors.toList()); + List regionOnlCgformField = onlCgformFieldList.stream().filter(e -> "region".equals(e.getDbFieldName())).collect(Collectors.toList()); + List technologyOnlCgformField = onlCgformFieldList.stream().filter(e -> "technology_territory".equals(e.getDbFieldName())).collect(Collectors.toList()); + List newCarOnlCgformField = onlCgformFieldList.stream().filter(e -> "xin1_che1_xing2_shi2_shi1_ri4_qi1".equals(e.getDbFieldName())).collect(Collectors.toList()); + List implementOnlCgformField = onlCgformFieldList.stream().filter(e -> "implement_time".equals(e.getDbFieldName())).collect(Collectors.toList()); + onlCgformFieldListTemp.addAll(numberOnlCgformField); + onlCgformFieldListTemp.addAll(titleOnlCgformField); + onlCgformFieldListTemp.addAll(titleEnOnlCgformField); + onlCgformFieldListTemp.addAll(stateOnlCgformField); + onlCgformFieldListTemp.addAll(regionOnlCgformField); + onlCgformFieldListTemp.addAll(technologyOnlCgformField); + onlCgformFieldListTemp.addAll(newCarOnlCgformField); + onlCgformFieldListTemp.addAll(implementOnlCgformField); + // 创建数据 + createDatas(workbook, sheet, datas,onlCgformFieldListTemp, cut,flag); + try { + os = response.getOutputStream(); + workbook.write(os); + os.flush(); + } catch (IOException e) { + if(CutEnum.CN.getValue().equals(cut)){ + throw new JeroBootException("导出失败"); + }else{ + throw new JeroBootException("Export failure"); + } + } + } + + void createDatas(Workbook workbook, Sheet sheet, List> datas,List onlCgformFieldListTemp, String cut,String flag){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + CellStyle cellStyle = workbook.createCellStyle();//初始化单元格格式对象 + cellStyle.setAlignment(HorizontalAlignment.CENTER); + //数据字典 + List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); + //树形数据字典 + List categoryList = sysCategoryService.list(); + + //过滤出树形字段 + List treeFieldList = onlCgformFieldListTemp.stream() + .filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + //下拉单选,多选 + List pullFieldList = onlCgformFieldListTemp.stream() + .filter(e -> FieldTypeEnum.PULL_SINGLE.getValue().equals(e.getFieldShowType()) || FieldTypeEnum.PULL_MORE.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + + int i = 0; + for (Map data : datas) { + if(CutEnum.CN.getValue().equals(cut)){ + data.remove("title_en"); + }else{ + data.remove("title"); + } + if("0".equals(flag)){ + data.remove("implement_time"); + }else{ + data.remove("xin1_che1_xing2_shi2_shi1_ri4_qi1"); + } + List onlCgformFieldList = new LinkedList<>(); + for (Map.Entry entry : data.entrySet()) { + List collect = onlCgformFieldListTemp.stream().filter(e -> e.getDbFieldName().equals(entry.getKey())).collect(Collectors.toList()); + onlCgformFieldList.addAll(collect); + //下拉选处理数据字典 + bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, pullFieldList,null); + //处理树形数据字典 + bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null); + } + + Row row = sheet.createRow(i + 1); + i++; + int sheetNum = 0; + + for (OnlCgformField onlCgformField : onlCgformFieldList) { + String value = ""; + //时间类型 + if (FieldTypeEnum.DATE_SINGLE.getValue().equals(onlCgformField.getFieldShowType())) { + if (ObjectUtils.isNotEmpty(data.get(onlCgformField.getDbFieldName()))) { + value = sdf.format(data.get(onlCgformField.getDbFieldName())); + } + } else { + value = StringUtils.valueOf(data.get(onlCgformField.getDbFieldName())); + } + if("null".equals(value)){ + value = ""; + } + row.createCell(sheetNum).setCellValue(value); + sheetNum++; + } + } + + } } From 3494e0cc9a6b54ecb1e8bd88ecd714485d0dd5f2 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 27 Jun 2022 10:36:43 +0800 Subject: [PATCH 083/140] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=E6=89=A9?= =?UTF-8?q?=E5=B1=95=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E6=A0=87=E8=AF=86?= =?UTF-8?q?(=E7=BA=A2=E8=89=B2=E5=BA=95=E8=89=B2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 4 +- .../entity/ParamsCollectManifestEO.java | 5 + .../enums/CollectManifestChangeFlagEnum.java | 4 +- .../xml/ParamsCollectManifestEOMapper.xml | 1 + .../impl/ParamsManifestEOServiceImpl.java | 95 +++++++++++-------- .../service/impl/ParamsInfoEOServiceImpl.java | 20 +++- 6 files changed, 89 insertions(+), 40 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index cbbca7f82..2cee5351c 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -58,4 +58,6 @@ CREATE TABLE `laws_process_history` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规-流程历史表' ROW_FORMAT = Dynamic; - +-- 参数项收集清单表 添加字段 +ALTER TABLE `laws_weilai`.`params_collect_manifest` + ADD COLUMN `del_flag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标识' AFTER `change_flag`; \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java index 10e880fa3..48e923c42 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java @@ -35,6 +35,11 @@ public class ParamsCollectManifestEO extends ParamsCollectManifestBaseEO impleme @ApiModelProperty(value = "变更标识") private String changeFlag; + /**删除标识*/ + @Excel(name = "删除标识", width = 15) + @ApiModelProperty(value = "删除标识") + private String delFlag; + @TableField(exist = false) private String userTypes; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java index e807d9b8c..399c666b1 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java @@ -7,7 +7,9 @@ package com.jero.modules.cert.collect.enums; */ public enum CollectManifestChangeFlagEnum { CHANGE_BEFORE("变更前","0"), - CHANGE_AFTER("变更后","1"); + CHANGE_AFTER("变更后","1"), + DELETE_BEFORE("变更时未删除","0"), + DELETE_AFTER("变更时已删除","1"); String name; String value; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml index 794c1e696..0f5304025 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml @@ -27,6 +27,7 @@ + diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index a98fc0d03..a33e6ac74 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -378,57 +378,78 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl nioNumberList = oldParamsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList()); - List sameList = newParamsInfoPublishEOList.stream().filter(e->nioNumberList.contains(e.getNioNumber())).collect(Collectors.toList()); + List oldNioNumberList = oldParamsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList()); + List sameList = newParamsInfoPublishEOList.stream().filter(e->oldNioNumberList.contains(e.getNioNumber())).collect(Collectors.toList()); + + List newNioNumberList = sameList.stream().map(ParamsInfoPublishEO::getNioNumber).collect(Collectors.toList()); + List diffList = oldParamsCollectManifestEOList.stream().filter(e->!newNioNumberList.contains(e.getNioNumber())).collect(Collectors.toList()); + List delCollectManifestIdList = new ArrayList<>(); List updateCollectManifestEOList = new ArrayList<>(); - for (ParamsInfoPublishEO paramsInfoPublishEO : sameList) { - ParamsCollectManifestEO oldCollectManifestEO = oldParamsCollectManifestEOList.stream() - .filter(e->e.getNioNumber().equals(paramsInfoPublishEO.getNioNumber())) - .collect(Collectors.toList()).get(0); - String newControlType = paramsInfoPublishEO.getControlType(); - String newControlVerify = paramsInfoPublishEO.getControlVerify(); - String newControlValues = paramsInfoPublishEO.getControlValues(); + // 模板里没有，清单里有 + if (CollectionUtil.isNotEmpty(diffList)) { + for (ParamsCollectManifestEO oldCollectManifestEO : diffList) { + ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO(); + updateCollectManifestEO.setId(oldCollectManifestEO.getId()); + updateCollectManifestEO.setState(CollectManifestStateEnum.CHANGE.getValue()); + updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 标记为变更前参数项 + updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_AFTER.getValue()); // 因新发布模板中没有该参数项，标记为变更时已删除参数项 - String oldControlType = oldCollectManifestEO.getControlType(); - String oldControlVerify = oldCollectManifestEO.getControlVerify(); - String oldControlValues = oldCollectManifestEO.getControlValues(); + updateCollectManifestEOList.add(updateCollectManifestEO); + } + } - ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO(); - BeanUtils.copyProperties(paramsInfoPublishEO, updateCollectManifestEO); - // 比较参数填写规则 - if (!newControlType.equals(oldControlType) - || (newControlVerify != null && !newControlVerify.equals(oldControlVerify)) - || (oldControlVerify != null && !oldControlVerify.equals(newControlVerify)) - || (newControlValues != null && !newControlValues.equals(oldControlValues)) - || (oldControlValues != null && !oldControlValues.equals(newControlValues))) { + // 模板里有，清单里也有 + if (CollectionUtil.isNotEmpty(sameList)) { + for (ParamsInfoPublishEO paramsInfoPublishEO : sameList) { + ParamsCollectManifestEO oldCollectManifestEO = oldParamsCollectManifestEOList.stream() + .filter(e -> e.getNioNumber().equals(paramsInfoPublishEO.getNioNumber())) + .collect(Collectors.toList()).get(0); + String newControlType = paramsInfoPublishEO.getControlType(); + String newControlVerify = paramsInfoPublishEO.getControlVerify(); + String newControlValues = paramsInfoPublishEO.getControlValues(); - // 参数填写规则改变，删除参数项配置数据，状态变为：待发起收集，拍列表前边 - updateCollectManifestEO.setId(oldCollectManifestEO.getId()); // 为收集参数项id - updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue()); - updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_AFTER.getValue()); + String oldControlType = oldCollectManifestEO.getControlType(); + String oldControlVerify = oldCollectManifestEO.getControlVerify(); + String oldControlValues = oldCollectManifestEO.getControlValues(); + + ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO(); + BeanUtils.copyProperties(paramsInfoPublishEO, updateCollectManifestEO); + // 比较参数填写规则 + if (!newControlType.equals(oldControlType) + || (newControlVerify != null && !newControlVerify.equals(oldControlVerify)) + || (oldControlVerify != null && !oldControlVerify.equals(newControlVerify)) + || (newControlValues != null && !newControlValues.equals(oldControlValues)) + || (oldControlValues != null && !oldControlValues.equals(newControlValues))) { + + // 参数填写规则改变，删除参数项配置数据，状态变为：待发起收集，拍列表前边 + updateCollectManifestEO.setId(oldCollectManifestEO.getId()); // 为收集参数项id + updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue()); + updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_AFTER.getValue()); // 因新发布模板中该参数项控件变化，标记为变更后参数项 + updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 标记为变更时未删除参数项 // updateCollectManifestEO.setControlType(newControlType); // updateCollectManifestEO.setControlVerify(newControlVerify); // updateCollectManifestEO.setControlValues(newControlValues); - delCollectManifestIdList.add(oldCollectManifestEO.getId()); - } else { - // 参数填写规则没有改变，状态变为：变更 - updateCollectManifestEO.setId(oldCollectManifestEO.getId()); - updateCollectManifestEO.setState(CollectManifestStateEnum.CHANGE.getValue()); - updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); + delCollectManifestIdList.add(oldCollectManifestEO.getId()); + } else { + // 参数填写规则没有改变，状态变为：变更 + updateCollectManifestEO.setId(oldCollectManifestEO.getId()); + updateCollectManifestEO.setState(CollectManifestStateEnum.CHANGE.getValue()); + updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 标记为变更前参数项 + updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 标记为变更时未删除参数项 - } - // 更新附件模板字段 - if (StringUtils.isNotEmpty(paramsInfoPublishEO.getFileTemplateConnectId())) { - updateCollectManifestEO.setFileTemplateConnectId(paramsInfoPublishEO.getFileTemplateConnectId()); - } + } + // 更新附件模板字段 + if (StringUtils.isNotEmpty(paramsInfoPublishEO.getFileTemplateConnectId())) { + updateCollectManifestEO.setFileTemplateConnectId(paramsInfoPublishEO.getFileTemplateConnectId()); + } - updateCollectManifestEOList.add(updateCollectManifestEO); + updateCollectManifestEOList.add(updateCollectManifestEO); + } } - // 删除参数项配置数据 if (CollectionUtil.isNotEmpty(delCollectManifestIdList)) { paramsConfigDataEOService.deleteByParamsCollectManifestIdList(delCollectManifestIdList); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 4f06abf50..b360a0c73 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -110,6 +110,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber()); + queryWrapper.eq(ParamsInfoEO::getParamsTemplateId, paramsInfoEO.getParamsTemplateId()); List paramsInfoEOList = list(queryWrapper); if (CollectionUtil.isNotEmpty(paramsInfoEOList)) { if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { @@ -189,6 +190,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber()); + queryWrapper.eq(ParamsInfoEO::getParamsTemplateId, paramsInfoEO.getParamsTemplateId()); List paramsInfoEOList = list(queryWrapper); if (CollectionUtil.isNotEmpty(paramsInfoEOList)) { if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { @@ -1051,6 +1053,8 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl stringMessage = new ArrayList<>(); + List nioNumberImport = new ArrayList<>(); // 记录导入的nio编号 + int i = 1; //记录行号 int num = 0; //记录是第几条数据 //循环验证数据 @@ -1080,12 +1084,26 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl Date: Mon, 27 Jun 2022 10:41:08 +0800 Subject: [PATCH 084/140] [update] --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../parameter/parameterlist/components/addModel.vue | 4 ++-- .../src/views/projectManagement/dialog/configure.vue | 10 +++++----- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 2ff16be35..20b4d9b34 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1018,6 +1018,7 @@ module.exports = { Synchronizedatabase: 'Synchronize the data of the selected row to the database?', Aftersynchronization: 'After synchronization, the parameter items cannot be modified. Only the collection can be redistributed. The parameters have been updated', FNumber: 'Number', + NNNiONumber: 'Number', NNiONumber: 'NIO Number', NRequired: 'Is Must', NParameterName: 'Params Name', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 24b4a2313..bff99211c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1023,6 +1023,7 @@ module.exports = { Synchronizedatabase: '是否同步选中行数据至上报库?', Aftersynchronization: '同步后的参数项将不可修改,仅能重新下发收集,已更新参数', FNumber: '账号', + NNNiONumber: 'NIO编号', NNiONumber: 'NIO编号', NRequired: '是否必填', NParameterName: '参数名称', diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 3fef55e8f..594a1bc86 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -236,13 +236,13 @@
* {{$t('NNiONumber')}} + :title="$t('NNNiONumber')">{{$t('NNNiONumber')}}
+ :placeholder="$t('PleaseEnter')+$t('NNNiONumber')"/>
diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue index 7a5aefc56..c8d32971f 100644 --- a/jero-web/src/views/projectManagement/dialog/configure.vue +++ b/jero-web/src/views/projectManagement/dialog/configure.vue @@ -251,7 +251,7 @@ export default { let flag = 1 this.paramsConfigEOList.forEach((item) => { // 配置名称 - if(item.configName == ''){ + if(item.configName.trim() == ''){ this.$message.warning(this.$t('configurationName')+this.$t('cannotEmpty')) flag = 0 return @@ -261,7 +261,7 @@ export default { return } // 车型 - if(item.carType == ''){ + if(item.carType.trim() == ''){ this.$message.warning(this.$t('Model')+this.$t('cannotEmpty')) flag = 0 return @@ -271,7 +271,7 @@ export default { return } // 版本 - if(item.version == ''){ + if(item.version.trim() == ''){ this.$message.warning(this.$t('Version')+this.$t('cannotEmpty')) flag = 0 return @@ -281,7 +281,7 @@ export default { return } // 电池 - if(item.battery == ''){ + if(item.battery.trim() == ''){ this.$message.warning(this.$t('Battery')+this.$t('cannotEmpty')) flag = 0 return @@ -291,7 +291,7 @@ export default { return } // 电机 - if(item.motor == ''){ + if(item.motor.trim() == ''){ this.$message.warning(this.$t('electricMachinery')+this.$t('cannotEmpty')) flag = 0 return From 1106e0de2733052b797a3aa4ba32eb131e8fa8fd Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 27 Jun 2022 11:12:39 +0800 Subject: [PATCH 085/140] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E8=A7=92=E8=89=B2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=8A=B6=E6=80=81=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ParamsCollectManifestEOController.java | 6 +++++- .../collect/mapper/xml/ParamsCollectManifestEOMapper.xml | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index 99c980b9c..0066aa527 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -380,7 +380,11 @@ public class ParamsCollectManifestEOController extends JeroController lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO) { boolean isSuccess = paramsCollectManifestEOService.lockConfigColumn(paramsCollectManifestVO); if (isSuccess) { - return Result.OK("冻结配置成功！"); + if (StringUtils.isEmpty(paramsCollectManifestVO.getParamsConfigIds())) { + return Result.OK("解冻配置成功！"); + } else { + return Result.OK("冻结配置成功！"); + } } else { return Result.error("冻结配置失败！"); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml index 0f5304025..9802182e9 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml @@ -53,13 +53,13 @@ - AND sdt = #{paramsCollectManifestEO.sdt} AND state != '1' + AND sdt = #{paramsCollectManifestEO.sdt} AND state in ('2','4','5','6','7') - AND dre = #{paramsCollectManifestEO.dreForAuth} + AND dre = #{paramsCollectManifestEO.dreForAuth} AND state in ('4','6','7','8') - AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth}) AND state != '1' + AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth}) AND state in ('2','4','5','6','7','8') AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth}) From c17186ceecd538eddec3ef8344d70c26df916b15 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 27 Jun 2022 11:31:36 +0800 Subject: [PATCH 086/140] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E7=9A=84=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/search/index.vue | 9 +- .../views/regulatoryEarlyWarning/index.vue | 86 +++++++++++++++++-- 2 files changed, 82 insertions(+), 13 deletions(-) diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index 629ef022d..126594f2a 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -194,7 +194,7 @@ if (this.isDefault) { let startTime = moment(new Date()).format('YYYY-MM-DD') let endTime = this.getNewDate('after', 6) - this.queryParam['warningTime'] = [startTime, endTime] + this.queryParam['WarnTime'] = [startTime, endTime] this.queryParam = { ...this.queryParam } } eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam))) @@ -208,10 +208,9 @@ this.searchList = res.result if (this.searchQueryList && this.searchQueryList.length > 0) { this.searchList = this.searchList.concat(this.searchQueryList) - let startTime = moment(new Date()).format('YYYY-MM-DD') - let endTime = this.getNewDate('after', 6) - this.queryParam['warningTime'] = [startTime, endTime] - this.queryParam = { ...this.queryParam } + if (this.isDefault) { + this.searchReset() + } } } }) diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index 399f2b721..a47d64696 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -74,7 +74,8 @@ //url传参严格按照当前命名 url: { seachList: 'document/bussDocumentLibraryEO/queryCondition', //搜索字段 - list: '/LawsWarn/queryPageInfo' + list: '/LawsWarn/queryPageInfo', + pullMessage: '' }, activeTab: this.$t('ImplementationDate'), loading: false, @@ -167,7 +168,7 @@ } }, mounted() { - this.getList() + // this.getList() eventBUs.$on('searchQuery', search => { Object.keys(search).forEach(res => { if (search[res] instanceof Array) { @@ -178,11 +179,6 @@ this.searchParmes = search this.getList() }) - eventBUs.$on('searchReset', target => { - this.searchParmes = {} - this.pageNo = 1 - this.getList() - }) }, methods: { callback(tab) { @@ -193,13 +189,87 @@ this.selectedRowKeys = value }, handleCompare() { - + if (this.selectedRowKeys.length > 0) { + this.$nextTick(() => { + this.$refs.libraryPushRef.getPush(JSON.parse(JSON.stringify(this.selectedRowKeys))) + }) + } else { + this.$message.warning(this.$t('selectLeastOne')) + } }, handleExport() { }, clearSelected() { + let startTime = moment(new Date()).format('YYYY-MM-DD') + let endTime = this.getNewDate('after', 6) + this.searchParmes['WarnTime'] = [startTime, endTime] + this.searchParmes = { ...this.searchParmes } + this.pageNo = 1 + this.getList() + }, + getNewDate(flag, many) { + const thirtyDays = [4, 6, 9, 11] // 30天的月份 + + const thirtyOneDays = [1, 3, 5, 7, 8, 10, 12] // 31天的月份 + + const currDate = new Date() // 今天日期 + + const year = currDate.getFullYear() + + let month = currDate.getMonth() + 1 + + let targetDateMilli = 0 + + let GMTDate = '' // 中国标准时间 + + let targetYear = '' // 年 + + let targetMonth = '' // 月 + + let targetDate = '' // 日 + + let dealTargetDays = '' // 目标日期 + + const isLeapYear = !!((year % 4 == 0 && year % 100 != 0) || year % 400 == 0) // 是否是闰年 + + let countDays = 0 // 累计天数 + + for (let i = 0; i < many; i++) { + + if (flag === 'before') { + + month = month - 1 <= 0 ? 12 : month - 1 + + } else { + + month = month + 1 > 12 ? 1 : month + 1 + + } + + thirtyDays.includes(month) ? (countDays += 30) : thirtyOneDays.includes(month) ? (countDays += 31) : isLeapYear ? (countDays += 29) : (countDays += 28) + } + + targetDateMilli = currDate.setDate( + currDate.getDate() - (flag === 'before' ? countDays : countDays * -1) + ) + + GMTDate = new Date(targetDateMilli) + + targetYear = GMTDate.getFullYear() + + targetMonth = GMTDate.getMonth() + 1 + + targetDate = GMTDate.getDate() + + targetMonth = targetMonth.toString().padStart(2, '0') + + targetDate = targetDate.toString().padStart(2, '0') + + dealTargetDays = `${targetYear}-${targetMonth}-${targetDate}` + + return dealTargetDays }, pageOnChange(page) { this.pageNo = page From 30b3f1265c12f64a055173ca3bd75dba6ba40bf2 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 27 Jun 2022 11:40:54 +0800 Subject: [PATCH 087/140] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-bug54869?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index e625b5e2c..78b56eb9b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -981,14 +981,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Mon, 27 Jun 2022 11:43:51 +0800 Subject: [PATCH 088/140] [update] --- .../projectManagement/components/ParameterItemCollectionList.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 26ae2de11..260a819ed 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -477,6 +477,7 @@ export default { // } }, mounted() { + document.title = this.$t('ParameteItemCollectionList') this.GetgetLoginUserType() this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest')) }, From bde0036f4e90d2eecf1ca24755fdaf559ffd85e0 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Mon, 27 Jun 2022 12:02:21 +0800 Subject: [PATCH 089/140] [update] --- .../components/ParameterItemCollectionList.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 260a819ed..2d320950f 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -488,6 +488,7 @@ export default { handleOkRoleSwitching() { this.visibleRoleSwitching = false this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode + localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode)) this.selectedRowKeysValue = [] }, roleSwitchingClick() { @@ -772,7 +773,7 @@ export default { this.currentPersonRole = val.length >= 1 ? val[0].value : '' } this.RoleType = val - this.formInlineRoleSwitching.roleSwitchingCode = this.currentPersonRole + this.formInlineRoleSwitching.roleSwitchingCode = JSON.parse(localStorage.getItem('currentPersonRole')) === null ? this.currentPersonRole : JSON.parse(localStorage.getItem('currentPersonRole')) this.formInlineRoleSwitching = {...this.formInlineRoleSwitching} }, // 表格所选中得行内容 From 245506a54609fbcf854f863fcc6c33f99f017dfe Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 27 Jun 2022 13:45:30 +0800 Subject: [PATCH 090/140] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9-bug54766?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsInfoEOServiceImpl.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index b360a0c73..643ba3d67 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -398,7 +398,11 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl> getCnExportSheetsList(List paramsInfoEOList, String fileNowPath, String paramsTemplateId) throws IOException { if (CollectionUtil.isEmpty(paramsInfoEOList)) { - throw new JeroBootException("没有可导出的数据"); + throw new JeroBootException("没有可导出的数据！"); } List fileTemplateList = new ArrayList<>(); @@ -571,7 +582,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl> getEnExportSheetsList(List paramsInfoEnExportList, String fileNowPath, String paramsTemplateId) throws IOException { if (CollectionUtil.isEmpty(paramsInfoEnExportList)) { - throw new JeroBootException("没有可导出的数据"); + throw new JeroBootException("No data available for export!"); } List fileTemplateList = new ArrayList<>(); @@ -1373,6 +1384,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl listAfterDistinct = listAll.stream() + .filter(e->StringUtils.isNotEmpty(e.getNioNumber()) && StringUtils.isNotEmpty(e.getCertCategory())) .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getNioNumber() + ";" + o.getCertCategory()))), ArrayList::new)); listAfterDistinct.forEach(item -> { From 6e7ec4b80033dfd28bf79d52b9f63cf0db77d5e5 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Mon, 27 Jun 2022 14:13:29 +0800 Subject: [PATCH 091/140] [update] --- .../components/SynchronousSubmissionLibrary/index.vue | 4 ++-- jero-web/src/components/tableCollection/index.vue | 9 +++++++-- .../components/TaskParameterCollection.vue | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/jero-web/src/components/SynchronousSubmissionLibrary/index.vue b/jero-web/src/components/SynchronousSubmissionLibrary/index.vue index 41fe4c090..7edd7ad05 100644 --- a/jero-web/src/components/SynchronousSubmissionLibrary/index.vue +++ b/jero-web/src/components/SynchronousSubmissionLibrary/index.vue @@ -111,11 +111,11 @@ export default { .then( (res) =>{ console.log(res,'res') if (res.data.success) { - _this.$message.success(res.data.message) + _this.$message.success(_this.$t('OperationSuccessful')) this.$emit('areaVisibsynchronous', false) this.$emit('GetgetTableList') }else{ - _this.$message.warning(res.data.message) + _this.$message.warning(_this.$t('operationFailed')) } }) .catch( (error) =>{ diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 1f7548d3c..335cbdc16 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -477,6 +477,9 @@ this.dataSource = res.result this.total = res.result.total this.selectedRowKeys = [] + this.selectedRowrowValue = [] + this.$emit('value', this.selectedRowKeys) + this.$emit('rowValue', this.selectedRowrowValue) this.loading = false } else { this.loading = false @@ -486,10 +489,12 @@ onChange(page, pageSize) { }, onSelectChange(value, rowValue) { + this.selectedRowKeys = [] + this.selectedRowrowValue = [] this.selectedRowKeys = value this.selectedRowrowValue = rowValue - this.$emit('value', value) - this.$emit('rowValue', rowValue) + this.$emit('value', this.selectedRowKeys) + this.$emit('rowValue', this.selectedRowrowValue) }, OperationClick(ol, item) { // this.$emit(ol.ClickEvent, item) diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index d36609392..7d6145e2d 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -286,7 +286,7 @@ this.$message.warning(_this.$t('pleaseSelectData')) }else if(this.selectedRowKeys.length > 1){ this.$message.warning(_this.$t('OnlyOneSelected')) - } else if(this.selectedRowKeysvalArray[0].state === '已完成'){ + } else if(this.selectedRowKeysvalArray[0].state === '已完成'|| this.selectedRowKeysvalArray[0].state ==='Finished'){ getAction(_this.url.changeExtension, { id: this.selectedRowKeys[0] }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) From 6b546e4446865db0a7f522408a91663c4cbcb6fb Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Mon, 27 Jun 2022 14:24:18 +0800 Subject: [PATCH 092/140] [update] --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/ParameterItemCollectionList.vue | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 20b4d9b34..fbb3b65f0 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1052,4 +1052,5 @@ module.exports = { NFourDecimalplaces: 'Decimal four', yes: 'Yes', Copyparameterlist: 'Copy parameter list', + Templatenamelist: 'Template name - parameter item collection list', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index bff99211c..ab6b7ac1f 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1056,4 +1056,5 @@ module.exports = { NThreedecimalplaces: '三位小数', NFourDecimalplaces: '四位小数', Copyparameterlist: '复制参数清单', + Templatenamelist: '模板名称-参数项收集清单', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 2d320950f..ac121a266 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -477,7 +477,7 @@ export default { // } }, mounted() { - document.title = this.$t('ParameteItemCollectionList') + document.title = this.$t('Templatenamelist') this.GetgetLoginUserType() this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest')) }, From 0493a60ac7d2f07d0be94d360b3e0186eb594038 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Mon, 27 Jun 2022 14:32:16 +0800 Subject: [PATCH 093/140] [update] --- .../components/ParameterItemCollectionList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index ac121a266..ff688d678 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -952,7 +952,7 @@ export default { if(item.type == 'pull_more'){ item.dataValue = item.dataValue.join(',') } - if(item.type == 'text'){ + if(item.type == 'text' && item.dataValue !== null){ item.dataValue = item.dataValue.toString() } }) From 15f5a1d6bd82c57defc7e5f61a5df5b6e48b13cb Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 27 Jun 2022 14:37:23 +0800 Subject: [PATCH 094/140] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9-=E5=AF=BC=E5=85=A5bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsInfoEOServiceImpl.java | 26 +++++++++++++++++++ .../vo/CertCategoryParamsInfoEnImport.java | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 643ba3d67..8366e22c1 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -811,10 +811,18 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl resultEn = ExcelImportUtil.importExcelMore(excelfile,ParamsInfoEnImport.class, params); List paramsInfoEOListEn = resultEn.getList(); copyParamsInfoList(paramsInfoEOListEn, paramsInfoEOList); } else { + String fields[] ={ "*NIO编号", "*是否必填", "*参数名称","*技术领域","*参数批次","*责任领域", + "参数说明", "*控件类型", "控件校验", "控件备选值", "附件模板"}; + params.setImportFields(fields); + ExcelImportResult result = ExcelImportUtil.importExcelMore(excelfile, ParamsInfoCnImport.class, params); paramsInfoEOList = result.getList(); } @@ -822,10 +830,16 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl list = new ArrayList<>(); if (CutEnum.EN.getValue().equals(cut)) { + String fields[] ={ "*NIO Number", "*Number", "*Params Name","Description"}; + params.setImportFields(fields); + ExcelImportResult resultEn = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoEnImport.class, params); List listEn = resultEn.getList(); copycertCategoryParamsInfoList(listEn, list); } else { + String fields[] ={ "*NIO编号", "*编号", "*参数名称","参数说明"}; + params.setImportFields(fields); + ExcelImportResult result = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoCnImport.class, params); list = result.getList(); } @@ -1326,6 +1340,18 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl Date: Mon, 27 Jun 2022 15:20:57 +0800 Subject: [PATCH 095/140] [update] --- jero-web/src/components/tableCollection/index.vue | 2 +- jero-web/src/components/uploadFileChangeDown/file.vue | 1 + jero-web/src/views/parameter/ParameterTemplate/index.vue | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 335cbdc16..7eb789666 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -20,7 +20,7 @@
{{ item.db_field_txt }} - 查看 + {{$t('See')}}
diff --git a/jero-web/src/components/uploadFileChangeDown/file.vue b/jero-web/src/components/uploadFileChangeDown/file.vue index 5a930d60f..adb0429d6 100644 --- a/jero-web/src/components/uploadFileChangeDown/file.vue +++ b/jero-web/src/components/uploadFileChangeDown/file.vue @@ -61,6 +61,7 @@ export default { }, created() { this.detailDate.list.forEach((item) => { + console.log('ppp') if(item.type == 'file' && item.isLock == '1') { this.disabled = true } diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index ca51c7fb2..526b3e8b5 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -58,11 +58,11 @@ > - {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} + {{ text && text.length > 30 ? text.slice(0, 29) + '...' : text }} - {{ text && text.length > 30 ? text.slice(0, 29) + '...' : text }} + {{ text && text.length > 50 ? text.slice(0, 49) + '...' : text }} {{$t('edit')}} From 782d2f121735acc90317fb1805f222d341c03537 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Mon, 27 Jun 2022 15:50:23 +0800 Subject: [PATCH 096/140] [update] --- .../components/ParameterItemCollectionList.vue | 2 +- .../projectManagement/components/TaskParameterCollection.vue | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index ff688d678..6630a31d0 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -477,9 +477,9 @@ export default { // } }, mounted() { - document.title = this.$t('Templatenamelist') this.GetgetLoginUserType() this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest')) + document.title = `${this.paramsManifest.title}-`+this.$t('ParameteItemCollectionList') }, methods:{ handleCancelRoleSwitching() { diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 7d6145e2d..7f84cc526 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -53,7 +53,9 @@ :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' @change='handleTableChange'> - {{text}} + + {{ text && text.length > 50 ? text.slice(0, 49) + '...' : text }} + {{$t('configure')}} @@ -152,6 +154,7 @@ { title: this.$t('createTime'), align: 'center', + width: 160, dataIndex: 'createTime' }, { From 4caa6aa6f1974d565a4a53dd41d596837c24cf1d Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Mon, 27 Jun 2022 16:43:03 +0800 Subject: [PATCH 097/140] [update] --- jero-web/src/components/ReferenceParameter/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/components/ReferenceParameter/index.vue b/jero-web/src/components/ReferenceParameter/index.vue index 5fe48ecdf..7fb961dac 100644 --- a/jero-web/src/components/ReferenceParameter/index.vue +++ b/jero-web/src/components/ReferenceParameter/index.vue @@ -196,11 +196,11 @@ export default { let param = {ids: this.selectedRowKeysArray, ...this.formInline } postAction('params/collectManifest/referParams', param).then((res) => { if (res.success) { - this.$message.success(res.message) + this.$message.success(this.$t('OperationSuccessful')) this.$emit('areaVisibleAssignedbyflag', false) this.$emit('GetgetTableList') } else { - this.$message.warning(res.message) + this.$message.warning(this.$t('operationFailed')) } }) // axios({ From af9410acc5728b5bdf61441ea34c6773062687b9 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 27 Jun 2022 17:00:57 +0800 Subject: [PATCH 098/140] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E5=A4=8D=E5=88=B6bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 14 +++++- .../cert/collect/entity/ParamsManifestEO.java | 6 +-- .../ParamsCollectManifestEOServiceImpl.java | 2 +- .../impl/ParamsManifestEOServiceImpl.java | 46 ++++++++++++------- .../service/impl/ParamsInfoEOServiceImpl.java | 15 +++++- 5 files changed, 58 insertions(+), 25 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 2cee5351c..de2030c9c 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -60,4 +60,16 @@ CREATE TABLE `laws_process_history` ( -- 参数项收集清单表 添加字段 ALTER TABLE `laws_weilai`.`params_collect_manifest` - ADD COLUMN `del_flag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标识' AFTER `change_flag`; \ No newline at end of file + ADD COLUMN `del_flag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标识' AFTER `change_flag`; +-- 参数配置数据表 修改字段长度 +ALTER TABLE `laws_weilai`.`params_config_data` + MODIFY COLUMN `text_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文本类型数据' AFTER `sys_org_code`, + MODIFY COLUMN `pull_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '下拉类型数据' AFTER `text_data`; +-- 参数配置数据历史版本表 修改字段长度 +ALTER TABLE `laws_weilai`.`params_config_data_history` + MODIFY COLUMN `text_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文本类型数据' AFTER `sys_org_code`, + MODIFY COLUMN `pull_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '下拉类型数据' AFTER `text_data`; +-- 上报库参数配置数据表 修改字段长度 +ALTER TABLE `laws_weilai`.`params_report_config_data` + MODIFY COLUMN `text_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文本类型数据' AFTER `sys_org_code`, + MODIFY COLUMN `pull_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '下拉类型数据' AFTER `text_data`; \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java index 2d619154b..68430dd6e 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java @@ -1,9 +1,6 @@ package com.jero.modules.cert.collect.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -74,6 +71,7 @@ public class ParamsManifestEO implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "收集完成时间") + @TableField(updateStrategy = FieldStrategy.IGNORED) private java.util.Date finishTime; /**版本*/ diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 78b56eb9b..957d0cb9a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -250,7 +250,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 TODO 添加用户类型权限 + List list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 List paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列 // 普通数据字典 diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index a33e6ac74..ecf1459c8 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -300,15 +300,14 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl map = paramsCollectManifestEOService.isCollectFinished(sourceManifestId); + Boolean finish = (Boolean) map.get("finish"); + if (!finish) { + if (CutEnum.CN.getValue().equals(paramsManifestEO.getCut())) { + throw new JeroBootException("清单收集中，无法复制！"); + } else { + throw new JeroBootException("Manifest collection, and cannot be copied!"); + } + } + String paramsTemplateId = paramsManifestEO.getParamsTemplateId(); int paramsTemplatePublishVersion = paramsManifestEO.getParamsTemplatePublishVersion(); @@ -547,24 +557,26 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category"); + sysDictItemList.sort(Comparator.comparing(SysDictItem::getSortOrder)); // 升序 Map certCategoryMap = new HashMap<>(); if (CutEnum.CN.getValue().equals(cut)) { certCategoryMap = sysDictItemList.stream().collect(Collectors.toMap(c -> c.getItemValue(), c -> c.getItemText())); } else { certCategoryMap = sysDictItemList.stream().collect(Collectors.toMap(c -> c.getItemValue(), c -> c.getEnName())); } - for (CertCategoryParamsInfoEO certCategoryParamsInfoEO : certCategoryParamsInfoEOList) { - certCategoryParamsInfoEO.setCertCategory_dictText(certCategoryMap.get(certCategoryParamsInfoEO.getCertCategory())); + + List certCategoryParamsInfoEOListOrdered = new ArrayList<>(); + for (SysDictItem sysDictItem : sysDictItemList) { + List certCategoryParamsInfoEOS = certCategoryParamsInfoEOList.stream() + .filter(e->sysDictItem.getItemValue().equals(e.getCertCategory())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(certCategoryParamsInfoEOS)) { + CertCategoryParamsInfoEO certCategoryParamsInfoEO = certCategoryParamsInfoEOS.get(0); + certCategoryParamsInfoEO.setCertCategory_dictText(certCategoryMap.get(certCategoryParamsInfoEO.getCertCategory())); + + certCategoryParamsInfoEOListOrdered.add(certCategoryParamsInfoEO); + } } + paramsInfoEO.setCertCategoryParamsInfoEOList(certCategoryParamsInfoEOList); return paramsInfoEO; } From 4a6588aea62d2ae3d31ef25782b8018866cb7373 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Mon, 27 Jun 2022 17:09:10 +0800 Subject: [PATCH 099/140] [update] --- jero-web/src/components/AssignedBy/index.vue | 2 +- jero-web/src/components/uploadFileChangeDown/file.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue index 044ea2d15..90bcdd144 100644 --- a/jero-web/src/components/AssignedBy/index.vue +++ b/jero-web/src/components/AssignedBy/index.vue @@ -1,6 +1,6 @@ @@ -69,32 +80,33 @@ name: [ { required: true, - message: this.$t('VirtualListName') + this.$t('cannotEmpty'), - trigger: 'blur' - }, - { - max: 100, - message: this.$t('VirtualListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'), - trigger: 'blur' + message: this.$t('monthlyReportRegulations') + this.$t('cannotEmpty'), + trigger: 'change' } ], - useExplain: [ + language: [ { required: true, - message: this.$t('instructionForUse') + this.$t('cannotEmpty'), - trigger: 'blur' - }, - { - max: 500, - message: this.$t('instructionForUse') + this.$t('cannotExceed') + 500 + this.$t('Characters'), - trigger: 'blur' + message: this.$t('monthlyLanguage') + this.$t('cannotEmpty'), + trigger: 'change' } ] }, visible: false, + languageList: [ + { + text: this.$t('chinese'), + value: 1 + }, + { + text: this.$t('English'), + value: 2 + } + ], formInline: {}, confirmLoading: false, - uploadName: '' + uploadName: '', + disabled: false } }, methods: { @@ -104,7 +116,18 @@ handleSubmit() { this.$refs.ruleForm.validate(valid => { if (valid) { - + this.confirmLoading = true + postAction('/report/lawsMonthlyReportManageEO/add', this.formInline).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.confirmLoading = false + this.$emit('managementAddForm') + } else { + this.confirmLoading = false + this.$message.warning(this.$t('operationFailed')) + } + }) } }) }, From 0426c93b34ae4adad191fe798edaa8da21173626 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 29 Jun 2022 11:44:12 +0800 Subject: [PATCH 118/140] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5-?= =?UTF-8?q?=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dummy/enums/InventoryStateEnum.java | 2 +- .../LawsMonthlyReportManageEOController.java | 51 ++++++++++++++----- .../entity/LawsMonthlyReportManageEO.java | 5 ++ .../xml/LawsMonthlyReportManageEOMapper.xml | 3 +- .../ILawsMonthlyReportManageEOService.java | 11 ++++ .../LawsMonthlyReportManageEOServiceImpl.java | 13 +++-- 6 files changed, 66 insertions(+), 19 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/InventoryStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/InventoryStateEnum.java index b0db327e2..ab3e9e5bf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/InventoryStateEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/InventoryStateEnum.java @@ -8,7 +8,7 @@ package com.jero.modules.dummy.enums; public enum InventoryStateEnum { ISSUE("已发布","1"), DRAFT("草稿","2"), - TO_BE_RELEASED("待发布","3"); + TO_BE_RELEASED("待发布","2"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportManageEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportManageEOController.java index 65eb3aec2..1161aa631 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportManageEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportManageEOController.java @@ -1,25 +1,32 @@ package com.jero.modules.report.controller; -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.report.entity.LawsMonthlyReportManageEO; -import com.jero.modules.report.service.ILawsMonthlyReportManageEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.report.entity.LawsMonthlyReportManageEO; +import com.jero.modules.report.service.ILawsMonthlyReportManageEOService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; /** @@ -167,4 +174,20 @@ public class LawsMonthlyReportManageEOController extends JeroController issue(LawsMonthlyReportManageEO lawsMonthlyReportManageEO) { + try { + lawsMonthlyReportManageEOService.issue(lawsMonthlyReportManageEO); + } catch (Exception e) { + return Result.error("操作失败"); + } + return Result.error("操作成功"); + + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportManageEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportManageEO.java index 29a1486dd..9ff1f6ae8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportManageEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportManageEO.java @@ -73,4 +73,9 @@ public class LawsMonthlyReportManageEO implements Serializable { @ApiModelProperty(value = "发布状态") private java.lang.String issueStatus; + /**文件id*/ + @Excel(name = "文件id", width = 15) + @ApiModelProperty(value = "文件id") + private java.lang.String fileId; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportManageEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportManageEOMapper.xml index 7efe9bc88..c0ceb45de 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportManageEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportManageEOMapper.xml @@ -11,5 +11,6 @@ + - \ No newline at end of file + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportManageEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportManageEOService.java index f11d64886..cc0d078a2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportManageEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportManageEOService.java @@ -62,5 +62,16 @@ public interface ILawsMonthlyReportManageEOService extends IService queryList(); + /** + * 分页 + * @param page + * @param queryWrapper + * @return + */ IPage getPageInfo(Page page, QueryWrapper queryWrapper); + + void issue(LawsMonthlyReportManageEO lawsMonthlyReportManageEO); + + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index 9117026fd..f8943eaa5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -3,16 +3,18 @@ package com.jero.modules.report.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.vo.LoginUser; import com.jero.modules.dummy.enums.InventoryStateEnum; import com.jero.modules.report.entity.LawsMonthlyReportManageEO; import com.jero.modules.report.mapper.LawsMonthlyReportManageEOMapper; import com.jero.modules.report.service.ILawsMonthlyReportManageEOService; import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; + import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; /** * @Description: 法规月报管理 @@ -97,10 +99,15 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl getPageInfo(Page page, QueryWrapper queryWrapper) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); queryWrapper.and(query->{ - query.in("create_by",sysUser.getUsername()).in("state", InventoryStateEnum.TO_BE_RELEASED.getValue()) + query.in("create_by",sysUser.getUsername()).in("issue_status", InventoryStateEnum.TO_BE_RELEASED.getValue()) .or().in("issue_status",InventoryStateEnum.ISSUE.getValue()); }); Page pageInfo = this.page(page, queryWrapper); return pageInfo; } + + @Override + public void issue(LawsMonthlyReportManageEO lawsMonthlyReportManageEO) { + this.updateById(lawsMonthlyReportManageEO); + } } From 2f1d9b3941405de46f1a4ab8c4227c41050c3784 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Wed, 29 Jun 2022 12:16:55 +0800 Subject: [PATCH 119/140] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E5=8F=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 09f6cc80f..789c9ffa4 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1016,7 +1016,7 @@ module.exports = { Copysuccessful: 'Copy Successful', Copyfailed: 'Copy Failed', Synchronizedatabase: 'Synchronize the data of the selected row to the database?', - Aftersynchronization: 'After synchronization, the parameter items cannot be modified. Only the collection can be redistributed. The parameters have been updated', + Aftersynchronization: 'After synchronization, the parameter items cannot be modified.', FNumber: 'Number', NNNiONumber: 'Number', NNiONumber: 'NIO Number', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 8754dd686..d400195ba 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1021,7 +1021,7 @@ module.exports = { Copysuccessful: '复制成功', Copyfailed: '复制失败', Synchronizedatabase: '是否同步选中行数据至上报库?', - Aftersynchronization: '同步后的参数项将不可修改,仅能重新下发收集,已更新参数', + Aftersynchronization: '同步后的参数项将不可修改', FNumber: '账号', NNNiONumber: 'NIO编号', NNiONumber: 'NIO编号', From df6a017c2aa534c25d614131f8dd9d9df62dd0bb Mon Sep 17 00:00:00 2001 From: zer0Black Date: Wed, 29 Jun 2022 12:29:16 +0800 Subject: [PATCH 120/140] =?UTF-8?q?[fix]Bug=2055076=20=20=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E7=89=88=E6=9C=AC--=E5=BA=94=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=85=B7=E4=BD=93=E7=9A=84=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/parameter/parameterlist/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index f70568bbb..ae4fa00b8 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -227,9 +227,9 @@ export default { releaseVersion() { getAction('params/paramsInfo/publish', { paramsTemplateId: this.$route.query.id }).then((res) => { if (res.success) { - this.$message.success(res.message) + this.$message.success(res.result) } else { - this.$message.warning(res.message) + this.$message.warning(res.result) } }) }, From 60a25bf28aebd3743330990e4d4f6864d5cd15a2 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Wed, 29 Jun 2022 12:55:25 +0800 Subject: [PATCH 121/140] =?UTF-8?q?[fix]=E5=AF=BC=E5=87=BA=E7=9A=84?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E5=88=87=E6=8D=A2=E4=B8=BA=E4=B8=AD?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E5=8F=AF=E5=88=87=E6=8D=A2=E7=9A=84=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 7 +++++-- jero-web/src/common/lang/zh-cn.js | 5 ++++- jero-web/src/views/parameter/parameterlist/index.vue | 12 ++++++++++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 789c9ffa4..6f5301ea1 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -724,7 +724,7 @@ module.exports = { Dropdownmultipleselection: 'Drop down multiple selection', a: '+', positiveInteger: 'Positive integer', - + // 参数收集开始 ParameteItemCollectionList: 'Parameter item collection list', Areyousureparameteritems: 'Are you sure to submit the selected parameter items?', Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed', @@ -787,6 +787,9 @@ module.exports = { releaseVersion: 'Release Version', parameterTemplate: 'Parameter Template', contentDescription: 'Content Description', + parameterTemplateExportName: 'Parameter List', + parameterDataExport: 'Parameter Export Data', + // 参数收集结束 circulationInformation: 'Circulation information', circulationHistory: 'Circulation History', agree: 'Agree', @@ -1054,5 +1057,5 @@ module.exports = { Copyparameterlist: 'Copy parameter list', Templatenamelist: 'Template name - parameter item collection list', newNiONumber: 'Number', - English: 'English' + English: 'English', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index d400195ba..806725d92 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -735,7 +735,7 @@ module.exports = { Dropdownmultipleselection: '下拉多选', a: '+', positiveInteger: '正整数', - + // 参数收集 ParameteItemCollectionList: '参数项收集清单', Areyousureparameteritems: '确认提交所选参数项嘛?', Theselectedconfiguration: '参数清单中参数项均为待发起收集或变更时，才能添加配置', @@ -798,6 +798,9 @@ module.exports = { releaseVersion: '发布版本', parameterTemplate: '参数模板', contentDescription: '内容说明', + parameterTemplateExportName: '参数项列表', + parameterDataExport: '参数项导出数据', + // 参数收集结束 circulationInformation: '流转信息', circulationHistory: '流转历史', agree: '同意', diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index ae4fa00b8..c20d72b9e 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -221,7 +221,7 @@ export default { } let _xx = JSON.stringify(_tt) let _yy = { paramsInfoVO : _xx, exportName: '参数项列表' } - downloadFile('params/paramsInfo/exportParamsInfoZip', '参数项导出数据.zip', { paramsInfoVO : _xx, exportName: '参数项列表' } , this.Deselect) + downloadFile('params/paramsInfo/exportParamsInfoZip', this.$t('parameterDataExport') + '.zip', { paramsInfoVO : _xx, exportName: '参数项列表' } , this.Deselect) }, // 发布版本 releaseVersion() { @@ -235,7 +235,15 @@ export default { }, //下载模板 handleModule() { - downloadFile('params/paramsInfo/exportTemplate', '参数项列表.xlsx', {}) + // let lang = localStorage.getItem('language') || 'zh-cn'; + // if (lang == 'en-us') { + downloadFile('params/paramsInfo/exportTemplate', this.$t('parameterTemplateExportName') + '.xlsx', {}) + // } else if (langCn == 'zh-cn') { + // downloadFile('params/paramsInfo/exportTemplate', 'Parameter list.xlsx', {}) + // } + + + }, handleToggleSearch() { this.toggleSearchStatus = !this.toggleSearchStatus From 8d0368e73b3331b0a00fe358649a8d955a48bd97 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Wed, 29 Jun 2022 13:03:53 +0800 Subject: [PATCH 122/140] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=88=97=E8=A1=A8=E7=9A=84=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/TaskParameterCollection.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 7f84cc526..5d7eae391 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -378,6 +378,10 @@ \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index 7383fa0f2..dba067edc 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -182,24 +182,18 @@ dataIndex: 'technology_territory' }, { - title: this.$t('vehicleInProductionDate'), + title: this.$t('correspondingStandard'), align: 'center', ellipsis: true, - width: 210, - dataIndex: 'implement_time' + width: 170, + dataIndex: 'technology_territory' }, - { - title: this.$t('ImplementationDate'), - align: 'center', - ellipsis: true, - width: 210, - dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1' - } ] } }, mounted() { document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess') + this.getList() }, methods: { pageOnChange(page) { @@ -216,6 +210,9 @@ }, onSelectChange(value) { this.selectedRowKeys = value + if (this.selectedRowKeys.length > 1) { + this.selectedRowKeys.unshift() + } }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index 87e5a37e6..c74b36e03 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -27,7 +27,7 @@ {{$t('technicalField')}} + v-model="queryParam.technologyTerritory"> @@ -89,12 +89,18 @@ /> +