From c5ea37e889344184ed10b64885a39ca557ddcc2f Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Fri, 29 Apr 2022 09:56:14 +0800 Subject: [PATCH 01/33] =?UTF-8?q?[=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8]=20=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parameterlist/components/addModel.vue | 54 ++++++++++--------- .../views/parameter/parameterlist/index.vue | 4 +- 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 6ed2adc1b..a697d48bf 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -213,7 +213,7 @@ - +
@@ -288,31 +288,31 @@ export default { data() { return { isRequired: [ // 是否必填 - {value:1, label: '是' }, - {value:0, label: '否' } + {value:'1', label: '是' }, + {value:'0', label: '否' } ], 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: '文本' }, + {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: '文本+下拉单选+附件' }, ], 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: '无' }, + {value:'2', label: '中文' }, + {value:'3', label: '正整数' }, + {value:'4', label: '正浮点数' }, + {value:'5', label: '整数或小数' }, + {value:'6', label: '一位小数' }, + {value:'7', label: '两位小数' }, + {value:'8', label: '三位小数' }, + {value:'9', label: '四位小数' }, ], CategoryTreeList: [], // 技术领域 certCategoryParamsInfoEOList: [], // 认证类别得tab栏 @@ -343,7 +343,7 @@ export default { projectNameList: [], title: '', stateOne: '', - tt : [] + contentList : [] } }, mounted() { @@ -380,7 +380,7 @@ export default { // this.formInline.certCategoryParamsInfoEOList = [] val.forEach((item) => { - this.tt.push({ + this.contentList.push({ textVal: item.text, // tab certCategory: '', // 所属认证类别 paramsNumber: '', // 编号 @@ -433,6 +433,8 @@ export default { if (valid) { let url = '' let Action + this.formInline.paramsTemplateId = this.$route.query.id + console.log(this.formInline.paramsTemplateId,'this.formInline.paramsTemplateIdthis.formInline.paramsTemplateId') if (this.formInline.id) { url = this.url.edit Action = postAction @@ -447,8 +449,8 @@ export default { query[res] = query[res].join(',') } }) - let querytt = JSON.parse(JSON.stringify(this.tt)) - query.certCategoryParamsInfoEOList = querytt + let querycontentList = JSON.parse(JSON.stringify(this.contentList)) + query.certCategoryParamsInfoEOList = querycontentList this.confirmLoading = true Action(url, query).then((res) => { if (res.success) { diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index f964d48c9..e295e3f1e 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -118,7 +118,8 @@ export default { add: 'params/paramsInfo/add', edit: 'params/paramsInfo/edit', deleteBatch: 'params/paramsInfo/delete', - deleteAll: 'params/paramsInfo/deleteBatch' + deleteAll: 'params/paramsInfo/deleteBatch', + }, total: 0, pageSize: 10, @@ -289,6 +290,7 @@ export default { let query = { pageNo: this.pageNo, pageSize: this.pageSize, + cut: this.$route.query.id, ...this.queryParam } this.loading = true From 76a827344e1de6aa99ff46b60b0f32ee8c1bcd13 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 29 Apr 2022 09:59:11 +0800 Subject: [PATCH 02/33] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--?= =?UTF-8?q?=E8=B0=83=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOController.java | 2 +- .../ProjectLawsInventoryEOServiceImpl.java | 24 ++++++++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index 4b343f21d..7b40dfa2a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -326,7 +326,7 @@ public class ProjectLawsInventoryEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryBaseEO, req.getParameterMap()); queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); - IPage pageList = dummyInventoryBaseEOService.getPageInfo(page,queryWrapper); + IPage pageList = dummyInventoryBaseEOService.getPageInfoDummy(page,queryWrapper); return Result.OK(dummyInventoryBaseEO.getCut(),pageList); } 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 4cb328adf..f44e55edc 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 @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.Result; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.WebsocketConst; @@ -24,7 +25,13 @@ import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectNameInfoEO; import com.jero.modules.project.entity.ProjectRelatedPersonnel; -import com.jero.modules.project.enums.*; +import com.jero.modules.project.enums.InventoryAffirmStatusEnum; +import com.jero.modules.project.enums.MsgTypeEnum; +import com.jero.modules.project.enums.OperatorResultEnum; +import com.jero.modules.project.enums.OperatorTypeEnum; +import com.jero.modules.project.enums.ProjectRoleEnum; +import com.jero.modules.project.enums.RequestSourceEnum; +import com.jero.modules.project.enums.TaskAffirmStatusEnum; import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; @@ -44,15 +51,18 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import java.util.stream.Collectors; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import javax.servlet.http.HttpServletRequest; - /** * @Description: 项目库-法规清单表 * @Author: jero-boot @@ -121,6 +131,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Fri, 29 Apr 2022 10:05:54 +0800 Subject: [PATCH 03/33] =?UTF-8?q?[=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8]=20=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/parameter/parameterlist/components/addModel.vue | 6 ------ jero-web/src/views/parameter/parameterlist/index.vue | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index a697d48bf..c6fc69f03 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -287,10 +287,6 @@ export default { props: ['url'], data() { return { - isRequired: [ // 是否必填 - {value:'1', label: '是' }, - {value:'0', label: '否' } - ], controlType: [ // 控件类型 {value:'1', label: '文本' }, {value:'2', label: '下拉单选' }, @@ -434,7 +430,6 @@ export default { let url = '' let Action this.formInline.paramsTemplateId = this.$route.query.id - console.log(this.formInline.paramsTemplateId,'this.formInline.paramsTemplateIdthis.formInline.paramsTemplateId') if (this.formInline.id) { url = this.url.edit Action = postAction @@ -443,7 +438,6 @@ export default { Action = postAction } let query = JSON.parse(JSON.stringify(this.formInline)) - console.log(query,'queryqueryqueryquery') Object.keys(query).forEach(res => { if (query[res] && query[res] instanceof Array) { query[res] = query[res].join(',') diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index e295e3f1e..0cbf4de65 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -290,7 +290,7 @@ export default { let query = { pageNo: this.pageNo, pageSize: this.pageSize, - cut: this.$route.query.id, + paramsTemplateId: this.$route.query.id, ...this.queryParam } this.loading = true From f1be243696a08f5f4d769d396b226db455307078 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Fri, 29 Apr 2022 10:18:11 +0800 Subject: [PATCH 04/33] =?UTF-8?q?[=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8]=20=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/parameter/parameterlist/index.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 0cbf4de65..b7f90bc04 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -44,9 +44,9 @@ {{$t('add')}}
-
- - {{$t('copy')}} +
+ + {{$t('templateDownload')}}
@@ -168,6 +168,10 @@ export default { this.getList() }, methods: { + //下载模板 + handleModule() { + downloadFile('params/paramsInfo/exportTemplate', '参数项列表.xls', {}) + }, handleToggleSearch() { this.toggleSearchStatus = !this.toggleSearchStatus }, From cf2abcbac622a187868e6e480539527a5d88bc06 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 29 Apr 2022 10:22:02 +0800 Subject: [PATCH 05/33] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5--=E9=AA=8C=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DummyInventoryInfoEOServiceImpl.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 7488963f1..b917391e4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -801,7 +801,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl categoryList = sysCategoryService.list(); //普通数据字典 List dictItemList = sysDictItemServiceImpl.selectItemsAll(); - importDatas(datas, categoryList, dictItemList, zipEntryName,saveDirectory,dummyInventoryInfoEO.getCut()); + importDatas(datas, categoryList, dictItemList, zipEntryName,saveDirectory,dummyInventoryInfoEO); //删除原上传文件 FileUnZip.deleteDir(saveDirectory); @@ -813,17 +813,17 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dictItemList, String zipEntryName, File saveDirectory, - String cut) { + DummyInventoryInfoEO dummyInventoryInfoEOTemp) { int i = 3; List msgList = new ArrayList<>(); String value = ""; boolean flag = true; //编号验证 - List bussDocumentLibraryEOList = verifySerialNumber(dataList); + List bussDocumentLibraryEOList = verifySerialNumber(dataList,dummyInventoryInfoEOTemp); for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList) { i++; String errorMsg = ""; - if(CutEnum.CN.getValue().equals(cut)){ + if(CutEnum.CN.getValue().equals(dummyInventoryInfoEOTemp.getCut())){ errorMsg = "第" + i + "行："; }else{ errorMsg = i + " line："; @@ -998,7 +998,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl verifySerialNumber(List dataList) { + private List verifySerialNumber(List dataList,DummyInventoryInfoEO dummyInventoryInfoEOTemp) { //文档库数据 List serialNumberList = dataList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -1009,8 +1009,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl wrapperTemp = new LambdaQueryWrapper<>(); - wrapperTemp.in(DummyInventoryInfoEO::getSerialNumber,serialNumberList); + wrapperTemp.in(DummyInventoryInfoEO::getSerialNumber,serialNumberList).in(DummyInventoryInfoEO::getDummyInventoryBaseId,dummyInventoryInfoEOTemp.getDummyInventoryBaseId()); List dummyInventoryInfoEOList = this.list(wrapperTemp); + List serialNumberTempList = dummyInventoryInfoEOList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList()); if(serialNumberList.size() != serialNumberListTemp.size()){ //存在文档库没有的数据 List collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); @@ -1023,9 +1024,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl 0){ if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ - throw new JeroBootException(StringUtils.join(serialNumberList,",")+"已存在,不能重复添加"); + throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+"已存在,不能重复添加"); }else{ - throw new JeroBootException(StringUtils.join(serialNumberList,",")+" already exists and cannot be added again"); + throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+" already exists and cannot be added again"); } } //通过编号将导入的数据与文档库进行关联 From 4f18e1a1a592986674b914d310f1cb9930a0e32f Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Fri, 29 Apr 2022 10:28:48 +0800 Subject: [PATCH 06/33] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=AE=A1=E5=88=92=E6=97=B6=E9=97=B4=E8=BD=B4=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/ProjectTaskPlanningServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java index 531e4672a..7cb20e77b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java @@ -198,6 +198,14 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl Date: Fri, 29 Apr 2022 10:31:05 +0800 Subject: [PATCH 07/33] =?UTF-8?q?[=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8]=20=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/parameter/parameterlist/index.vue | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index b7f90bc04..f08b70e00 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -44,6 +44,10 @@ {{$t('add')}}
+
+ + {{$t('dataExport')}} +
{{$t('templateDownload')}} @@ -168,6 +172,17 @@ export default { this.getList() }, methods: { + //导出 + handleExport() { + let query = { + pageNo: this.pageNo, + pageSize: this.pageSize, + paramsTemplateId: this.$route.query.id, + ...this.queryParam, + id: this.selectedRowKeys.join(',') + } + postAction('params/paramsInfo/exportParamsInfoZip', {exportName: '参数项列表.xls'}, query, this.Deselect) + }, //下载模板 handleModule() { downloadFile('params/paramsInfo/exportTemplate', '参数项列表.xls', {}) From 2d3a9a9fde671b5b1abd849ae7ef58386458de50 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Fri, 29 Apr 2022 10:47:24 +0800 Subject: [PATCH 08/33] =?UTF-8?q?[=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8]=20=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/parameter/parameterlist/index.vue | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index f08b70e00..8280b8c03 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -52,6 +52,9 @@ {{$t('templateDownload')}}
+
+ +
{{$t('BatchDelete')}} @@ -98,11 +101,13 @@ import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage' import addModel from './components/addModel' import axios from 'axios' import { ACCESS_TOKEN } from '@/store/mutation-types' +import ImportFile from '@/components/ImportFile/index' import Vue from 'vue' export default { name: 'index', components: { addModel, + ImportFile }, data() { return { @@ -117,13 +122,13 @@ export default { dataSource: [], confirmLoading: false, url: { - queryById: 'params/paramsInfo/queryById', - list: 'params/paramsInfo/page', - add: 'params/paramsInfo/add', - edit: 'params/paramsInfo/edit', - deleteBatch: 'params/paramsInfo/delete', - deleteAll: 'params/paramsInfo/deleteBatch', - + queryById: 'params/paramsInfo/queryById', // 编辑 通过id进行查询 + list: 'params/paramsInfo/page', // 查询列表 + add: 'params/paramsInfo/add', // 添加 -- 提交 + edit: 'params/paramsInfo/edit', // 编辑 -- 提交 + deleteBatch: 'params/paramsInfo/delete', // 单个删除 + deleteAll: 'params/paramsInfo/deleteBatch', // 批量删除 + importZipUrl: 'params/paramsInfo/importParamsInfo', // 导入 }, total: 0, pageSize: 10, From b0b0864d6eb3f6b0c8bdf7ae75c0e4dbd743d526 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 29 Apr 2022 11:57:12 +0800 Subject: [PATCH 09/33] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E5=A4=8D=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ParamsInfoEOController.java | 5 +- .../ParamsTemplateEOController.java | 22 ++- .../CertCategoryParamsInfoEOMapper.java | 4 + .../template/mapper/ParamsInfoEOMapper.java | 7 +- .../xml/CertCategoryParamsInfoEOMapper.xml | 17 ++ .../mapper/xml/ParamsInfoEOMapper.xml | 20 +++ .../ICertCategoryParamsInfoEOService.java | 6 + .../service/IParamsInfoEOService.java | 6 + .../service/IParamsTemplateEOService.java | 2 + .../CertCategoryParamsInfoEOServiceImpl.java | 10 ++ .../service/impl/ParamsInfoEOServiceImpl.java | 152 ++++++++++++++---- .../impl/ParamsTemplateEOServiceImpl.java | 86 +++++++++- .../vo/CertCategoryParamsInfoCnImport.java | 8 +- .../cert/template/vo/ParamsInfoVO.java | 1 + 14 files changed, 299 insertions(+), 47 deletions(-) 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 a4771a6bf..d620cf240 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 @@ -55,6 +55,8 @@ public class ParamsInfoEOController extends JeroController queryPageList(ParamsInfoEO paramsInfoEO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="orderByField") String orderByField, + @RequestParam(name="orderBy") String orderBy, @RequestParam(name="cut") String cut, HttpServletRequest req) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -62,6 +64,7 @@ public class ParamsInfoEOController extends JeroController page = new Page(pageNo, pageSize); IPage pageList = paramsInfoEOService.page(page, queryWrapper); @@ -202,7 +205,7 @@ public class ParamsInfoEOController extends JeroController copyById(@RequestParam(name="id") String id, + @RequestParam(name="paramsTemplateName") String paramsTemplateName) { + ParamsTemplateEO paramsTemplateEO = paramsTemplateEOService.copyById(id, paramsTemplateName); + return Result.OK("复制成功", paramsTemplateEO); + } + + + /** * 导出excel * * @param request diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoEOMapper.java index 45fb117d7..397c83626 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoEOMapper.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoEOMapper.java @@ -21,5 +21,9 @@ public interface CertCategoryParamsInfoEOMapper extends BaseMapper selectListByNioNumber(@Param("nioNumber") String nioNumber); + List selectListByParamsTemplateIds(@Param("paramsTemplateIds") String paramsTemplateIds); + int deleteByNioNumberList(@Param("list") List nioNumberList); + + int deleteByParamsTemplateIds(@Param("paramsTemplateIds") String paramsTemplateIds); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java index 586d63afa..70c378fc1 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java @@ -17,6 +17,11 @@ import java.util.List; public interface ParamsInfoEOMapper extends BaseMapper { List selectListWithCert(@Param("paramsInfoVO") ParamsInfoVO paramsInfoVO); - + List selectListWithCertForEnExport(@Param("paramsInfoVO") ParamsInfoVO paramsInfoVO); + + int deleteByParamsTemplateIds(@Param("paramsTemplateIds") String paramsTemplateIds); + + List selectListByParamsTemplateIds(@Param("paramsTemplateIds") String paramsTemplateIds); + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml index 8a054a983..6c71449cc 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml @@ -25,6 +25,15 @@ + + delete from cert_category_params_info where nio_number in @@ -32,4 +41,12 @@ #{nioNumber} + + + delete from cert_category_params_info + where params_template_id in + + #{item} + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml index 3867e87ed..b9bfc343b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml @@ -117,6 +117,9 @@ + + AND params_template_id LIKE CONCAT(CONCAT('%',#{paramsInfoVO.paramsTemplateId}),'%') + AND nio_number LIKE CONCAT(CONCAT('%',#{paramsInfoVO.nioNumber}),'%') @@ -153,4 +156,21 @@ + + + + delete from params_info + where params_template_id in + + #{item} + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java index 7421eaee0..93d2eed83 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java @@ -2,6 +2,8 @@ package com.jero.modules.cert.template.service; import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO; import com.baomidou.mybatisplus.extension.service.IService; +import org.apache.ibatis.annotations.Param; + import java.util.List; /** @@ -61,5 +63,9 @@ public interface ICertCategoryParamsInfoEOService extends IService selectListByNioNumber(String nioNumber); + List selectListByParamsTemplateIds(String paramsTemplateIds); + int deleteByNioNumberList(List nioNumberList); + + int deleteByParamsTemplateIds(String paramsTemplateIds); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java index d6dbb107c..ab26f9e10 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java @@ -6,6 +6,7 @@ import com.jero.modules.cert.template.entity.ParamsInfoEO; import com.jero.modules.cert.template.vo.CertCategoryParamsInfoCnImport; import com.jero.modules.cert.template.vo.ParamsInfoCnImport; import com.jero.modules.cert.template.vo.ParamsInfoVO; +import org.apache.ibatis.annotations.Param; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; @@ -96,4 +97,9 @@ public interface IParamsInfoEOService extends IService { String unzipfilepath, String paramsTemplateId, String cut); + + + int deleteByParamsTemplateIds(String paramsTemplateIds); + + List selectListByParamsTemplateIds(String paramsTemplateIds); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java index 477c465b3..a6d22f9cd 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java @@ -53,6 +53,8 @@ public interface IParamsTemplateEOService extends IService { */ ParamsTemplateEO queryById(String id); + ParamsTemplateEO copyById(String id, String paramsTemplateName); + /** * 列表查询 * diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java index e7729a896..0ca3caeda 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java @@ -93,8 +93,18 @@ public class CertCategoryParamsInfoEOServiceImpl extends ServiceImpl selectListByParamsTemplateIds(String paramsTemplateIds) { + return baseMapper.selectListByParamsTemplateIds(paramsTemplateIds); + } + @Override public int deleteByNioNumberList(List nioNumberList) { return baseMapper.deleteByNioNumberList(nioNumberList); } + + @Override + public int deleteByParamsTemplateIds(String paramsTemplateIds) { + return baseMapper.deleteByParamsTemplateIds(paramsTemplateIds); + } } 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 6167f4cfc..2090ef98c 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 @@ -90,7 +90,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl { - certCategoryParamsInfoEO.setParamsTemplateId(paramsInfoId); + certCategoryParamsInfoEO.setParamsTemplateId(paramsTemplateId); certCategoryParamsInfoEO.setNioNumber(nioNumber); }); certCategoryParamsInfoEOService.saveBatch(certCategoryParamsInfoEOList); @@ -130,7 +130,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl { - certCategoryParamsInfoEO.setParamsTemplateId(paramsInfoId); + certCategoryParamsInfoEO.setParamsTemplateId(paramsTemplateId); certCategoryParamsInfoEO.setNioNumber(nioNumber); }); certCategoryParamsInfoEOService.saveBatch(certCategoryParamsInfoEOList); @@ -808,6 +809,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl stringMessage = new ArrayList<>(); - int i = 2; //记录行号 + int i = 1; //记录行号 int num = 0; //记录是第几条数据 //循环验证数据 for (ParamsInfoCnImport dto : paramsInfoEOList) { @@ -895,9 +897,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl resultMap = new HashMap<>(); // nio编号 String nioNumber = dto.getNioNumber(); - validateMustAndLength(nioNumber, "nio编号", IsMustEnum.YES.getValue(),"15", errorMsg, countError, false, cut); + resultMap = validateMustAndLength(nioNumber, "nio编号", IsMustEnum.YES.getValue(),"15", false, cut); + errorMsg += (String)resultMap.get("errorMsg"); + countError += (int)resultMap.get("countError"); if (StringUtils.isNotEmpty(dto.getNioNumber())) { // 校验nio编号 格式：字母数字横杠（-） String nioNumberRegex = "^[A-Za-z0-9-]+$"; @@ -909,56 +914,97 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl> ccDtoMap : certCategoryParamsInfoEOListMap.entrySet()) { String certCategory = ccDtoMap.getKey(); List ccDtoList = ccDtoMap.getValue(); + int j = 1; for (CertCategoryParamsInfoCnImport ccDto : ccDtoList) { //判断此行数据是否全部为空,是则不读取 if (checkObjAllFieldsIsNull(ccDto)) { continue; } - i++; + j++; int countError = 0; //记录失败数据数量 String errorMsg = ""; if (CutEnum.CN.getValue().equals(cut)) { - errorMsg = certCategory + " 第" + i + "行："; + errorMsg = certCategory + " 第" + j + "行："; } else { - errorMsg = i + " line："; + errorMsg = j + " line："; } + Map resultMap = new HashMap<>(); // nio编号 String nioNumber = ccDto.getNioNumber(); - validateMustAndLength(nioNumber, "nio编号", IsMustEnum.YES.getValue(),"15", errorMsg, countError, false, cut); + resultMap = validateMustAndLength(nioNumber, "nio编号", IsMustEnum.YES.getValue(),"15", false, cut); + errorMsg += (String)resultMap.get("errorMsg"); + countError += (int)resultMap.get("countError"); if (StringUtils.isNotEmpty(ccDto.getNioNumber())) { // 校验nio编号 格式：字母数字横杠（-） String nioNumberRegex = "^[A-Za-z0-9-]+$"; @@ -1032,13 +1082,19 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl 0) { stringMessage.add(errorMsg); @@ -1072,8 +1128,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl validateMustAndLength (String value, String fieldName, String mustInput, String dbLength, Boolean isSingle, String cut) { + String errorMsg = ""; + int countError= 0; + Map resultMap = new HashMap<>(); + + if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isEmpty(value)) { if(CutEnum.CN.getValue().equals(cut)) { errorMsg += fieldName + "为必填项,不能为空；"; } else { @@ -1082,7 +1142,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { + if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) { if(CutEnum.CN.getValue().equals(cut)) { errorMsg += fieldName + "不能超过" + dbLength + "个字符；"; } else { @@ -1093,7 +1153,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl getCodeByName(String value, String fieldName, String type, Map enumMap, List judgeData, List coverData,String cut) { + String errorMsg = ""; + int countError= 0; + Map resultMap = new HashMap<>(); + if ("treeDicCode".equals(type)) { // 树形字典类型 List treeNameList = judgeData; @@ -1220,6 +1287,10 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl selectListByParamsTemplateIds(String paramsTemplateIds) { + return baseMapper.selectListByParamsTemplateIds(paramsTemplateIds); + } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java index 44728a7d7..8914c5ae1 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java @@ -1,13 +1,24 @@ package com.jero.modules.cert.template.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO; +import com.jero.modules.cert.template.entity.ParamsInfoEO; import com.jero.modules.cert.template.entity.ParamsTemplateEO; import com.jero.modules.cert.template.mapper.ParamsTemplateEOMapper; +import com.jero.modules.cert.template.service.ICertCategoryParamsInfoEOService; +import com.jero.modules.cert.template.service.IParamsInfoEOService; import com.jero.modules.cert.template.service.IParamsTemplateEOService; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.UUID; /** * @Description: 参数模板表 @@ -18,6 +29,12 @@ import java.util.List; @Service public class ParamsTemplateEOServiceImpl extends ServiceImpl implements IParamsTemplateEOService { + @Autowired + private IParamsInfoEOService paramsInfoEOService; + + @Autowired + private ICertCategoryParamsInfoEOService certCategoryParamsInfoEOService; + /** * 保存 * @@ -26,6 +43,7 @@ public class ParamsTemplateEOServiceImpl extends ServiceImpl ids) { - // TODO 关联删除参数项 + // 关联删除参数项 + certCategoryParamsInfoEOService.deleteByParamsTemplateIds(StringUtils.join(ids, ",")); + paramsInfoEOService.deleteByParamsTemplateIds(StringUtils.join(ids, ",")); removeByIds(ids); } @@ -83,7 +105,65 @@ public class ParamsTemplateEOServiceImpl extends ServiceImpl sourceParamsInfoEOList = paramsInfoEOService.selectListByParamsTemplateIds(id); + List sourceCertCategoryParamsInfoEOList = certCategoryParamsInfoEOService.selectListByParamsTemplateIds(id); + + ParamsTemplateEO target = new ParamsTemplateEO(); + List targetParamsInfoEOList = new ArrayList<>(); + List targetCertCategoryParamsInfoEOList = new ArrayList<>(); + + BeanUtils.copyProperties(source, target); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String paramsTemplateId = UUID.randomUUID().toString().replace("-",""); + + target.setId(paramsTemplateId); + target.setParamsTemplateName(paramsTemplateName); + target.setCreateTime(new Date()); + target.setCreateBy(sysUser.getUsername()); + target.setUpdateTime(new Date()); + target.setUpdateBy(sysUser.getUsername()); + + for (ParamsInfoEO sourceParamsInfoEO : sourceParamsInfoEOList) { + ParamsInfoEO targetParamsInfoEO = new ParamsInfoEO(); + BeanUtils.copyProperties(sourceParamsInfoEO, targetParamsInfoEO); + targetParamsInfoEO.setParamsTemplateId(paramsTemplateId); + targetParamsInfoEO.setId(UUID.randomUUID().toString().replace("-","")); + targetParamsInfoEO.setCreateTime(new Date()); + targetParamsInfoEO.setCreateBy(sysUser.getUsername()); + targetParamsInfoEO.setUpdateTime(new Date()); + targetParamsInfoEO.setUpdateBy(sysUser.getUsername()); + targetParamsInfoEOList.add(targetParamsInfoEO); + } + + for (CertCategoryParamsInfoEO sourceCertCategoryParamsInfoEO : sourceCertCategoryParamsInfoEOList) { + CertCategoryParamsInfoEO targetCertCategoryParamsInfoEO = new CertCategoryParamsInfoEO(); + BeanUtils.copyProperties(sourceCertCategoryParamsInfoEO, targetCertCategoryParamsInfoEO); + targetCertCategoryParamsInfoEO.setParamsTemplateId(paramsTemplateId); + targetCertCategoryParamsInfoEO.setId(null); + targetCertCategoryParamsInfoEO.setCreateTime(new Date()); + targetCertCategoryParamsInfoEO.setCreateBy(sysUser.getUsername()); + targetCertCategoryParamsInfoEO.setUpdateTime(new Date()); + targetCertCategoryParamsInfoEO.setUpdateBy(sysUser.getUsername()); + targetCertCategoryParamsInfoEOList.add(targetCertCategoryParamsInfoEO); + } + + paramsInfoEOService.saveBatch(targetParamsInfoEOList); + certCategoryParamsInfoEOService.saveBatch(targetCertCategoryParamsInfoEOList); + save(target); + + return target; + } + + /** * 列表查询 * * @return diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java index f72d23fff..077406aad 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java @@ -42,22 +42,22 @@ public class CertCategoryParamsInfoCnImport { private String sysOrgCode; /**编号*/ - @Excel(name = "*number", width = 15, orderNum = "2") + @Excel(name = "*编号", width = 15, orderNum = "2") @ApiModelProperty(value = "编号") private String paramsNumber; /**参数名称*/ - @Excel(name = "*params name", width = 15, orderNum = "3") + @Excel(name = "*参数名称", width = 15, orderNum = "3") @ApiModelProperty(value = "参数名称") private String paramsName; /**参数说明*/ - @Excel(name = "description", width = 36, orderNum = "4") + @Excel(name = "参数说明", width = 36, orderNum = "4") @ApiModelProperty(value = "参数说明") private String description; /**nio编号*/ - @Excel(name = "*nio number", width = 15, orderNum = "1") + @Excel(name = "*nio编号", width = 15, orderNum = "1") @ApiModelProperty(value = "nio编号") private String nioNumber; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoVO.java index 3cc7fbed5..ce00d832f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoVO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoVO.java @@ -13,4 +13,5 @@ public class ParamsInfoVO { private String paramsName; // 参数名称 private String dutyTerritory; // 责任领域 private String ids; // 勾选的参数项id + private String paramsTemplateId; // 参数模板id } From 6af8fc4afa968af3acf80f5a893474cab11bb318 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 29 Apr 2022 13:31:51 +0800 Subject: [PATCH 10/33] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9nio=E7=BC=96=E5=8F=B7=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cert/template/controller/ParamsInfoEOController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 d620cf240..147db3e03 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 @@ -55,8 +55,8 @@ public class ParamsInfoEOController extends JeroController queryPageList(ParamsInfoEO paramsInfoEO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - @RequestParam(name="orderByField") String orderByField, - @RequestParam(name="orderBy") String orderBy, + @RequestParam(name="orderByField", required = false) String orderByField, + @RequestParam(name="orderBy", required = false) String orderBy, @RequestParam(name="cut") String cut, HttpServletRequest req) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); From 5bf848e32fd8458101e7d0293d864f71220fb003 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 29 Apr 2022 13:34:52 +0800 Subject: [PATCH 11/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4=20?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E8=AF=84=E8=AE=BA?= 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 + .../ProjectDetails/index.vue | 13 +- .../components/commentList.vue | 270 ++++++++++++++++++ .../components/listEditModel.vue | 2 +- .../components/listOfRegulations.vue | 4 +- .../components/transferList.vue | 2 +- 7 files changed, 285 insertions(+), 8 deletions(-) create mode 100644 jero-web/src/views/projectManagement/components/commentList.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 38d1c1657..5a30ac0b3 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -734,4 +734,5 @@ module.exports = { Submitting:'Submitting', Returning:'Returning', terminationProcessing:'Termination process', + publishComment:'publish comment', } \ 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 2a5a74c2a..131e8d78a 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -739,4 +739,5 @@ module.exports = { Submitting:'提交中...', Returning:'退回中', terminationProcessing:'终止流程中', + publishComment:'发表评论', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index 240cc8cf9..5e08d107f 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -10,7 +10,7 @@
-
+
{{$t('comment')}}
@@ -59,6 +59,7 @@
+
@@ -70,7 +71,7 @@ import nonConformance from '../components/nonConformance' import updateLog from '@/components/UpdateLog/index' import historicalVersionList from '../components/historicalVersionList' - + import commentList from '../components/commentList' export default { name: 'ProjectDetails', components: { @@ -80,7 +81,8 @@ TaskParameterCollection, nonConformance, updateLog, - historicalVersionList + historicalVersionList, + commentList }, data() { return { @@ -120,7 +122,10 @@ }, historicalVersionClick() { this.$refs.historicalVersionListRef.getList() - } + }, + commentClick(){ + this.$refs.commentListRef.getData() + }, } } diff --git a/jero-web/src/views/projectManagement/components/commentList.vue b/jero-web/src/views/projectManagement/components/commentList.vue new file mode 100644 index 000000000..b3ec76b66 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/commentList.vue @@ -0,0 +1,270 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index e648d61e4..a0578483c 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -1,6 +1,6 @@ diff --git a/jero-web/src/views/projectManagement/components/fixedPlateForm.vue b/jero-web/src/views/projectManagement/components/fixedPlateForm.vue new file mode 100644 index 000000000..26fc25c51 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/fixedPlateForm.vue @@ -0,0 +1,133 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/historicalVersionList.vue b/jero-web/src/views/projectManagement/components/historicalVersionList.vue index 372d5d7ae..4066ed627 100644 --- a/jero-web/src/views/projectManagement/components/historicalVersionList.vue +++ b/jero-web/src/views/projectManagement/components/historicalVersionList.vue @@ -20,17 +20,6 @@ {{$t('See')}} -
- -
@@ -38,16 +27,15 @@ import { getAction, postAction, } from '@/api/manage' export default { name: 'historicalVersionList', - props:['url'], data(){ return{ visible:false, confirmLoading:false, dataSource:[], loading:false, - pageNo: 1, - pageSize: 10, - total: 0, + url:{ + list:'project/projectHistoryVersionsEO/list', + }, columns: [ { title: this.$t('versionName'), @@ -76,7 +64,6 @@ methods:{ getList(){ this.visible = true - this.pageNo = 1 this.historicalList() }, handleOk() { @@ -85,26 +72,14 @@ handleCancel() { this.visible = false }, - onChange(page, pageSize) { - this.pageNo = page - this.historicalList() - }, - SizeChange(page, pageSize) { - this.pageNo = 1 - this.pageSize = pageSize - this.historicalList() - }, historicalList(){ let query = { - pageNo: this.pageNo, - pageSize: this.pageSize, - documentId: this.$route.query.id + projectLibraryId: this.$route.query.id } this.loading = true - getAction(this.url.historicalVersionUrl, query).then((res) => { + getAction(this.url.list, query).then((res) => { if (res.success) { - this.dataSource = res.result.records - this.total = res.result.total + this.dataSource = res.result || [] this.loading = false } else { this.loading = false diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index ccd2f2397..2ed47eb30 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -58,7 +58,7 @@ {{ $t('alteration') }}
-
+
{{ $t('fixedPlate') }}
@@ -184,6 +184,7 @@ + 0) { + let isTrue + for (let i = 0; i < this.dataSource.length; i++) { + if (this.dataSource[i].taskAffirmStatus == 'rejected' && this.dataSource[i].inventoryAffirmStatus == 'rejected') { + isTrue = true + } else { + isTrue = false + this.$message.warning(this.$t('theReceived')) + return + } + } + if (isTrue) { + this.$refs.fixedPlateRef.getData() + } + } + }, handleAdd() { this.$refs.addModelRef.addModel() }, From 91cbd3ae292d93b796ce7ea2ed130a5c33c50e57 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Fri, 29 Apr 2022 17:40:21 +0800 Subject: [PATCH 31/33] =?UTF-8?q?[=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8]=20=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/api/manage.js | 15 +++++++++++++ .../views/parameter/parameterlist/index.vue | 21 +++++++++++++------ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/jero-web/src/api/manage.js b/jero-web/src/api/manage.js index 74e813452..8e3d35147 100644 --- a/jero-web/src/api/manage.js +++ b/jero-web/src/api/manage.js @@ -113,6 +113,21 @@ export function downFile(url,parameter){ }) } +/** + * 下载文件 用于excel导出 -- post + * @param url + * @param parameter + * @returns {*} + */ +export function downFilePost(url,parameter){ + return axios({ + url: url, + data: parameter, + method:'post' , + responseType: 'blob' + }) +} + /** * 下载文件 * @param url 文件路径 diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 3d1864209..e0f74cf14 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -98,7 +98,7 @@