QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 法规符合性评估-适用市场字段

Browse Source
This commit is contained in:
mzaxd
2024-06-25 15:34:41 +08:00
parent 504311ad89
commit 4b0de19a0c
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java
+2
View File
@@ -8,6 +8,7 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@@ -80,6 +81,7 @@ public class LawsConformityAssessmentLibrary implements Serializable {
*/ */
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "适用市场") @ApiModelProperty(value = "适用市场")
@Dict(dicCode = "market_state")
private String applicableMarket; private String applicableMarket;
@TableField(exist = false) @TableField(exist = false)
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
+5 -2
View File
@@ -13,6 +13,8 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Arrays;
import static com.jero.modules.laws.common.constant.FieldCommon.STANDARD_NAME; import static com.jero.modules.laws.common.constant.FieldCommon.STANDARD_NAME;
import static com.jero.modules.laws.common.constant.FieldCommon.STANDARD_NUMBER; import static com.jero.modules.laws.common.constant.FieldCommon.STANDARD_NUMBER;
@@ -38,8 +40,9 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
"d.standard_number", lawsConformityAssessmentLibrary.getStandardNumber()); "d.standard_number", lawsConformityAssessmentLibrary.getStandardNumber());
queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardName()), queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardName()),
"d.standard_name", lawsConformityAssessmentLibrary.getStandardName()); "d.standard_name", lawsConformityAssessmentLibrary.getStandardName());
queryWrapper.eq(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getApplicableMarket()), if (StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getApplicableMarket())) {
"d.applicable_market", lawsConformityAssessmentLibrary.getApplicableMarket()); queryWrapper.in("d.applicable_market", Arrays.asList(lawsConformityAssessmentLibrary.getApplicableMarket().split(",")));
}
queryWrapper.between(lawsConformityAssessmentLibrary.getValuationTime() != null, queryWrapper.between(lawsConformityAssessmentLibrary.getValuationTime() != null,
"valuation_time", lawsConformityAssessmentLibrary.getStartValuationTime(), lawsConformityAssessmentLibrary.getEndValuationTime()); "valuation_time", lawsConformityAssessmentLibrary.getStartValuationTime(), lawsConformityAssessmentLibrary.getEndValuationTime());
queryWrapper.orderByDesc("cs.create_time"); queryWrapper.orderByDesc("cs.create_time");