From 2732b68230d5ae0522dbc579962091cdf9b3578b Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 9 Oct 2024 09:56:33 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E5=A4=96=E6=9D=A5=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=BA=93=E5=A4=9A=E7=BA=BF=E7=A8=8B=E6=8E=92=E5=BA=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/laws/common/service/impl/LawsCommonServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 899a9ba5..00c481dc 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -623,7 +623,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { private List> processResultMapPageList(List> records, List fieldList) { List dictItemList = getDictItemList(fieldList); List> resultMapList = new CopyOnWriteArrayList<>(); - records.parallelStream().forEach(map->{ + records.forEach(map->{ Map resultMap = new LinkedHashMap<>(); String id = (String) map.get("id"); String standardNumber = (String) map.get(FieldCommon.STANDARD_NUMBER); From 5ffa0b0ce312dbceb660e350ae2965af304d85fd Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 9 Oct 2024 11:25:00 +0800 Subject: [PATCH 2/9] =?UTF-8?q?update=20commons-io=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=88=B0=202.16.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- laws-base/laws-base-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laws-base/laws-base-core/pom.xml b/laws-base/laws-base-core/pom.xml index 677423b7..0d104ea1 100644 --- a/laws-base/laws-base-core/pom.xml +++ b/laws-base/laws-base-core/pom.xml @@ -109,7 +109,7 @@ commons-io commons-io - ${commons.version} + 2.16.1 commons-lang From c47d526ec4ea6f01327cc88afebf25deabb246a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 10 Oct 2024 10:55:03 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MarketStandardController.java | 17 ++++++++++++++ .../service/ILawsMarketStandardService.java | 6 +++++ .../impl/LawsMarketStandardServiceImpl.java | 22 +++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java index 8ca8738e..2b97f56f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java @@ -257,4 +257,21 @@ public class MarketStandardController { public Result getManifestNo(LawsMarketStandard marketStandard) { return marketStandardService.getManifestNo(marketStandard); } + + + /** + * 修改版本号 + * + * @param lawsMarketStandard + * @return + */ + @AutoLog(value = "外部标准库-市场法规清单-修改版本号") + @ApiOperation(value = "外部标准库-市场法规清单-修改版本号", notes = "外部标准库-市场法规清单-修改版本号") + @ApiOperationSupport(order = 6) + @PostMapping(value = "/editManifestVersion") +// @RequiresPermissions("marketStandard:edit") + public Result editManifestVersion(@RequestBody LawsMarketStandard lawsMarketStandard) { + this.marketStandardService.editManifestVersion(lawsMarketStandard); + return Result.OK(ResultCommon.OK); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java index 29207305..58cb5fff 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java @@ -127,4 +127,10 @@ public interface ILawsMarketStandardService extends IService * @return */ Result getManifestNo(LawsMarketStandard marketStandard); + + /** + * 修改版本号 + * @param marketStandard + */ + void editManifestVersion(LawsMarketStandard marketStandard); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java index 89374f57..1c72301a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java @@ -692,6 +692,28 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl update = new LambdaUpdateWrapper<>(); + update.eq(LawsMarketStandard::getId,marketStandard.getId()); + update.set(LawsMarketStandard::getManifestVersion,marketStandard.getManifestVersion()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + update.set(LawsMarketStandard::getUpdateBy,sysUser.getUsername()); + update.set(LawsMarketStandard::getUpdateTime,new Date()); + update(update); + } } From 6545febeb5e99bf6d70e3ca10f7ad6368105afb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 10 Oct 2024 11:35:01 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B8=82=E5=9C=BA?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/LawsMarketStandardDetail.java | 3 -- .../entity/LawsMarketStandardDetailExcel.java | 20 ++++------- .../LawsMarketStandardDetailServiceImpl.java | 20 +++-------- .../impl/LawsMarketStandardServiceImpl.java | 33 ++++++++++++++----- 4 files changed, 35 insertions(+), 41 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java index 3f0c15cc..086bd307 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java @@ -123,7 +123,6 @@ public class LawsMarketStandardDetail implements Serializable { * 适用市场 */ @Excel(name = "适用市场", width = 15,dicCode = "market_state", mergeVertical = true, mergeRely = {0}) - @NotBlank(message = "适用适用市场不能为空") @ApiModelProperty(value = "适用市场") @Dict(dicCode = "market_state") private String country; @@ -172,7 +171,6 @@ public class LawsMarketStandardDetail implements Serializable { */ @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @ApiModelProperty(value = "主控部门") - @NotBlank(message = "主控部门不能为空") @Excel(name = "主控部门", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name", mergeVertical = true, mergeRely = {0}) private String mainDept; @@ -180,7 +178,6 @@ public class LawsMarketStandardDetail implements Serializable { * 主控部门专业模块 */ @ApiModelProperty(value = "主控部门专业模块") - @NotBlank(message = "主控部门专业模块不能为空") @Dict(dicCode = "professional_module") @Excel(name = "主控部门专业模块", width = 15, dicCode = "professional_module", mergeVertical = true, mergeRely = {0}) private String mainDeptProfMode; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java index 7f24e98b..c243f5a0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java @@ -93,38 +93,33 @@ public class LawsMarketStandardDetailExcel implements Serializable { * 标准英文名称 */ @ApiModelProperty(value = "标准英文名称") - @Excel(name = "标准英文名称", width = 15) private String standardEnglishName; /** * 新生产车实施日期 */ - @Excel(name = "*新生产车实施日期", width = 15) - @NotBlank(message = "新生产车实施日期不能为空") + @Excel(name = "新生产车实施日期", width = 15) @ApiModelProperty(value = "新生产车实施日期") private String newProductImplDate; /** * 新认证车实施日期 */ - @Excel(name = "*新认证车实施日期", width = 15) - @NotBlank(message = "新认证车实施日期不能为空") + @Excel(name = "新认证车实施日期", width = 15) @ApiModelProperty(value = "新认证车实施日期") private String newAuthImplDate; /** * 注册日期 */ - @Excel(name = "*注册日期", width = 15) - @NotBlank(message = "注册日期不能为空") + @Excel(name = "注册日期", width = 15) @ApiModelProperty(value = "注册日期") private String registrationDate; /** * 适用市场 */ - @Excel(name = "*适用市场", width = 15,dicCode = "market_state") - @NotBlank(message = "适用市场不能为空") + @Excel(name = "适用市场", width = 15,dicCode = "market_state") @ApiModelProperty(value = "适用市场") @Dict(dicCode = "market_state") private String country; @@ -157,7 +152,6 @@ public class LawsMarketStandardDetailExcel implements Serializable { * 类型 */ @Dict(dicCode = "type") - @Excel(name = "类型", width = 15, dicCode = "type") @ApiModelProperty(value = "类型") private String type; @@ -174,17 +168,15 @@ public class LawsMarketStandardDetailExcel implements Serializable { */ @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @ApiModelProperty(value = "主控部门") - @NotBlank(message = "主控部门不能为空") - @Excel(name = "*主控部门", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") + @Excel(name = "主控部门", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") private String mainDept; /** * 主控部门专业模块 */ @ApiModelProperty(value = "主控部门专业模块") - @NotBlank(message = "主控部门专业模块不能为空") @Dict(dicCode = "professional_module") - @Excel(name = "*主控部门专业模块", width = 15, dicCode = "professional_module") + @Excel(name = "主控部门专业模块", width = 15, dicCode = "professional_module") private String mainDeptProfMode; /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java index 77c7f96a..00a91cbf 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java @@ -308,27 +308,15 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl queryLawsMarketStandard = new LambdaQueryWrapper<>(); - queryLawsMarketStandard.eq(LawsMarketStandard::getVersionFlag,lawsMarketStandardOld.getVersionFlag()); - long l = count(queryLawsMarketStandard); + QueryWrapper queryLawsMarketStandard = new QueryWrapper<>(); + queryLawsMarketStandard.select("max(manifest_version) as manifest_version"); + queryLawsMarketStandard.eq("version_flag",lawsMarketStandardOld.getVersionFlag()); + LawsMarketStandard obj = getOne(queryLawsMarketStandard); + String manifestVersion = ""; + if(Objects.isNull(obj) || StringUtils.isEmpty(obj.getManifestNo())){ + manifestVersion = "V1.0"; + }else{ + int str = Integer.parseInt(obj.getManifestNo().replace("V","")) + 1; + manifestVersion = "V" + str + ".0"; + } // 更新状态 LambdaUpdateWrapper updateLawsMarketStandard = new LambdaUpdateWrapper<>(); updateLawsMarketStandard.eq(LawsMarketStandard::getId, lawsMarketStandardOld.getId()); updateLawsMarketStandard.set(LawsMarketStandard::getReleaseDate,new Date()); - updateLawsMarketStandard.set(LawsMarketStandard::getManifestVersion, "V" + l + ".0"); + updateLawsMarketStandard.set(LawsMarketStandard::getManifestVersion, manifestVersion); updateLawsMarketStandard.set(LawsMarketStandard::getManifestStatus,MarketStandardConstants.MANIFEST_STATUS_PUBLISH); updateLawsMarketStandard.set(LawsMarketStandard::getUpdateTime,new Date()); updateLawsMarketStandard.set(LawsMarketStandard::getUpdateBy,sysUser.getUsername()); @@ -599,14 +607,23 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl queryLawsMarketStandard = new LambdaQueryWrapper<>(); - queryLawsMarketStandard.eq(LawsMarketStandard::getVersionFlag,lawsMarketStandardOld.getVersionFlag()); - long l = count(queryLawsMarketStandard); + QueryWrapper queryLawsMarketStandard = new QueryWrapper<>(); + queryLawsMarketStandard.select("max(manifest_version) as manifest_version"); + queryLawsMarketStandard.eq("version_flag",lawsMarketStandardOld.getVersionFlag()); + LawsMarketStandard obj = getOne(queryLawsMarketStandard); + String manifestVersion = ""; + if(Objects.isNull(obj) || StringUtils.isEmpty(obj.getManifestNo())){ + manifestVersion = "V1.0"; + }else{ + int str = Integer.parseInt(obj.getManifestNo().replace("V","")) + 1; + manifestVersion = "V" + str + ".0"; + } + // 更新状态 LambdaUpdateWrapper updateLawsMarketStandard = new LambdaUpdateWrapper<>(); updateLawsMarketStandard.eq(LawsMarketStandard::getId,id); updateLawsMarketStandard.set(LawsMarketStandard::getReleaseDate,new Date()); - updateLawsMarketStandard.set(LawsMarketStandard::getManifestVersion, "V" + l + ".0"); + updateLawsMarketStandard.set(LawsMarketStandard::getManifestVersion, manifestVersion); updateLawsMarketStandard.set(LawsMarketStandard::getManifestStatus,MarketStandardConstants.MANIFEST_STATUS_PUBLISH); updateLawsMarketStandard.set(LawsMarketStandard::getUpdateTime,new Date()); updateLawsMarketStandard.set(LawsMarketStandard::getUpdateBy,sysUser.getUsername()); From 42cb9705aebfcaf17a6265c0e4e03e8edcf857ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 10 Oct 2024 11:37:35 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B8=82=E5=9C=BA?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excelTemplate/marketStandard.xls | Bin 27648 -> 20992 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/laws-modules/src/main/resources/excelTemplate/marketStandard.xls b/laws-modules/src/main/resources/excelTemplate/marketStandard.xls index c23798e1ab9ea14919e62e5b1cac1c9fe91478a2..912f7b7a513e568adb11cbd515d18078f3cff7d3 100644 GIT binary patch delta 6744 zcmcH;ZERE5_1x#@*p3q?aY7OtAf^qB*!gf0NJ4=mU}(|}OapY`V;#`o04W02 z7p(j7m`8C`f!CxYh34Hq+1bqod&3O)++Kh2jiBSzw|tk_Z-2Mr_kYFShOEPO{*&Hs z=h$(G6GY>eJ1WK#;!+#_VVeg_@OlCIU@ol2|JBG*%Zm8yXB+tIVOi>x_?IYyCX+qX zlMH({0w41))&{4MF>Zu%@XE!D;5_WnPbk34i&r6DMR*adnEI2Q$Jn4G$5O@xnSx=8r+fe}U&8*e3C?T*}MrrF?}vpC7On^L`v(mqUC3 z_7{UuE>{;Va<(a7~VBV*i{}Czpu;r{ila@Gc9y&jMer$K(Fe6bJMK9lpu}Z)H%i z1%EIDp7ytFr6ALUujBt83|fJ?oF3}B43?7O=}EjxNx{#PO9slG@F1v9OR zUW%na%%r=G;CLSp4|t)yA(&BLHdJQBm#K2JASn4#q~g&&#SX1nO}wO`hYAXc-NhJrAK%~^&;RBrWx0Gg zj?Q|#b@cGW=;4MQS430XAuto(#jkm0Wp%*kHy!Wr>bwePO(^ue%9Z{Aznovfr{;T& zh^QH{-;B6mL{u8*R~DEAE;l0v%!t335!cO#30|GhW^d(0)dvsQL8AMh4Wd2td^lsJ zzip-8@8>(b6`8pxej3*WE3Pa(S5BdYEQg+}(~65$M$@?8ii@_9#&sz(*T{T>kN%>J zc8$z8_!za~GWhrhD=veNH?6n~K29BDVVA+jt(m#%8w@_4vEnlLXe-XBvA)6JV}})& z!N=WJTm~QiZpCHrv82Sb-&Or+eE_ivh{ku1)j3T?@4c~d(jPjd(zC8X zaKH0qlPUNJ4-UbAnpm=fn!ye=Oh=C% zO%vPN+Nz1=d&af!YrcFQEc4`$K2-`;_%(GXHnn&OTs@U6if8)b)#HTJ;-xvOI+2Jo z%_=@zW(@I~shU=c5SvqGnnCNKE|ZyREE4}Zl+yb4xJQ~=jqa#?nU=y7vq*ar>P#(b zYwMQGvJxY&X*x44D=+bh_?I_pPSYyKA#Rk%uZ=hDQL>ieW7x^H6D+t46|c{V%TV#& zoKTUz#Yv;S;$aGKR$drW7Tq!xiJ&im>6z1l91kEwUmDb~Pqsw>%4-dJ7BrtzNYcGk#G zRL58ouc_&uD?@YKh2~5%nd3@0;MUV;2X4Ib(w20yD2;kd*Un?J_>J0ytcACP7P40U%g}pLcqU&}_gyTucVRPo6kVj#g&kZB4R`0Sa!y}Q8BI`FHUfMh5`JO!kT{t|x=vRxj z{ZtIMKJ)I&PwsDAlm+bC_T!6QJhPmB^<%cJjlG?ilkeBQuCg20OiSnGreGP3|#F00&SpQkv69R$Vr;C8dz@ z()S+3do>MeP3x{92=r!H~V_ygQpxd)X|2#ce|u=lED` z)SD;nQvEp5h6@qb!44ET>PgXE_>ybXor1IJv|X5j-QWhlj*h0VQ765f#U{~-nkoi0 zIwLzJ3=1CM5b)5xN9H_%B)|(lq@o3FNgS0}FEmr>gg9%1d*YxEKwBD;5JQOODl`dS zG?N+yvccoxwXg!oFk3i%55y}QJA!1FLd=4&DA5Y!K!{4Q0y*)$HI-Zia-mQV2bdx z9sb)dU(BTFwE-;z$-zX{AoO3tpPpz#h!R#|l?^nzftH03y#-M?9R|p0fLw-o*$5?# ziJ@|L3PdQ!z?y4-JO(Jw0Ocb@LO(by*Fl>Y$z;mz=o`GJZ*X4UrusVTy@sWe7<$4@_M|}TK$%yDPBSJ&* zrA16`u5W5Y@|33;zPz_#M$sI<6P?F4EdJr~@z|FxSl_*AqDUi n|C>iXymRup$mcohdwQBhY6*JH;&stzUrjUIo_^{_sG<8m%<5P% delta 6957 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 SQ$Y9wafL2=M;GT5-u??fYOewS From b7d4225a3f4964c5b00066985f1530010ad4fb8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 10 Oct 2024 14:22:42 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=82=E5=9C=BA?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsMarketStandardServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java index 13ebe2e0..48f44106 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java @@ -552,12 +552,12 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl queryLawsMarketStandard = new QueryWrapper<>(); queryLawsMarketStandard.select("max(manifest_version) as manifest_version"); queryLawsMarketStandard.eq("version_flag",lawsMarketStandardOld.getVersionFlag()); - LawsMarketStandard obj = getOne(queryLawsMarketStandard); + LawsMarketStandard obj = getOne(queryLawsMarketStandard,false); String manifestVersion = ""; - if(Objects.isNull(obj) || StringUtils.isEmpty(obj.getManifestNo())){ + if(Objects.isNull(obj) || StringUtils.isEmpty(obj.getManifestVersion())){ manifestVersion = "V1.0"; }else{ - int str = Integer.parseInt(obj.getManifestNo().replace("V","")) + 1; + int str = (int) Double.parseDouble(obj.getManifestVersion().replace("V","")) + 1; manifestVersion = "V" + str + ".0"; } // 更新状态 @@ -612,10 +612,10 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl Date: Thu, 10 Oct 2024 14:30:16 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=89=88=E6=9C=AC=E5=8F=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MarketStandardController.java | 2 +- .../service/impl/LawsMarketStandardServiceImpl.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java index 2b97f56f..4f51f2e9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java @@ -269,7 +269,7 @@ public class MarketStandardController { @ApiOperation(value = "外部标准库-市场法规清单-修改版本号", notes = "外部标准库-市场法规清单-修改版本号") @ApiOperationSupport(order = 6) @PostMapping(value = "/editManifestVersion") -// @RequiresPermissions("marketStandard:edit") + @RequiresPermissions("marketStandard:editVersion") public Result editManifestVersion(@RequestBody LawsMarketStandard lawsMarketStandard) { this.marketStandardService.editManifestVersion(lawsMarketStandard); return Result.OK(ResultCommon.OK); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java index 48f44106..e13a6a86 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java @@ -723,6 +723,15 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(LawsMarketStandard::getVersionFlag,obj.getVersionFlag()); + queryWrapper.ne(LawsMarketStandard::getId,marketStandard.getId()); + queryWrapper.eq(LawsMarketStandard::getManifestVersion,marketStandard.getManifestVersion()); + long l = count(queryWrapper); + if(l > 0){ + throw new JeroBootException(Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ? + "Version Already exist" : "清单版本已存在"); + } LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.eq(LawsMarketStandard::getId,marketStandard.getId()); update.set(LawsMarketStandard::getManifestVersion,marketStandard.getManifestVersion()); From d176744c0fa6e22c8305c4a8c5ad4a92ce6e4c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 10 Oct 2024 15:49:17 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=82=E5=9C=BA?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excelTemplate/marketStandard.xls | Bin 20992 -> 21504 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/laws-modules/src/main/resources/excelTemplate/marketStandard.xls b/laws-modules/src/main/resources/excelTemplate/marketStandard.xls index 912f7b7a513e568adb11cbd515d18078f3cff7d3..b05686304c98d7ef149b54de36fb3fbfeec8f8cb 100644 GIT binary patch delta 1137 zcma)5T}TvB6h3zx|902e9bIQ;Cvx{CTf@!O3~LcrEO4uJZ4*k9T>M!z)}*AQR%p!x z4F$_9iP2N^(3{0Xk7<$hP!vIs6rnGIJxNj7k2Rf{by**Zx|eg$x##=7bIuIh{+p!# z7P-wbSz7_%m#V5PdMD+XizHvU!bHe8+m*UlF+IObPq9Nx%^u}DTbITj^UN!n7AS-9A+tn1XdgK@ZQ%r3nZ?pl&Pp9-nGRt74RRi$$(*cQH}|9xBVFJ{ zn+e-~RxJRp;2=Q11TgDZ1S@1wZ?0(LlBfeiA%Swb)|^1^VxTS7rE4u3N_aYxBa&?T zBDdO>gP`7Jg6AiVlSW_#ooS^-f=F_8zCc4lh)C3K6>YW+{2BXBITsxL>iZ@^t9wi+Xo8QTC7}?mMnDEmQ8$0b3rN3OjXcH&(ZY$lr30VP`-M) zN$dxt;)g?|ek%BBglm^o0~Et{sBFpX$ZxW@uhtFrdIEEyNWB3{Fu&Fq4xS8mw>}RP z_PssqABND=29sLY2Lb=EC(t=us^3QSTcW0hXX+Wxxsh7N9aq-06t%ZTV&;%m&Hy`r zxR=8A4muVNmUo&%vRV)E?b3bxG^zi?(b~vr3Al0OQgER!UO!E$+^{W>sDZrLUxr$G$QIo34s-X%Th{q9^K9$+XRTw5s}?Jw`A9rdGQSPL zuQ-ks*Xl>3_isvH}qNOIg?mw8CnWu~DhWu2IzN;}uEl$kLM7yaGPS#nu(VieluJyeSMCJCv^(uW zg{d;6T4;n$^?4c($Hiu<7EO2YAAP&puCktj(6o#ra*3F>n2#b)%f^sr&(m$&;~d4e zwamNdgC<}PyupM>A0HeXUne`dm{E2fo kj2>ug$fTzPGMqx(g+wR2!V5*3fKPoxpXtodrH8}nH<$O3NdN!< From d81654598dc685cf9996821ccf79c8b7ad0beb22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 10 Oct 2024 17:20:48 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=82=E5=9C=BA?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsMarketStandardServiceImpl.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java index e13a6a86..d25fa3db 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java @@ -482,10 +482,18 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl queryLawsMarketStandard = new LambdaQueryWrapper<>(); - queryLawsMarketStandard.eq(LawsMarketStandard::getVersionFlag,lawsMarketStandard.getVersionFlag()); - long l = count(queryLawsMarketStandard); - lawsMarketStandard.setManifestVersion("V" + l + ".0"); + QueryWrapper queryLawsMarketStandard = new QueryWrapper<>(); + queryLawsMarketStandard.select("max(manifest_version) as manifest_version"); + queryLawsMarketStandard.eq("version_flag",lawsMarketStandard.getVersionFlag()); + LawsMarketStandard obj = getOne(queryLawsMarketStandard); + String manifestVersion = ""; + if(Objects.isNull(obj) || StringUtils.isEmpty(obj.getManifestVersion())){ + manifestVersion = "V1.0"; + }else{ + int str = (int) Double.parseDouble(obj.getManifestVersion().replace("V","")) + 1; + manifestVersion = "V" + str + ".0"; + } + lawsMarketStandard.setManifestVersion(manifestVersion); return lawsMarketStandard; }