From 5d8f39289c37852112cde94260b278ad9dfe3c5a Mon Sep 17 00:00:00 2001 From: liao Date: Thu, 14 Sep 2023 17:37:51 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8F=B3=E4=BE=A7=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=8A=BD=E5=B1=89=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsCommonServiceImpl.java | 3 +- .../common/vo/ManyStandardSelectionBox.java | 2 ++ .../standard/domestic/StandardTest.java | 30 +++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 laws-single-startup/src/test/java/com/jero/modules/standard/domestic/StandardTest.java 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 1cf8d68a..8ab671ed 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 @@ -513,7 +513,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { throw new JeroBootException(ResultCommon.EMPTY_COMMON, FieldCommon.YEAR_NUMBER); } // 最后生成的法规编号 - standardNumber = standardClass + standardNumber + "-" + yearNumber; + standardNumber = standardClass + " " + standardNumber + "-" + yearNumber; + parameterMap.put(FieldCommon.STANDARD_NUMBER, standardNumber); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java index 007f6e03..4d8a6802 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java @@ -1,6 +1,7 @@ package com.jero.modules.laws.common.vo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -29,5 +30,6 @@ public class ManyStandardSelectionBox { @ApiModelProperty(value = "发布日期") private java.util.Date releaseDate; @ApiModelProperty(value = "标准状态") + @Dict(dicCode = "standard_state") private java.lang.String standardState; } diff --git a/laws-single-startup/src/test/java/com/jero/modules/standard/domestic/StandardTest.java b/laws-single-startup/src/test/java/com/jero/modules/standard/domestic/StandardTest.java new file mode 100644 index 00000000..7bb78df4 --- /dev/null +++ b/laws-single-startup/src/test/java/com/jero/modules/standard/domestic/StandardTest.java @@ -0,0 +1,30 @@ +package com.jero.modules.standard.domestic; + +import com.jero.JeroSystemSingleApplication; +import com.jero.modules.laws.standard.entity.LawsDomesticStandard; +import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +/** + * @Author: liao + * @Date: 2023/9/14 17:14 + * @Description: + */ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeroSystemSingleApplication.class) +public class StandardTest { + + @Autowired + private ILawsDomesticStandardService lawsDomesticStandardService; + + @Test + public void getByIdTest() { + LawsDomesticStandard byId = lawsDomesticStandardService.getById("86a75ae628c9485ca002b56551606684"); + System.out.println(byId); + } + +}