From 034c7ab2eb1f14ec98072fe3fd1ae6f4640cfb3e Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 3 Jan 2023 18:04:37 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E3=80=81=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E4=B8=8A=E6=8A=A5=E5=BA=93=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E6=A3=80=E7=B4=A2=E7=BC=96=E5=8F=B7=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 19 +++++++++++- .../mapper/xml/ParamsReportDetailEOMapper.xml | 7 +++-- .../controller/ParamsInfoEOController.java | 30 ++++++++++++++++--- .../mapper/xml/ParamsInfoEOMapper.xml | 3 +- 4 files changed, 50 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index e41696c0e..679e73909 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -386,7 +386,24 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImplwrapper.eq("nio_number", paramsCollectManifestVO.getAllNumber()).or().eq("params_number", paramsCollectManifestVO.getAllNumber())); - queryWrapper.and(wrapper->wrapper.like("nio_number", paramsCollectManifestVO.getAllNumber())); + //queryWrapper.and(wrapper->wrapper.like("nio_number", paramsCollectManifestVO.getAllNumber())); + + QueryWrapper categoryParamsQueryWrap = new QueryWrapper<>(); + categoryParamsQueryWrap.lambda().eq(CertCategoryParamsInfoPublishEO::getParamsNumber,paramsCollectManifestVO.getAllNumber()); + List categoryParamsList = this.certCategoryParamsInfoPublishEOService.list(categoryParamsQueryWrap); + + queryWrapper.and(wrapper -> { + wrapper.eq("nio_number",paramsCollectManifestVO.getAllNumber()); + if(CollectionUtils.isNotEmpty(categoryParamsList)){ + List nioNumberList = categoryParamsList.stream().map(CertCategoryParamsInfoPublishEO::getNioNumber) + .collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(nioNumberList)){ + wrapper.or(wrap -> { + wrap.in("nio_number",nioNumberList); + }); + } + } + }); } if (StringUtils.isNotEmpty(paramsCollectManifestVO.getDutyTerritory())) { List dutyTerritoryList = Arrays.asList(paramsCollectManifestVO.getDutyTerritory().split(",")); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml index b6a68d6a0..cadd19977 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml @@ -71,7 +71,10 @@ - AND prd.nio_number LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.allNumber}),'%') + AND ( + prd.nio_number = #{paramsReportDetailVO.allNumber} + or prd.nio_number in (select nio_number from report_cert_category_params_info rccpi where rccpi.params_number = #{paramsReportDetailVO.allNumber}) + ) AND prd.params_name LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.paramsName}),'%') @@ -188,4 +191,4 @@ and prcd.params_config_id = #{paramsReportConfigId} - \ No newline at end of file + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java index a90866929..d47626efc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java @@ -10,13 +10,16 @@ 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.CertCategoryParamsInfoEO; import com.jero.modules.cert.template.entity.ParamsInfoEO; +import com.jero.modules.cert.template.service.ICertCategoryParamsInfoEOService; import com.jero.modules.cert.template.service.IParamsInfoEOService; import com.jero.modules.cert.template.service.IParamsInfoPublishEOService; import com.jero.modules.cert.template.vo.ParamsInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +32,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** @@ -47,7 +51,10 @@ public class ParamsInfoEOController extends JeroController queryWrapper = new QueryWrapper<>(); String finalAllNumber = allNumber; - queryWrapper.eq("pi.params_template_id", paramsInfoEO.getParamsTemplateId()) - .and(StringUtils.isNotEmpty(allNumber), wrapper->wrapper.eq("pi.nio_number", finalAllNumber).or().eq("ccpi.params_number", finalAllNumber)) - .like(StringUtils.isNotEmpty(paramsInfoEO.getParamsName()), "pi.params_name", paramsInfoEO.getParamsName()) + queryWrapper.eq("pi.params_template_id", paramsInfoEO.getParamsTemplateId()); + if(StringUtils.isNotEmpty(allNumber)){ + queryWrapper.and(wrapper->wrapper.eq("pi.nio_number", finalAllNumber)); + + QueryWrapper categoryParamsQueryWrap = new QueryWrapper<>(); + categoryParamsQueryWrap.lambda().eq(CertCategoryParamsInfoEO::getParamsNumber,finalAllNumber); + List certCategoryParamsInfoEOList = this.certCategoryParamsInfoEOService.list(categoryParamsQueryWrap); + + if(CollectionUtils.isNotEmpty(certCategoryParamsInfoEOList)){ + List nioNumberList = certCategoryParamsInfoEOList.stream().map(CertCategoryParamsInfoEO::getNioNumber).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(nioNumberList)){ + queryWrapper.or(wrap -> { + wrap.in("pi.nio_number",nioNumberList); + }); + } + } + } + queryWrapper.like(StringUtils.isNotEmpty(paramsInfoEO.getParamsName()), "pi.params_name", paramsInfoEO.getParamsName()) .eq(StringUtils.isNotEmpty(paramsInfoEO.getDutyTerritory()), "pi.duty_territory", paramsInfoEO.getDutyTerritory()) .orderBy(true, "asc".equals(orderBy)?true:false, "pi.nio_number"); Page page = new Page(pageNo, pageSize); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml index 55da74b69..fd915712e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml @@ -180,7 +180,6 @@ - \ No newline at end of file + From 0369369ec422e4b9b149b3beddae448f1151d0e9 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 4 Jan 2023 14:41:45 +0800 Subject: [PATCH 2/9] =?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=B8=85=E5=8D=95-=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BC=A0=E5=8F=82=E6=96=B9=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterItemCollectionList.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 2c2aa64cd..5dacd7eca 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1038,9 +1038,14 @@ this.$refs.globalAdvancedQueryRef.superQueryFlag = false } else { this.$refs.globalAdvancedQueryRef.superQueryFlag = true - sqp['superQueryParams'] = encodeURI(JSON.stringify(params)) + // sqp['superQueryParams'] = encodeURI(JSON.stringify(params)) + params.forEach((item) => { + item.type = matchType + }) + sqp['queryConditionVOListStr'] = JSON.stringify(params) sqp['superQueryMatchType'] = matchType } + console.log(sqp) this.queryParamQuery = sqp this.$refs.CollectionTabel.pageNo = 1 // this.$refs.CollectionTabel.getTableList(this.queryParamQuery) From 9f09756fe606cd230f8efadc97f0b002e789db95 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 4 Jan 2023 14:54:39 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=88=97=E8=A1=A8=20=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 18c5465eb..8dafa8e93 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -853,20 +853,23 @@ // userTypes: this.currentPersonRole } let url + let action this.loading = true this.$emit('listReset', '') // todo if (this.$route.query.it === undefined) { // 页面跳转 url = this.url.tableList + action = postAction params.paramsManifestId = this.$route.query.id params.userTypes = this.currentPersonRole } else { // 历史版本 + action = getAction url = 'params/collectManifestHistory/list' params.paramsManifestId = this.$route.query.it } - getAction(url, params).then((res) => { + action(url, params).then((res) => { if (res.success) { let tt = [] if (this.currentPersonRole !== 'dre') { @@ -915,12 +918,15 @@ getTableList(currentPersonRole) { let paramsManifestid let url + let action if (this.$route.query.it === undefined) { // 页面跳转 paramsManifestid = this.$route.query.id url = this.url.tableList + action = postAction } else { // 历史版本 + action = getAction paramsManifestid = this.$route.query.it url = 'params/collectManifestHistory/list' } @@ -934,7 +940,7 @@ ...this.queryParamQuery } this.loading = true - getAction(url, params).then((res) => { + action(url, params).then((res) => { if (res.success) { // console.log(res.result,'res.result') // let tt = [] From e7fcfb89035d6d29d151599c928f150030e7ea3e Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 4 Jan 2023 17:58:05 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E4=BC=A0=E5=8F=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 5dacd7eca..dcdcd4fbf 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -667,7 +667,7 @@ }, { type: 'string', - value: 'paramsBatch', + value: 'params_batch', text: this.$t('parameterBatch'), dictCode: 'params_batch' }, From 0fe60644a9b8386e8b7743afec47031372b3b2c6 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 6 Jan 2023 09:53:33 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E6=B7=BB=E5=8A=A0=E5=85=A8?= =?UTF-8?q?=E9=80=89=E5=8A=9F=E8=83=BD?= 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 + .../components/customizeList.vue | 275 ++++++++++++++++++ .../components/listOfRegulations.vue | 11 +- .../views/system/modules/RoleAssignment.vue | 73 ++++- .../src/views/system/modules/UserModal.vue | 66 ++++- 6 files changed, 413 insertions(+), 16 deletions(-) create mode 100644 jero-web/src/views/projectManagement/components/customizeList.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b57ccfc50..25ca4a443 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1376,4 +1376,6 @@ module.exports = { Updateparametercolumn:'Update The Parameter Column', columnfirst:'Reference the parameter column first', columnforced:'Confirm a forced retraction?', + customize:'Customize the header', + customColumn:'Custom column', } \ 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 3f62cbed7..ecda6ea34 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1477,4 +1477,6 @@ module.exports = { brand:'品牌', allsubitemsitem:'该项目下拥有子项目，是否全部删除', contactTheFounder:'联系创建人', + customize:'自定义表头', + customColumn:'自定义列', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/customizeList.vue b/jero-web/src/views/projectManagement/components/customizeList.vue new file mode 100644 index 000000000..0624fa28e --- /dev/null +++ b/jero-web/src/views/projectManagement/components/customizeList.vue @@ -0,0 +1,275 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 04be80b4c..4134cfba6 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -161,6 +161,10 @@ ...{{ $t('more') }} +
+ + {{ $t('customize') }} +
{{ $t('bringInRelevantPersonnel') }} @@ -311,6 +315,7 @@ + 0) { diff --git a/jero-web/src/views/system/modules/RoleAssignment.vue b/jero-web/src/views/system/modules/RoleAssignment.vue index 6612e56a3..64091e859 100644 --- a/jero-web/src/views/system/modules/RoleAssignment.vue +++ b/jero-web/src/views/system/modules/RoleAssignment.vue @@ -25,17 +25,24 @@ - - - - - - - - + + + + + + + {{$t('selectAll')}} + + + {{ item.title }} + + @@ -75,6 +82,8 @@ export default { title: this.$t('add'), total: 0, selectedRowKeysDate: {}, + dutylist: [], + jobsStr:'', loading: false, editId: '', newVisible: false, @@ -113,8 +122,50 @@ export default { mounted() { this.loadData() this.initDictData() + this.getdutylist() }, methods: { + getdutylist(){ + getAction('/sys/dict/getDictItems/duty_territory', {}).then((res) => { + if (res.success) { + this.dutylist = res.result + } else { + this.dutylist = [] + } + }) + }, + onChange(val) { + // val 拿到的是数组格式的数据，比如：['测试1','测试3'] + const res = this.dutyTerritories.join(',') + this.jobsStr = res + this.dutyTerritories = this.checkAll(val, this.dutylist) + }, + checkAll(arr, modelList) { + // arr是onChange中的val数组 modelList是下拉框List + let length = arr.length + let list = arr + // 遍历已经选中的选项 + arr.forEach(element => { + // 当数组中存在0，说明此时进行全选/取消全选 + if (element === '0') { + // 当数组长度为最大长度且最后一个元素为0时，说明此时在全选的基础上又点击全选，则取消全选 + if (length - 1 === modelList.length && arr[length - 1] === '0') { + list = [] + // 取消全选时，jobsStr需要重置为空，否则全选的数据还会展示在下拉输入框中 + this.jobsStr = '' + } else { + // 当不是取消全选操作，只要数组中出现了0则说明进行了全选操作 + list = [] + for (let i in modelList) { + list.push(modelList[i].title) + // 全选时，也需要给jobsStr 赋值，拿到所有的下拉选项，并进行数据格式转换 + this.jobsStr = list.join(',') + } + } + } + }) + return list + }, initDictData() { //优先从缓存中读取字典配置 if (getDictItemsFromCache(this.dictCode)) { diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue index 2be2d4173..ed5f18123 100644 --- a/jero-web/src/views/system/modules/UserModal.vue +++ b/jero-web/src/views/system/modules/UserModal.vue @@ -76,10 +76,24 @@ - + + + + + + + {{$t('selectAll')}} + + + {{ item.title }} + + @@ -240,8 +254,10 @@ confirmDirty: false, viewshow: false, viewshowbrand: false, + jobsStr:'', selectedDepartKeys: [], //保存用户选择部门id brandsList: [], //保存用户选择部门id + dutylist: [], //保存用户选择部门id checkedDepartKeys: [], checkedDepartNames: [], // 保存部门的名称 =>title checkedDepartNameString: '', // 保存部门的名称 =>title @@ -380,6 +396,15 @@ } }) }, + getdutylist(){ + getAction('/sys/dict/getDictItems/duty_territory', {}).then((res) => { + if (res.success) { + this.dutylist = res.result + } else { + this.dutylist = [] + } + }) + }, loadUserRoles(userid) { queryUserRole({ userid: userid }).then((res) => { if (res.success) { @@ -494,12 +519,45 @@ this.refresh() this.edit({ activitiSync: '1' }) }, + onChange(val) { + // val 拿到的是数组格式的数据，比如：['测试1','测试3'] + const res = this.dutyTerritories.join(',') + this.jobsStr = res + this.dutyTerritories = this.checkAll(val, this.dutylist) + }, + checkAll(arr, modelList) { + // arr是onChange中的val数组 modelList是下拉框List + let length = arr.length + let list = arr + // 遍历已经选中的选项 + arr.forEach(element => { + // 当数组中存在0，说明此时进行全选/取消全选 + if (element === '0') { + // 当数组长度为最大长度且最后一个元素为0时，说明此时在全选的基础上又点击全选，则取消全选 + if (length - 1 === modelList.length && arr[length - 1] === '0') { + list = [] + // 取消全选时，jobsStr需要重置为空，否则全选的数据还会展示在下拉输入框中 + this.jobsStr = '' + } else { + // 当不是取消全选操作，只要数组中出现了0则说明进行了全选操作 + list = [] + for (let i in modelList) { + list.push(modelList[i].title) + // 全选时，也需要给jobsStr 赋值，拿到所有的下拉选项，并进行数据格式转换 + this.jobsStr = list.join(',') + } + } + } + }) + return list + }, edit(record) { this.resetScreenSize() // 调用此方法,根据屏幕宽度自适应调整抽屉的宽度 let that = this this.disabled = false that.initialRoleList() that.barndslist() + that.getdutylist() if (record.activitiSync) { this.disabled = true } From 9e87e5ca1806fc9cb65ce221a84766f15f5e26d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Fri, 6 Jan 2023 14:21:27 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86-=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0-=E5=93=81?= =?UTF-8?q?=E7=89=8C=E8=A1=A8=E5=A4=B4=E5=B1=85=E5=B7=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../businessSupport/collectionOfRegulatoryOpinions/index.vue | 2 +- .../src/views/businessSupport/technologyAssessment/index.vue | 2 +- jero-web/src/views/projectManagement/projectLibrary/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index bcb6359d8..5e60fffb1 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -213,7 +213,7 @@ }, { title: this.$t('brand'), - align: 'center', + align: 'left', ellipsis: true, width: 140, dataIndex: 'brand_text' diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index ff076ae87..277567333 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -282,7 +282,7 @@ }, { title: this.$t('brand'), - align: 'center', + align: 'left', ellipsis: true, width: 140, dataIndex: 'brand_text' diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue index fea8392cd..2d27a619d 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/index.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue @@ -243,7 +243,7 @@ }, { title: this.$t('brand'), - align: 'center', + align: 'left', width: 180, ellipsis: true, dataIndex: 'brandText' From 3643370ec15afe0275dd581552bdaefbd0c34c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 6 Jan 2023 16:54:51 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 66 ++++++++++--------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 679e73909..3773046d8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -3950,41 +3950,43 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl #a# # - String references_col = record1.get("references_col").toString(); - String[] references_colArr = references_col.split("#"); - if(StringUtils.equals(control_type,ControlTypeEnum.FILE.getValue())){ - String fileId = references_colArr[2]; - List fileInfos = this.ossFileService.getFileInfos(fileId); - String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); - references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; - }else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_FILE.getValue()) - ||StringUtils.equals(control_type,ControlTypeEnum.PULL_SINGLE_FILE.getValue()) - ||StringUtils.equals(control_type,ControlTypeEnum.PULL_MORE_FILE.getValue())){ - String fileId = references_colArr[2]; - List fileInfos = this.ossFileService.getFileInfos(fileId); - String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); - references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; - }else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue())){ - String fileId = references_colArr[2]; - List fileInfos = this.ossFileService.getFileInfos(fileId); - String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); - references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; - } - - StringBuilder references_colSb = new StringBuilder(); - for (String col : references_col.split("#")) { - if(StringUtils.isNotEmpty(col) && !StringUtils.equals(col," ")){ - references_colSb.append(col).append("#"); + if(!Objects.isNull(record1.get("references_col"))){ + String references_col = record1.get("references_col").toString(); + String[] references_colArr = references_col.split("#"); + if(StringUtils.equals(control_type,ControlTypeEnum.FILE.getValue())){ + String fileId = references_colArr[2]; + List fileInfos = this.ossFileService.getFileInfos(fileId); + String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; + }else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_FILE.getValue()) + ||StringUtils.equals(control_type,ControlTypeEnum.PULL_SINGLE_FILE.getValue()) + ||StringUtils.equals(control_type,ControlTypeEnum.PULL_MORE_FILE.getValue())){ + String fileId = references_colArr[2]; + List fileInfos = this.ossFileService.getFileInfos(fileId); + String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; + }else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue())){ + String fileId = references_colArr[2]; + List fileInfos = this.ossFileService.getFileInfos(fileId); + String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; } - } - if(StringUtils.isNotEmpty(references_colSb)){ - references_col = references_colSb.substring(0,references_colSb.length()-1); - }else { - references_col = references_colSb.toString(); - } + StringBuilder references_colSb = new StringBuilder(); + for (String col : references_col.split("#")) { + if(StringUtils.isNotEmpty(col) && !StringUtils.equals(col," ")){ + references_colSb.append(col).append("#"); + } + } - record1.put("references_col",references_col); + if(StringUtils.isNotEmpty(references_colSb)){ + references_col = references_colSb.substring(0,references_colSb.length()-1); + }else { + references_col = references_colSb.toString(); + } + + record1.put("references_col",references_col); + } // 处理负责领域 record1.put("duty_territory", dutyTerritoryMap.get(dutyTerritory)); From 491dd13e4d5b3cc9ef2900a4ba9ce80cdd9e3193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 6 Jan 2023 16:56:21 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 64 ++++++++++--------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 3773046d8..a8ece1d57 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -3952,40 +3952,42 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl #a# # if(!Objects.isNull(record1.get("references_col"))){ String references_col = record1.get("references_col").toString(); - String[] references_colArr = references_col.split("#"); - if(StringUtils.equals(control_type,ControlTypeEnum.FILE.getValue())){ - String fileId = references_colArr[2]; - List fileInfos = this.ossFileService.getFileInfos(fileId); - String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); - references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; - }else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_FILE.getValue()) - ||StringUtils.equals(control_type,ControlTypeEnum.PULL_SINGLE_FILE.getValue()) - ||StringUtils.equals(control_type,ControlTypeEnum.PULL_MORE_FILE.getValue())){ - String fileId = references_colArr[2]; - List fileInfos = this.ossFileService.getFileInfos(fileId); - String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); - references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; - }else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue())){ - String fileId = references_colArr[2]; - List fileInfos = this.ossFileService.getFileInfos(fileId); - String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); - references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; - } - - StringBuilder references_colSb = new StringBuilder(); - for (String col : references_col.split("#")) { - if(StringUtils.isNotEmpty(col) && !StringUtils.equals(col," ")){ - references_colSb.append(col).append("#"); + if(StringUtils.isNotEmpty(references_col)){ + String[] references_colArr = references_col.split("#"); + if(StringUtils.equals(control_type,ControlTypeEnum.FILE.getValue())){ + String fileId = references_colArr[2]; + List fileInfos = this.ossFileService.getFileInfos(fileId); + String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; + }else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_FILE.getValue()) + ||StringUtils.equals(control_type,ControlTypeEnum.PULL_SINGLE_FILE.getValue()) + ||StringUtils.equals(control_type,ControlTypeEnum.PULL_MORE_FILE.getValue())){ + String fileId = references_colArr[2]; + List fileInfos = this.ossFileService.getFileInfos(fileId); + String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; + }else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue())){ + String fileId = references_colArr[2]; + List fileInfos = this.ossFileService.getFileInfos(fileId); + String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; } - } - if(StringUtils.isNotEmpty(references_colSb)){ - references_col = references_colSb.substring(0,references_colSb.length()-1); - }else { - references_col = references_colSb.toString(); - } + StringBuilder references_colSb = new StringBuilder(); + for (String col : references_col.split("#")) { + if(StringUtils.isNotEmpty(col) && !StringUtils.equals(col," ")){ + references_colSb.append(col).append("#"); + } + } - record1.put("references_col",references_col); + if(StringUtils.isNotEmpty(references_colSb)){ + references_col = references_colSb.substring(0,references_colSb.length()-1); + }else { + references_col = references_colSb.toString(); + } + + record1.put("references_col",references_col); + } } // 处理负责领域 From b24ed1a7ac838ca50bad30d8436b22db6312835e Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 6 Jan 2023 17:09:50 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95-=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/system/query/QueryRuleEnum.java | 16 +- .../ParamsCollectManifestEOController.java | 16 +- .../mapper/ParamsCollectManifestEOMapper.java | 2 +- .../xml/ParamsCollectManifestEOMapper.xml | 2 +- .../IParamsCollectManifestEOService.java | 6 +- .../ParamsCollectManifestEOServiceImpl.java | 375 +++++++++++++++++- .../collect/vo/ParamsCollectManifestVO.java | 3 + 7 files changed, 404 insertions(+), 16 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/query/QueryRuleEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/query/QueryRuleEnum.java index bd8391377..c94510aeb 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/query/QueryRuleEnum.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/query/QueryRuleEnum.java @@ -24,8 +24,8 @@ public enum QueryRuleEnum { SQL_RULES("USE_SQL_RULES","ext","自定义SQL片段"); private String value; - - private String condition; + + private String condition; private String msg; @@ -70,4 +70,16 @@ public enum QueryRuleEnum { } return null; } + + public static QueryRuleEnum getByCondition(String condition){ + if(oConvertUtils.isEmpty(condition)) { + return null; + } + for(QueryRuleEnum val :values()){ + if (val.getCondition().equals(condition)){ + return val; + } + } + return null; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index 601c15d16..831ba4f35 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -1,5 +1,6 @@ package com.jero.modules.cert.collect.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -70,13 +71,14 @@ public class ParamsCollectManifestEOController extends JeroController queryList(ParamsCollectManifestVO paramsCollectManifestVO, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="100") Integer pageSize, - @RequestParam(name = "cut") String cut, - HttpServletRequest req) { + public Result queryList(@RequestBody JSONObject json) { + String cut = json.getString("cut"); + Integer pageNo = json.getInteger("pageNo"); + Integer pageSize = json.getInteger("pageSize"); + ParamsCollectManifestVO paramsCollectManifestVO = JSONObject.parseObject(JSONObject.toJSONString(json),ParamsCollectManifestVO.class); + // if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) { // paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%")); // } @@ -88,7 +90,7 @@ public class ParamsCollectManifestEOController extends JeroController queryByParamManifestId(@Param("paramsManifestId") String paramsManifestIdString); - IPage selectpage(@Param("page") IPage page, @Param("ew") Wrapper queryWrapper, @Param("paramsManifestEO")ParamsManifestEO paramsManifestEO); + IPage selectpage(@Param("page") IPage page, @Param("sqlJoin") String sqlJoin, @Param("paramsManifestEO")ParamsManifestEO paramsManifestEO); List queryByProjectId(@Param("projectId") String projectId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml index c41200b25..a64c16f48 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml @@ -134,7 +134,7 @@ from params_collect_manifest pcm where pcm.params_manifest_id = #{paramsManifestEO.id} ) temp - ${ew.customSqlSegment} + ${sqlJoin}