From eac2f23054a74df5dc27f96b2deb2d746fd4979d Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 9 Aug 2022 14:51:25 +0800 Subject: [PATCH 01/12] =?UTF-8?q?country=5Fcard-=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8F=91=E5=B8=83=20-=20=E5=AF=B9=E6=AF=94=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CountryCardManageReleaseEOController.java | 13 ++++++++++ .../CountryCardManageReleaseDetailEO.java | 8 ++++++- .../ICountryCardManageReleaseEOService.java | 2 ++ ...yCardManageReleaseDetailEOServiceImpl.java | 24 ++++++++++++++++++- ...CountryCardManageReleaseEOServiceImpl.java | 13 ++++++++++ 5 files changed, 58 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java index 851025236..765249182 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java @@ -198,4 +198,17 @@ public class CountryCardManageReleaseEOController extends JeroController> result = this.countryCardManageReleaseEOService.getApplyMarketList(); return result; } + + /** + * 根据多个适用地区查询数据 + * + * @return + */ + @AutoLog(value = "问题知识库-country_card-管理发布表-根据多个适用地区查询数据") + @ApiOperation(value="问题知识库-country_card-管理发布表-根据多个适用地区查询数据", notes="问题知识库-country_card-管理发布表-根据多个适用地区查询数据") + @PostMapping(value = "/queryCountryCardManageReleaseByApplyMarkets") + public Result> queryCountryCardManageReleaseByApplyMarkets(@RequestBody JSONObject params) { + List list = countryCardManageReleaseEOService.queryCountryCardManageReleaseByApplyMarkets(params); + return Result.OK(list); + } } 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 f8ceb17fd..9f53f8850 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,6 +1,8 @@ package com.jero.modules.problemKnowledgeBase.entity; import java.io.Serializable; +import java.util.List; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -70,7 +72,7 @@ public class CountryCardManageReleaseDetailEO implements Serializable { /**标签名称**/ @TableField(exist = false) @ApiModelProperty(value = "标签名称") - private java.lang.String countryCardTempIdName; + private java.lang.String lableName; /**描述*/ @Excel(name = "描述", width = 15) @@ -89,4 +91,8 @@ public class CountryCardManageReleaseDetailEO implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "标签类型") private String lableType; + + /**Country Card模板维护-字典项实体*/ + @TableField(exist = false) + private List countryCardTempItemEOList; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java index 90fd6f872..6ebb80fa9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java @@ -80,4 +80,6 @@ public interface ICountryCardManageReleaseEOService extends IService> getApplyMarketList(); + + List queryCountryCardManageReleaseByApplyMarkets(JSONObject params); } 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 0d26284a4..ed5742f5e 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 @@ -5,6 +5,7 @@ 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.enums.LableTypeEnum; import com.jero.modules.problemKnowledgeBase.mapper.CountryCardManageReleaseDetailEOMapper; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService; import com.jero.modules.problemKnowledgeBase.service.ICountryCardTempEOService; @@ -35,6 +36,8 @@ public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl countryCardTempEOList = this.countryCardTempEOService.list(); + List countroCardTempIdList = countryCardTempEOList.stream().map(CountryCardTempEO::getId).distinct().collect(Collectors.toList()); + QueryWrapper tempItemEOQueryWrapper = new QueryWrapper<>(); + tempItemEOQueryWrapper.lambda().in(CountryCardTempItemEO::getCountryCardTempId,countroCardTempIdList); + List countryCardTempItemEOList = this.countryCardTempItemEOService.list(tempItemEOQueryWrapper); + datas.forEach(data -> { List countryCardTemp = countryCardTempEOList.stream().filter(countryCardTempEO -> { boolean flag = false; @@ -122,9 +130,23 @@ public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl collect = countryCardTempItemEOList.stream().filter(countryCardTempItemEO -> { + boolean flag = false; + if (StringUtils.equals(data.getCountryCardTempId(), countryCardTempItemEO.getCountryCardTempId())) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + data.setCountryCardTempItemEOList(collect); + } }); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java index e39493645..d42890a3f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java @@ -132,6 +132,7 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl releaseDetailEOQueryWrapper = new QueryWrapper<>(); releaseDetailEOQueryWrapper.lambda().in(CountryCardManageReleaseDetailEO::getCountryCardManageReleaseId,CountryCardManageReleaseEOId); List releaseDetailEOList = this.countryCardManageReleaseDetailEOService.list(releaseDetailEOQueryWrapper); + this.countryCardManageReleaseDetailEOService.disposeData(releaseDetailEOList,cut); datas.forEach(data -> { if (StringUtils.isNotEmpty(data.getReleaseStatus())) { @@ -196,4 +197,16 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl queryCountryCardManageReleaseByApplyMarkets(JSONObject params) { + String applyMarkets = params.getString("applyMarkets"); + String cut = params.getString("cut"); + List applyMarketList = Arrays.asList(applyMarkets.split(",")); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().in(CountryCardManageReleaseEO::getApplyMarket,applyMarketList); + List result = this.list(queryWrapper); + this.disposeData(result,cut); + return result; + } } From aa0ad556a7014d3914ef86872a9889022f04b4c8 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 9 Aug 2022 14:56:39 +0800 Subject: [PATCH 02/12] update --- .../impl/CountryCardManageReleaseDetailEOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 ed5742f5e..69e659a47 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 @@ -107,6 +107,7 @@ public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl queryList(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(countryCardManageReleaseDetailEO, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); List result = this.list(queryWrapper); return result; } From ce17c138d587cfd7bcf9acf6a268c0ade3766699 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 9 Aug 2022 15:06:34 +0800 Subject: [PATCH 03/12] =?UTF-8?q?country=20Card=E7=AE=A1=E7=90=86=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E5=AF=B9=E6=8E=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CountryCardManageReleaseEOController.java | 4 +- .../ICountryCardManageReleaseEOService.java | 2 +- ...CountryCardManageReleaseEOServiceImpl.java | 47 ++++++++++++++----- 3 files changed, 38 insertions(+), 15 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java index 765249182..c9d2b038b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java @@ -194,8 +194,8 @@ public class CountryCardManageReleaseEOController extends JeroController> getApplyMarketList() { - Result> result = this.countryCardManageReleaseEOService.getApplyMarketList(); + public Result> getApplyMarketList(@RequestParam("queryFlag") String queryFlag) { + Result> result = this.countryCardManageReleaseEOService.getApplyMarketList(queryFlag); return result; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java index 6ebb80fa9..392c7e437 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java @@ -79,7 +79,7 @@ public interface ICountryCardManageReleaseEOService extends IService> getApplyMarketList(); + Result> getApplyMarketList(String queryFlag); List queryCountryCardManageReleaseByApplyMarkets(JSONObject params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java index d42890a3f..41670c746 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java @@ -169,7 +169,7 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl> getApplyMarketList() { + public Result> getApplyMarketList(String queryFlag) { List result = new ArrayList<>(); //获取所有的适用地区 @@ -177,20 +177,43 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl countryCardManageReleaseEOList = this.list(); - if(CollectionUtils.isEmpty(countryCardManageReleaseEOList)){ - result = dictModelList; - }else { - for (DictModel dictModel : dictModelList) { - boolean flag = true; - for (CountryCardManageReleaseEO countryCardManageReleaseEO : countryCardManageReleaseEOList) { - if(StringUtils.equals(dictModel.getValue(),countryCardManageReleaseEO.getApplyMarket())){ - flag = false; - break; + + //如果查询标识是空，则是在countryCard管理发布页面新增数据时使用：管理发布页新增查询的是，所有未创建countryCard的适用市场。 + //如果查询标识不是空，则是在CountryCard的首页使用：首页查询的是 所有已创建了countryCard的适用市场。 + if (StringUtils.isEmpty(queryFlag)) { + if(CollectionUtils.isEmpty(countryCardManageReleaseEOList)){ + result = dictModelList; + }else { + for (DictModel dictModel : dictModelList) { + boolean flag = true; + for (CountryCardManageReleaseEO countryCardManageReleaseEO : countryCardManageReleaseEOList) { + if(StringUtils.equals(dictModel.getValue(),countryCardManageReleaseEO.getApplyMarket())){ + flag = false; + break; + } + } + + if(flag){ + result.add(dictModel); } } + } + }else { + if(CollectionUtils.isEmpty(countryCardManageReleaseEOList)){ + result = null; + }else { + for (DictModel dictModel : dictModelList) { + boolean flag = false; + for (CountryCardManageReleaseEO countryCardManageReleaseEO : countryCardManageReleaseEOList) { + if(StringUtils.equals(dictModel.getValue(),countryCardManageReleaseEO.getApplyMarket())){ + flag = true; + break; + } + } - if(flag){ - result.add(dictModel); + if(flag){ + result.add(dictModel); + } } } } From bfe0381505ba24f0f9c31b299d3c6bcfff9669b8 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 9 Aug 2022 15:10:42 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=B3=95=E8=A7=84=E9=A2=84=E8=AD=A6--?= =?UTF-8?q?=E6=8E=A8=E9=80=81,=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOServiceImpl.java | 8 +- .../jero/modules/report/util/WordUtil.java | 151 +++++++++++++++--- .../src/main/resources/static/home/weilai.png | Bin 0 -> 5242 bytes 3 files changed, 134 insertions(+), 25 deletions(-) create mode 100644 jero-boot/jero-boot-single-startup/src/main/resources/static/home/weilai.png diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 9b92dc342..7d7c5d0cf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -547,9 +547,10 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImplPx#1ZP1_K>z@;j|==^1poj532;bRa{vGqB>(^xB>_oNB=7(L6c0&6K~#8N?VSm< zP1PUAclDwOg$5N$Niw8JJtd7ugNmYoo|afrTHz_xQd((LQ7Ib!#wAG_2uUQFLM4$> zPl-|zqUTjF`@cWG|2coxbMCq4+QisSogrp9UbqGlvBI}S5hGOI`INi>E`|W4_Z_odS2;qdZkeW;G+OML!+qS7c|NK*a7fI@a4?b8` ztXNT1u3TBwu3cL-ZQ4}TuU}u)ty@=!&iDK-BzFjqbW%gkojZ35S(h(guBK0$re@8a zt=1M4h*XXjkho^en(FMc&sLXSda26I%@yJ!)sf^O_FW{6)R1}m_U&rJh7D@^^y%uY zx871qmMjrToeUtkFTeb9)wXS0k>(IQB=^3Fq>vg3yl&k(A@ca~#x7Ae*gV<>znkUeEIU~{PWLO zx7>1zI_I2o)M1Am78;ZL01_rOhyV85Z)%3on_n0{TrFL?RJ<3N0!WOG-K|?U)vjGT zk=nK^Fhq7DAyT6!uV24jy=wI45hF&ZwcmeleUo`O{P4q7$BrFU*REYf*Dh10jP*^3 zY(w0nhS1*|5~Dk#a{T=B&(=4Y3p^rMTycf!)vK2}_0&^CVrMDhA~l5m;fEhYIz#AR ze)+}vCi8)wjoa_eJMUBt8#WAyorUo2>tYW4^wUpj(kN=0!1UuiZgrmY?0m} zvICwBMSg;0e&mryM3+uh{zkfR@x>Rb#~yo3498^nuraLdPA(bxNmdA-F^e{|`0m|; zP)^74H^&5VzeJe{&S9J3HQTaf%l|n=q8e$&M;&#PI{N6NRh24Ld`E*lk=oWl`}XZy z>I_3KIOw2*)LnPorEa_JHdVE1RqNAWK=;m>Ge@mlwMtgIl2j^Nwyflc}IH zv_6d=)pGzu2G|gHbl~9u=Z%xs#Viw&~$!&zAh*zu#So!AAkI@ zZq}@sHU!w~TC}!p+sb&BL{U+ZHmao@%RN;!zops7aqm5P+-m*W9}JoGlqpkmuU@^h znY{XlBaYBU;yaE*WHSWTMpEm>jT`H(UAyX6Uwu_?*s#GmYjngUwK1slv(G-O%a@6n@&Hj=}7@?Zd|yLa!d z%atqVcwM_Oczycx(Hl2zw2q7q{rdHDJipyqv}mDMtXN_FdN0alrgpEPNb z?$)iFHikrC9c4Gpha}j%d9!up#Nn0HG*$~%rsszZlfI7!*I$3V3tXWfk`st^-xVYH5Vq)+^Y8nG}TBAmyKeBxLMY<*R_U+qcWo_87 zVNz8_cy!!x$LXO%hwde@qxxseU`T%Sg8B2UPl5qOvrj+$w7U7`o277;nnFJySHnDv zy6UQ{l$oi@=z)Q{#c*93V=FDi4S=vco{|?{ctQN8 znVQO?qN21BiV5|}C!a`u3NE(N0^D@3yz+`ND_zQRYH&Y7Yy>cZ7&wxe!DJf)V>DTx zBo3VEg9i^*XEbRdzS$svgg)`a6D24_HF;22xNxB|Do$FZB$LV*%<7qEo>5@3(Qkcw)@pSXYQ2es$`S4TBn2qmf9~ z8QqZ%otkHyGiQ$I(N4#eY`AXe6Qc=eqe6(cXUC2m(zb5hs@JbyugyxO2MidX4Y?i9 zQL^EeH!G~zT#k|&F;3J6X&nSww{9&3ut7=ak}xDxXPj|{>ejux^+{qd<0P}6en>Z{ z%qQ_`?AWopB~gZfNFl2V>PIY4b%eTb-+lMVo-H+M)R5XyGwG!fO(epKYI(;UcgRX* zCZct8bdbk0dGch5iaL@Sy)vjJ4s;X01J`#-0qmMqSuDtR}Q9W{Ua-wpAa5!YY@WKn#z<~qB4s!$J zG04e}(04jroAefM42 z@hVfmy^yuJV#NyU6K5DTO7-sDTcj=$*^7YVHwZ=SC8Ms0x6BRX_hSz^k{b8Ox8Hti z{goKnv}q#`^J%JP6rDe5n%QcsF3LAhFpD6W#U38*h}IW}|@#L-?I*MS@%nT(4B= zL_=O)7d3L^f2_a$x5CVyKVO808(-KJ>)w0s6^We)aIuo_gG~{wFGbab)Iq{Ls6>SF z^74{iSP-q5yiPiiXsCMET6>rYBCEsO!|JTF6jSQ3#S z)E$x-!J$9S}E{W_3PJ9Tz#oB$^rLZUU+Y#t(VdM4L$IEKNZDz|bOJ0wXxnfH#8Vqga!Uf`@6-ripjTuNs0H zOKu6qw3{l4>P2iMAyV6fCMSV>Rx+eA5p=|?S+gXWX3?TWrHVk3!y$ZZJ{q>7S77t0q-w2y+0apT4bcMvwwq&7AYZ+62ajLUMtf(6z$ z&OrU)?Q9S`E>c5i^dn{u>5!Q!p-X~Jq@InHh1YnLCSnrhx7Wt-NLn?H4I==2`>EYfSXd}kIcyQ&#fM$81?i`b1lvkH{`ljv zDUZ{!PK|9Y*z*N0J^0{*+8Fe*@eN}`#f#CA9gi#7j7p~a_wTQbF)8=ri_|uu*+z>^ zXq+xkS{lS=-;rb!J7`h^N}dJ}9xPj#nPu1UoY7jcNDT<$F>%p)elq-+;$X4l2;K#YHBpFoMC*Bz>=(B0>&b4CR7pfflHGr!V*iB&vn;b zmvB{nkRXdLFE3B@ez&9}Cm1dY$NU0StVfR?s!p9c|L2M)Qe&y2vjF)G|ZVF8^VX>bGqh(dTC|0~bO zK-i6ZZFEm`Q0gk_k9a{i-AH`79)Ttjq9U(lH_D;dc7SU~g5Vk3g%Of=I*!)3aT8x} z65x55tc)>&i}9mx5g;Tt#hOGMZ}$;7+g-YJk(ax&dy|_Xnzq+t@Nf`_nT)X$jnI)` zu;$L4E8%XETY@s|h|u-#-(MnjBoPG(y4NiCQvHLZi^D>3&Ot)PSFs9wE>nSAcya5s?m!Tlj1$=bvDuzvjpwPnliLUj6ru^^uW z&lf8g!iI^6XN9rxB5-`Y$cQXFJRpfmNp2oOQw`xJp`8GcNhxK432LhVa+e9;ChJ8; zA@&4bC+a_mAhJRrwGmhVj|rLqD-G^S{`EcKA+;A6GD)CU1tKoI*=8wns)CRB}t$PRcWHNeF-e*AcO>5mgZyfik-<{VhZi2!0V$#QdZeMi;o zh9%AGDD3cRi0ptbQUm;gyaj-`y%SN~nlTilmX6601RypqwK3Me!E4Z< zL8330BoTxjHENW+Q!iPBw!!&}ii%`M`vwgf>~$}dDpitK)e#O3C3JQpAyNa#1ZnYT zkdQ=vDmk{ZJr--6g5NRYrM5vVw7RmD^dYEePNJJjl zD}w)XFGQ+B>>CJ_)FAS7=^(U?Ou3H`sfJSj1! Date: Tue, 9 Aug 2022 15:26:15 +0800 Subject: [PATCH 05/12] =?UTF-8?q?people-=E5=90=8C=E6=AD=A5=E7=94=A8?= =?UTF-8?q?=E6=88=B7-=E6=AC=A7=E6=B4=B2=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/service/impl/SyncDataServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java index cf51a5f4f..a50b39aab 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java @@ -201,7 +201,7 @@ public class SyncDataServiceImpl implements ISyncDataService{ pageSum += 1; } //循环查询统一认证系统所有账户信息(从第二页开始) - for(int page = 1; page < 2; page++){ + for(int page = 1; page < pageSum; page++){ path = "/people/v1/employee/all-info"; queryStr = "app_id=" + appId + "&hash_type=sha256&limit=100&offset=" + (page*100); response = getResultDataOfGet(path, queryStr); From 34e3f6a3bf317e5a9fa27fe11eb9ac143fd61b57 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 9 Aug 2022 15:50:50 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93-=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC=E5=87=BA-bug5735?= =?UTF-8?q?9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsReportDetailEOServiceImpl.java | 94 +++++++++++++------ .../service/impl/ParamsInfoEOServiceImpl.java | 33 +++++++ .../jero/modules/project/util/ExcelUtil.java | 39 +++++++- .../jero/modules/project/util/WordUtil.java | 30 ++++++ 4 files changed, 164 insertions(+), 32 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 5dffa3509..fd2ac0176 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -726,16 +726,6 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl allRelevFileList = (List) allParamsInfoList.get(2).get("fileListAll"); - if (allRelevFileList != null && !allRelevFileList.isEmpty()) { - allRelevFileList = allRelevFileList.stream().distinct().collect(Collectors.toList()); - String exportFile = "导出文件"; - if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) { - exportFile = "Export file"; - } - downLoadFileList(allRelevFileList,fileNowPath + File.separator + exportFile); - } // 拿取模板 String repFileName = fileName.replaceAll("/","_"); @@ -743,6 +733,35 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> fileListAll = (List>) allParamsInfoList.get(2).get("fileListAll"); + + if (fileListAll != null && !fileListAll.isEmpty()) { + Map paramsAfterFilter = WordUtil.filterParams(wordMLPackage, params); + if (CollectionUtil.isNotEmpty(paramsAfterFilter)) { + List nioNumberList = paramsAfterFilter.keySet().stream().collect(Collectors.toList()); + List allRelevFileList = new ArrayList<>(); + for (Map fileMap : fileListAll) { + for (Map.Entry map : fileMap.entrySet()) { + String key = (String) map.getKey(); + List fileList = (List) map.getValue(); + if (nioNumberList.contains(key)) { + allRelevFileList.addAll(fileList); + } + } + } + if (CollectionUtil.isNotEmpty(allRelevFileList)) { + String exportFile = "导出文件"; + if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) { + exportFile = "Export file"; + } + + downLoadFileList(allRelevFileList, fileNowPath + File.separator + exportFile); + } + } + } + // 替换占位符内容 WordUtil.replacePictureBatch(wordMLPackage, imgListAll); WordUtil.replaceVariable(wordMLPackage, params); @@ -837,29 +856,47 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl allRelevFileList = (List) allParamsInfoList.get(2).get("fileListAll"); - if (allRelevFileList != null && !allRelevFileList.isEmpty()) { - allRelevFileList = allRelevFileList.stream().distinct().collect(Collectors.toList()); - String exportFile = "导出文件"; - if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) { - exportFile = "Export file"; - } - downLoadFileList(allRelevFileList,fileNowPath + File.separator + exportFile); - } - // 拿取模板 String repFileName = fileName.replaceAll("/","_"); wordOS = new FileOutputStream(fileNowPath + File.separator + repFileName); if (CosBootUtil.doesObjectExist(templateUrl)) { - InputStream wordTemplate = CosBootUtil.download(templateUrl); + InputStream exceltemplateForDocx4j = CosBootUtil.download(templateUrl); // com.qcloud.cos.utils.IOUtils.copy(wordTemplate, wordOS); + InputStream excelTemplateForPoi = CosBootUtil.download(templateUrl); + + SpreadsheetMLPackage pkg = SpreadsheetMLPackage.load(exceltemplateForDocx4j); + + //下载关联文件内容 + List> fileListAll = (List>) allParamsInfoList.get(2).get("fileListAll"); + + if (fileListAll != null && !fileListAll.isEmpty()) { + Map paramsAfterFilter = ExcelUtil.filterParams(pkg, params); + if (CollectionUtil.isNotEmpty(paramsAfterFilter)) { + List nioNumberList = paramsAfterFilter.keySet().stream().collect(Collectors.toList()); + List allRelevFileList = new ArrayList<>(); + for (Map fileMap : fileListAll) { + for (Map.Entry map : fileMap.entrySet()) { + String key = (String) map.getKey(); + List fileList = (List) map.getValue(); + if (nioNumberList.contains(key)) { + allRelevFileList.addAll(fileList); + } + } + } + if (CollectionUtil.isNotEmpty(allRelevFileList)) { + String exportFile = "导出文件"; + if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) { + exportFile = "Export file"; + } + + downLoadFileList(allRelevFileList, fileNowPath + File.separator + exportFile); + } + } + } // 替换占位符内容 // docx4j方式 - InputStream excelTemplate = CosBootUtil.download(templateUrl); - SpreadsheetMLPackage pkg = SpreadsheetMLPackage.load(wordTemplate); - Workbook workbook = WorkbookFactory.create(excelTemplate); + Workbook workbook = WorkbookFactory.create(excelTemplateForPoi); ExcelUtil.replacePictureBatchPOI(workbook, pkg, imgListAll, params); ExcelUtil.variableReplace(pkg, params); pkg.save(wordOS); @@ -1092,7 +1129,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl resultMap = new HashMap<>(); List> imgListAll = new ArrayList<>(); // 存放图片信息 - List fileListAll = new ArrayList<>(); // 存放文件 + List> fileListAll = new ArrayList<>(); // 存放文件 String fileTypeStr = ".png,.PNG,.jfif,.JFIF,.pjpeg,.PJPEG,.jpeg,.JPEG,.pjp,.PJP,.jpg,.JPG"; // 查询配置列数据 for (Map record1 : dataList) { @@ -1125,13 +1162,16 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl fileMap = new HashMap<>(); + fileMap.put(nioNumber, ossFileList); + fileListAll.add(fileMap); } else { imgFileList.addAll(ossFileList); } } } } - fileListAll.addAll(fileList); StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 if ((ControlTypeEnum.FILE.getValue().equals(controlType) 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 176b3acdd..8316dee8e 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 @@ -246,6 +246,39 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl Long.parseLong("15")) { + if (CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("编号不能超过15个字符"); + } else { + throw new JeroBootException("Number can not exceed 15 chars"); + } + } + } + + if (StringUtils.isNotBlank(paramsName)) { + if (paramsName.length() > Long.parseLong("100")) { + if (CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("参数名称不能超过100个字符"); + } else { + throw new JeroBootException("Params Name can not exceed 100 chars"); + } + } + } + + } + /** * 通过id删除 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java index 25cd437e8..544412b38 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java @@ -1,5 +1,6 @@ package com.jero.modules.project.util; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; @@ -40,6 +41,7 @@ import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; @Slf4j public class ExcelUtil { @@ -70,6 +72,33 @@ public class ExcelUtil { System.out.println("mmmmmmm"); } + /** + * 过滤出需要导出的 + * @param pkg + * @param params + * @return + * @throws Exception + */ + public static Map filterParams(SpreadsheetMLPackage pkg, Map params) throws Exception { + JaxbSmlPart smlPart = (JaxbSmlPart)pkg.getParts().get(new PartName("/xl/sharedStrings.xml")); // 获取所有sheet中的文本 + String wmlTemplateString = getWmlTemplateString(smlPart); + List placeholderList = new ArrayList<>(); + getAllPlaceholderElementFromObject(wmlTemplateString, 0, placeholderList); // 获取文档中所有占位符 + + Map paramsAfterFilter = new HashMap<>(); + List textValueList = placeholderList.stream().distinct().collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(textValueList)) { + for (Map.Entry map : params.entrySet()) { + String value = "${" + map.getKey() + "}"; + if (textValueList.contains(value)) { + paramsAfterFilter.put(map.getKey(), map.getValue()); + } + } + } + + return paramsAfterFilter; + } + public static void setRowHeight(WorksheetPart worksheetPart, int rIndex, double height, int cIndex, String text) { SheetData sheetData = worksheetPart.getJaxbElement().getSheetData(); @@ -370,8 +399,8 @@ public class ExcelUtil { // This seems to be about 5% faster than the Scanner approach wmlTemplateString = IOUtils.toString(is, "UTF-8"); - List placeholderList = new ArrayList<>(); - getAllPlaceholderElementFromObject(wmlTemplateString, 0, placeholderList); +// List placeholderList = new ArrayList<>(); +// getAllPlaceholderElementFromObject(wmlTemplateString, 0, placeholderList); } } catch (Exception e) { log.error(e.getMessage(), e); @@ -381,18 +410,18 @@ public class ExcelUtil { } } - private static List getAllPlaceholderElementFromObject(String wmlTemplateString, int offset, List placeholderList) { + private static void getAllPlaceholderElementFromObject(String wmlTemplateString, int offset, List placeholderList) { int startKey = wmlTemplateString.indexOf("${", offset); if (startKey == -1) - return null; + return; else { int keyEnd = wmlTemplateString.indexOf('}', startKey); String placeHolder = wmlTemplateString.substring(startKey, keyEnd + 1); if (isPlaceholder(placeHolder)) { placeholderList.add(placeHolder); } - return getAllPlaceholderElementFromObject(wmlTemplateString, keyEnd + 1, placeholderList); + getAllPlaceholderElementFromObject(wmlTemplateString, keyEnd + 1, placeholderList); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/WordUtil.java index f6945d179..4d66e753e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/WordUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/WordUtil.java @@ -1,5 +1,6 @@ package com.jero.modules.project.util; +import cn.hutool.core.collection.CollectionUtil; import org.docx4j.Docx4J; import org.docx4j.TraversalUtil; import org.docx4j.XmlUtils; @@ -28,6 +29,7 @@ import java.io.OutputStream; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; public class WordUtil { private static final Logger log = LoggerFactory.getLogger(WordUtil.class); @@ -230,6 +232,34 @@ public class WordUtil { } + /** + * 过滤出需要导出的 + * @param wordMLPackage + * @param params + * @return + * @throws Exception + */ + public static Map filterParams(WordprocessingMLPackage wordMLPackage, Map params) throws Exception { + MainDocumentPart mainDocumentPart = wordMLPackage.getMainDocumentPart(); + Docx4jUtils.cleanDocumentPart(mainDocumentPart); + Document wmlDoc = (Document)mainDocumentPart.getJaxbElement(); + Body body = wmlDoc.getBody(); + List textList = getAllPlaceholderElementFromObject(body); // 获取文档中所有占位符 + + Map paramsAfterFilter = new HashMap<>(); + List textValueList = textList.stream().map(Text::getValue).distinct().collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(textValueList)) { + for (Map.Entry map : params.entrySet()) { + String value = "${" + map.getKey() + "}"; + if (textValueList.contains(value)) { + paramsAfterFilter.put(map.getKey(), map.getValue()); + } + } + } + + return paramsAfterFilter; + } + /** * 发现docx文档包含占位符的文本节点 * 未解决问题：两个连着的相同占位符会识别成一个。如 原文：${key1}${key1} From 18624c217af45193007d8d6cb35b8d3781ad30ae Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 9 Aug 2022 16:33:44 +0800 Subject: [PATCH 07/12] update --- .../impl/CountryCardManageReleaseDetailEOServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 69e659a47..54fe486fd 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 @@ -131,9 +131,10 @@ public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl Date: Tue, 9 Aug 2022 16:50:55 +0800 Subject: [PATCH 08/12] =?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 --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 2 + jero-web/src/components/SelectedBy/index.vue | 188 ++++++++++++++++++ .../components/countryCardList.vue | 25 ++- .../components/countryCardRelease.vue | 73 +++++-- .../components/countryCardReleaseAdd.vue | 57 +++++- .../components/problemKnowledgeBaseList.vue | 6 +- .../components/problemKnowledgeBaseView.vue | 41 +++- 8 files changed, 359 insertions(+), 35 deletions(-) create mode 100644 jero-web/src/components/SelectedBy/index.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 3d055af07..44c4c5517 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1252,4 +1252,6 @@ module.exports = { optionDropDownBox:'Option drop - down box', attachmentUpload:'file', textInput:'Text Input', + HaveReleased:'Have released', + forward:'Forward', } \ 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 ca601c3ca..a9e0cd6f6 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1355,4 +1355,6 @@ module.exports = { Paraname: '参数名称', Parabatch: '参数批次', freeze:'请选择冻结配置', + HaveReleased:'已发布', + forward:'转发', } \ No newline at end of file diff --git a/jero-web/src/components/SelectedBy/index.vue b/jero-web/src/components/SelectedBy/index.vue new file mode 100644 index 000000000..7ef8d1da8 --- /dev/null +++ b/jero-web/src/components/SelectedBy/index.vue @@ -0,0 +1,188 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue index cd7fc3755..e3e4044bf 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue @@ -8,8 +8,17 @@
{{$t('applicableMarket')}}
- + + + + {{ item.title}} + + + @@ -89,15 +98,25 @@ return { queryParam: {}, conList: [], + applyMarketList: [], pageSize: 10, total: 0, pageNo: 1 } }, mounted() { - + this.getApplyMarketList() }, methods: { + getApplyMarketList() { + getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', { queryFlag: 'countryCard' }).then((res) => { + if (res.success) { + this.applyMarketList = res.result || [] + } else { + this.applyMarketList = [] + } + }) + }, searchQuery() { }, diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index ec96f19d0..9e34a7f28 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -19,8 +19,10 @@
{{$t('applicableMarket')}}
- + @@ -28,8 +30,18 @@
{{$t('releaseStatus')}}
- + + + + {{ item.name}} + + + @@ -74,8 +86,10 @@ {{!record.releaseStatus || record.releaseStatus == 'Draft' ? $t('release') :$t('withdraw')}} {{$t('edit')}} {{$t('delete')}} @@ -104,6 +118,7 @@ import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage' import countryCardReleaseModel from './countryCardReleaseModel' import countryCardReleaseAdd from './countryCardReleaseAdd' + import { mapGetters } from 'vuex' export default { name: 'countryCardRelease', @@ -114,8 +129,19 @@ data() { return { queryParam: {}, + releaseStatusList: [ + { + value: 'Draft', + name: this.$t('draft') + }, + { + value: 'Have released', + name: this.$t('HaveReleased') + } + ], loading: false, - dataSource: [{}], + dataSource: [], + selectedRowKeysRecord: [], total: 0, pageSize: 10, pageNo: 1, @@ -123,12 +149,13 @@ list: '/problemKnowledgeBase/countryCardManageReleaseEO/page', deleteBatch: '/problemKnowledgeBase/countryCardManageReleaseEO/deleteBatch' }, + userInfoQuery: {}, selectedRowKeys: [], columns: [ { title: this.$t('applicableMarket'), align: 'center', - dataIndex: 'applyMarket', + dataIndex: 'applyMarket_dictText', ellipsis: true }, { @@ -150,8 +177,10 @@ mounted() { document.title = 'Country Card-' + this.$t('managePublishing') this.getList() + this.userInfoQuery = this.userInfo() }, methods: { + ...mapGetters(['userInfo']), searchQuery() { this.pageNo = 1 this.getList() @@ -197,8 +226,9 @@ } }) }, - onSelectChange(value) { + onSelectChange(value, record) { this.selectedRowKeys = value + this.selectedRowKeysRecord = record }, newlyAddedClick() { this.$refs.countryCardReleaseAddRef.add() @@ -212,16 +242,27 @@ this.$confirm({ content: _this.$t('ConfirmBatchDeletion'), onOk() { - let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - getAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => { - if (res.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.selectedRowKeys = [] - _this.getList() - } else { - _this.$message.warning(res.message) + let idList = [] + let selectedRowKeysRecord = JSON.parse(JSON.stringify(_this.selectedRowKeysRecord)) + for (let i = 0; i < selectedRowKeysRecord.length; i++) { + if (selectedRowKeysRecord[i].createBy == _this.userInfo().username && + selectedRowKeysRecord[i].releaseStatus == 'Draft') { + idList.push(selectedRowKeysRecord[i].id) } - }) + } + if (idList.length > 0) { + deleteAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.selectedRowKeys = [] + _this.getList() + } else { + _this.$message.warning(res.message) + } + }) + } else { + _this.$message.warning(_this.$t('doNotHavePermissionDeleteData')) + } } }) } else { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue index db4a9d6a0..a2ed72151 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue @@ -10,7 +10,7 @@ :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;"> - +
@@ -20,6 +20,7 @@
+ + +
+
+ {{$t('applicableMarket')}} +
+ + + +
+ +
{ + this.formInline = {} + this.$refs.ruleForm.clearValidate() + }) this.title = this.$t('newlyAdded') this.replacePage() this.getApplyMarketList() }, edit(row) { this.visible = true + this.$nextTick(() => { + this.formInline = row + this.formInline = { ...this.formInline } + this.$refs.ruleForm.clearValidate() + }) this.title = this.$t('edit') this.editReplacePage(row) - this.getApplyMarketList() }, getApplyMarketList() { getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', {}).then((res) => { @@ -194,20 +220,29 @@ this.$refs.ruleForm.validate(valid => { if (valid) { let url = '' + let content = [] if (this.title == this.$t('newlyAdded')) { url = this.url.add + this.dataList.forEach(res => { + content.push({ + countryCardTempId: res.id, + description: res.description, + content: res.content + }) + }) } else { url = this.url.edit + this.dataList.forEach(res => { + content.push({ + countryCardTempId: res.id, + description: res.description, + content: res.content, + id: res.id + }) + }) } 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 @@ -240,7 +275,7 @@ }, editReplacePage(row) { this.loading = true - getAction('/problemKnowledgeBase/countryCardManageReleaseDetailEO/list', { editReplacePage: row.id }).then((res) => { + getAction('/problemKnowledgeBase/countryCardManageReleaseDetailEO/list', { countryCardManageReleaseId: row.id }).then((res) => { if (res.success) { this.dataList = res.result || [] this.loading = false diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 6e291a5a3..d7a0ab0e4 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -215,8 +215,7 @@ } .box-content-left { - width: 60%; - float: left; + width: 100%; font-size: 14px; font-weight: 400; color: #040B29; @@ -224,8 +223,7 @@ } .box-content-right { - width: 40%; - float: left; + width: 100%; display: inline-block; text-align: right; margin-top: 20px; diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue index 1419c58cc..232ad441e 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue @@ -8,6 +8,12 @@ {{$t('applicableInstructionsMarketList')}}
+
+
+ + {{$t('forward')}} +
+
@@ -77,18 +83,21 @@
+