From 34777e91d544fe570270bbd700f2bf9f8296d04c Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 9 Aug 2022 13:48:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?country=5Fcard-=E7=AE=A1=E7=90=86=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=98=8E=E7=BB=86=E8=A1=A8-=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2:=E5=A4=84=E7=90=86=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ryCardManageReleaseDetailEOController.java | 8 ++-- .../CountryCardManageReleaseDetailEO.java | 13 ++++-- .../entity/ProblemKnowledgeBaseEO.java | 10 ++--- ...untryCardManageReleaseDetailEOService.java | 11 ++++- ...yCardManageReleaseDetailEOServiceImpl.java | 42 ++++++++++++++++++- 5 files changed, 67 insertions(+), 17 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java index c6c423cab..493c97a09 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java @@ -59,6 +59,7 @@ public class CountryCardManageReleaseDetailEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(countryCardManageReleaseDetailEO, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = countryCardManageReleaseDetailEOService.page(page, queryWrapper); + this.countryCardManageReleaseDetailEOService.disposeData(pageList.getRecords(),countryCardManageReleaseDetailEO.getCut()); return Result.OK(pageList); } @@ -70,9 +71,10 @@ public class CountryCardManageReleaseDetailEOController extends JeroController> queryList() { - List list = countryCardManageReleaseDetailEOService.queryList(); - return Result.OK(list); + public Result> queryList(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO,HttpServletRequest req) { + List result = countryCardManageReleaseDetailEOService.queryList(countryCardManageReleaseDetailEO,req); + this.countryCardManageReleaseDetailEOService.disposeData(result,countryCardManageReleaseDetailEO.getCut()); + return Result.OK(result); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java index 6df383189..61fb169dc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java @@ -1,21 +1,18 @@ package com.jero.modules.problemKnowledgeBase.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; 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 lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** @@ -70,6 +67,10 @@ public class CountryCardManageReleaseDetailEO implements Serializable { @Excel(name = "模板表id", width = 15) @ApiModelProperty(value = "模板表id") private java.lang.String countryCardTempId; + /**标签名称**/ + @TableField(exist = false) + @ApiModelProperty(value = "标签名称") + private java.lang.String countryCardTempIdName; /**描述*/ @Excel(name = "描述", width = 15) @@ -81,4 +82,8 @@ public class CountryCardManageReleaseDetailEO implements Serializable { @ApiModelProperty(value = "内容") private java.lang.String content; + + @TableField(exist = false) + private String cut; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java index dd152f332..7287306a9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java @@ -1,8 +1,6 @@ package com.jero.modules.problemKnowledgeBase.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; import java.util.List; import com.baomidou.mybatisplus.annotation.IdType; @@ -18,8 +16,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - /** * @Description: 问题知识库表 @@ -100,9 +96,9 @@ public class ProblemKnowledgeBaseEO implements Serializable { /**内容（正文）*/ @Excel(name = "内容（正文）", width = 15) - private transient java.lang.String contentString; + private java.lang.String content; - private byte[] content; + /*private byte[] content; public byte[] getContent(){ if(contentString==null){ @@ -126,7 +122,7 @@ public class ProblemKnowledgeBaseEO implements Serializable { e.printStackTrace(); } return ""; - } + }*/ /**附件*/ @Excel(name = "附件", width = 15) @ApiModelProperty(value = "附件") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java index 9d078df1b..11c5f9efc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java @@ -2,6 +2,8 @@ package com.jero.modules.problemKnowledgeBase.service; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; import com.baomidou.mybatisplus.extension.service.IService; + +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -57,5 +59,12 @@ public interface ICountryCardManageReleaseDetailEOService extends IService queryList(); + List queryList(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO, HttpServletRequest req); + + /** + * 处理数据 + * @param datas + * @param cut + */ + void disposeData(List datas, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java index 949ec4682..ab421eefd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java @@ -1,15 +1,28 @@ package com.jero.modules.problemKnowledgeBase.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.system.query.QueryGenerator; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempEO; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempItemEO; import com.jero.modules.problemKnowledgeBase.mapper.CountryCardManageReleaseDetailEOMapper; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardTempEOService; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardTempItemEOService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; + /** * @Description: 问题知识库-country_card-管理发布明细表 * @Author: jero-boot @@ -20,6 +33,9 @@ import org.springframework.transaction.annotation.Transactional; @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl implements ICountryCardManageReleaseDetailEOService { + @Autowired + private ICountryCardTempEOService countryCardTempEOService; + /** * 保存 * @@ -86,7 +102,29 @@ public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl queryList() { - return list(); + public List queryList(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(countryCardManageReleaseDetailEO, req.getParameterMap()); + List result = this.list(queryWrapper); + return result; } + + @Override + public void disposeData(List datas, String cut) { + if (CollectionUtils.isNotEmpty(datas)) { + //获取模板 + List countryCardTempEOList = this.countryCardTempEOService.list(); + + datas.forEach(data -> { + String lableName = countryCardTempEOList.stream().filter(countryCardTempEO -> { + boolean flag = false; + if (StringUtils.equals(data.getCountryCardTempId(), countryCardTempEO.getId())) { + flag = true; + } + return flag; + }).map(CountryCardTempEO::getLableName).collect(Collectors.joining(",")); + data.setCountryCardTempIdName(lableName); + }); + + } + } } From 2c30985f738f87ca5c05dcb28a7b9600a68e0c86 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 9 Aug 2022 14:03:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?Country=20Card=E6=A8=A1=E6=9D=BF=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CountryCardTempEOServiceImpl.java | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java index 730e25e30..8bb1d4c49 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java @@ -2,10 +2,14 @@ package com.jero.modules.problemKnowledgeBase.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempEO; import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempItemEO; import com.jero.modules.problemKnowledgeBase.enums.LableTypeEnum; import com.jero.modules.problemKnowledgeBase.mapper.CountryCardTempEOMapper; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseEOService; import com.jero.modules.problemKnowledgeBase.service.ICountryCardTempEOService; import com.jero.modules.problemKnowledgeBase.service.ICountryCardTempItemEOService; import org.apache.commons.collections4.CollectionUtils; @@ -13,6 +17,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Date; import java.util.stream.Collectors; @@ -35,6 +40,10 @@ public class CountryCardTempEOServiceImpl extends ServiceImpl countryCardManageReleaseEOList = this.countryCardManageReleaseEOService.list(); + if(CollectionUtils.isNotEmpty(countryCardManageReleaseEOList)){ + List releaseDetailEOList = new ArrayList<>(); + countryCardManageReleaseEOList.forEach(manageReleaseEO -> { + CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO = new CountryCardManageReleaseDetailEO(); + countryCardManageReleaseDetailEO.setCountryCardTempId(countryCardTempEO.getId()); + countryCardManageReleaseDetailEO.setCountryCardManageReleaseId(manageReleaseEO.getId()); + }); + this.countryCardManageReleaseDetailEOService.saveBatch(releaseDetailEOList); + } + } /** * 更新 @@ -82,6 +102,9 @@ public class CountryCardTempEOServiceImpl extends ServiceImpl manageReleaseDetailDeleteWrapper = new QueryWrapper<>(); + manageReleaseDetailDeleteWrapper.lambda().eq(CountryCardManageReleaseDetailEO::getCountryCardTempId,id); + this.countryCardManageReleaseDetailEOService.remove(manageReleaseDetailDeleteWrapper); } /** @@ -97,6 +120,10 @@ public class CountryCardTempEOServiceImpl extends ServiceImpl itemDeleteWrapper = new QueryWrapper<>(); itemDeleteWrapper.lambda().in(CountryCardTempItemEO::getCountryCardTempId,ids); this.countryCardTempItemEOService.remove(itemDeleteWrapper); + + QueryWrapper manageReleaseDetailDeleteWrapper = new QueryWrapper<>(); + manageReleaseDetailDeleteWrapper.lambda().in(CountryCardManageReleaseDetailEO::getCountryCardTempId,ids); + this.countryCardManageReleaseDetailEOService.remove(manageReleaseDetailDeleteWrapper); } /** From 52dacca9db0b79dc66f17eeedaf87ccae139694f Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 9 Aug 2022 14:07:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/countryCardRelease.vue | 16 ++-- .../components/countryCardReleaseAdd.vue | 88 ++++++++++++++----- .../components/countryCardReleaseModelAdd.vue | 4 +- 3 files changed, 80 insertions(+), 28 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index e4ec51484..ec96f19d0 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -96,7 +96,7 @@ - + @@ -128,13 +128,13 @@ { title: this.$t('applicableMarket'), align: 'center', - dataIndex: 'applicableMarket', + dataIndex: 'applyMarket', ellipsis: true }, { title: this.$t('releaseStatus'), align: 'center', - dataIndex: 'releaseStatus', + dataIndex: 'releaseStatus_dictText', ellipsis: true }, { @@ -165,11 +165,15 @@ this.pageNo = page this.getList() }, - SizeChange(page,pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() }, + countryCardReleaseAddForm() { + this.pageNo = 1 + this.getList() + }, getList() { let queryParam = JSON.parse(JSON.stringify(this.queryParam)) Object.keys(queryParam).forEach(val => { @@ -224,8 +228,8 @@ this.$message.warning(this.$t('selectLeastOne')) } }, - edit() { - this.$refs.countryCardReleaseAddRef.edit() + edit(record) { + this.$refs.countryCardReleaseAddRef.edit(JSON.parse(JSON.stringify(record))) }, subscribe(record) { let _this = this diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue index 164da146a..db4a9d6a0 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue @@ -43,25 +43,26 @@ :loading="loading"> - + - - {{ item.projectName}} + + {{ item.itemText}} - {{ (record.verifyDeliverableTemplate === 'null' || record.verifyDeliverableTemplate === '' || - record.verifyDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') + v-else-if="record.lableType == 7" + @click="clickButtonToUpload('content',index)"> + {{ (record.content === 'null' || record.content === '' || + record.content == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} @@ -89,8 +90,10 @@ data() { return { url: { - list: '', - deleteOne: '' + list: '/problemKnowledgeBase/countryCardTempEO/list', + deleteOne: '', + add: '/problemKnowledgeBase/countryCardManageReleaseEO/add', + edit: '/problemKnowledgeBase/countryCardManageReleaseDetailEO/editBatch' }, title: '', formInline: {}, @@ -98,7 +101,7 @@ applyMarket: [ { required: true, - message: this.$t('LabelType') + this.$t('cannotEmpty'), + message: this.$t('applicableMarket') + this.$t('cannotEmpty'), trigger: 'change' } ] @@ -113,21 +116,23 @@ columns: [ { title: this.$t('LabelName'), - dataIndex: 'LabelName', + dataIndex: 'lableName', align: 'center', - ellipsis: true + ellipsis: true, + width: 220 }, { title: this.$t('describe'), - dataIndex: 'describe', + dataIndex: 'description', align: 'center', + width: 260, ellipsis: true }, { title: this.$t('content'), align: 'center', fixed: 'right', - width: 180, + width: 260, scopedSlots: { customRender: 'content' } } ] @@ -139,11 +144,13 @@ add() { this.visible = true this.title = this.$t('newlyAdded') + this.replacePage() this.getApplyMarketList() }, - edit() { + edit(row) { this.visible = true this.title = this.$t('edit') + this.editReplacePage(row) this.getApplyMarketList() }, getApplyMarketList() { @@ -186,13 +193,54 @@ handleSubmit() { this.$refs.ruleForm.validate(valid => { if (valid) { - + let url = '' + if (this.title == this.$t('newlyAdded')) { + url = this.url.add + } else { + url = this.url.edit + } + this.confirmLoading = true + let content = [] + this.dataList.forEach(res => { + content.push({ + countryCardTempId: res.id, + description: res.description, + content: res.content + }) + }) + let query = { + countryCardManageReleaseDetailEOList: content, + applyMarket: this.formInline.applyMarket + } + postAction(url, query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.confirmLoading = false + this.$emit('countryCardReleaseAddForm') + } else { + this.confirmLoading = false + this.$message.warning(this.$t('operationFailed')) + } + }) } }) }, replacePage() { this.loading = true - postAction(this.url.list, {}).then((res) => { + getAction(this.url.list, {}).then((res) => { + if (res.success) { + this.dataList = res.result || [] + this.loading = false + } else { + this.dataList = [] + this.loading = false + } + }) + }, + editReplacePage(row) { + this.loading = true + getAction('/problemKnowledgeBase/countryCardManageReleaseDetailEO/list', { editReplacePage: row.id }).then((res) => { if (res.success) { this.dataList = res.result || [] this.loading = false diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue index 90873d393..ef66a9780 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue @@ -124,7 +124,7 @@