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

修改市场法规清单必填项

Browse Source
This commit is contained in:
梁琦涛
2024-08-26 13:36:53 +08:00
parent 9aebdaba44
commit 31e7b5442a
6 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java
-3
View File
@@ -102,7 +102,6 @@ public class LawsMarketStandardDetail implements Serializable {
* 新生产车实施日期
*/
@Excel(name = "新生产车实施日期", width = 15)
@NotBlank(message = "新生产车实施日期不能为空")
@ApiModelProperty(value = "新生产车实施日期")
private String newProductImplDate;
@@ -110,7 +109,6 @@ public class LawsMarketStandardDetail implements Serializable {
* 新认证车实施日期
*/
@Excel(name = "新认证车实施日期", width = 15)
@NotBlank(message = "新认证车实施日期不能为空")
@ApiModelProperty(value = "新认证车实施日期")
private String newAuthImplDate;
@@ -118,7 +116,6 @@ public class LawsMarketStandardDetail implements Serializable {
* 注册日期
*/
@Excel(name = "注册日期", width = 15)
@NotBlank(message = "注册日期不能为空")
@ApiModelProperty(value = "注册日期")
private String registrationDate;
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
+4 -4
View File
@@ -239,7 +239,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
p.setManifestId(manifestId);
// 校验数据
StringBuilder s = new StringBuilder();
StringBuilder g = ValidUtil.validateReturnBuilderIsNotBlank(p);
StringBuilder g = ValidUtil.validateReturnBuilderIsNotBlank(p);
if(!StringUtils.isEmpty(g.toString())){
s.append(g.toString());
}
@@ -287,7 +287,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
// 验证标准名称
if(!Objects.equals(obj.getStandardName(),p.getStandardName())){
String name = ValidUtil.getAnnotation(LawsMarketStandardDetail.class,"standardName");
s.append(MessageUtils.getMessage(ResultCommon.FORMATTING_ERROR,name)).append(",");
s.append(MessageUtils.getMessage(ResultCommon.DATA_MISMATCH,name)).append(",");
}
// 验证标准英文名称
appendStandardEnglishName(p, s, obj);
@@ -296,7 +296,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
if(!Objects.equals(StringUtils.isEmpty(obj.getType()) ? "" : obj.getType(),
StringUtils.isEmpty(p.getType()) ? "" : p.getType())){
String name = ValidUtil.getAnnotation(LawsMarketStandardDetail.class,"type");
s.append(MessageUtils.getMessage(ResultCommon.FORMATTING_ERROR,name)).append(",");
s.append(MessageUtils.getMessage(ResultCommon.DATA_MISMATCH,name)).append(",");
}
}
listStandardIdRepeat.add(id);
@@ -306,7 +306,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
if(!Objects.equals(StringUtils.isEmpty(obj.getStandardEnglishName()) ? "" : obj.getStandardEnglishName(),
StringUtils.isEmpty(p.getStandardEnglishName()) ? "" : p.getStandardEnglishName())){
String name = ValidUtil.getAnnotation(LawsMarketStandardDetail.class,"standardEnglishName");
s.append(MessageUtils.getMessage(ResultCommon.FORMATTING_ERROR,name)).append(",");
s.append(MessageUtils.getMessage(ResultCommon.DATA_MISMATCH,name)).append(",");
}
}
laws-modules/src/main/java/com/jero/modules/laws/utils/ValidUtil.java
+6 -6
View File
@@ -102,7 +102,7 @@ public class ValidUtil {
if(set != null && set.size() >0 ){
Field[] fields = object.getClass().getDeclaredFields();
setField(object, fields);
Locale locale = LocaleContextHolder.getLocale();
// Locale locale = LocaleContextHolder.getLocale();
for (Field field : fields) {
for(ConstraintViolation<Object> constraintViolation : set){
if(Objects.equals(constraintViolation.getPropertyPath().toString(),field.getName())){
@@ -166,7 +166,7 @@ public class ValidUtil {
*/
public static String getAnnotation(Class<?> clazz, String fieldName) {
try {
Locale locale = LocaleContextHolder.getLocale();
// Locale locale = LocaleContextHolder.getLocale();
// 获取字段
Field field = clazz.getDeclaredField(fieldName);
// 检查字段是否有 MyAnnotation 注解
@@ -174,10 +174,10 @@ public class ValidUtil {
// 获取注解实例
Excel annotation = field.getAnnotation(Excel.class);
String name = annotation.name();
String[] str1 = name.split("\\(");
String en = str1.length > 1 ? str1[1].split("\\)")[0] : str1[0];
String zh = str1[0];
name = Objects.equals(locale,Locale.ENGLISH) ? en : zh;
// String[] str1 = name.split("\\(");
// String en = str1.length > 1 ? str1[1].split("\\)")[0] : str1[0];
// String zh = str1[0];
// name = Objects.equals(locale,Locale.ENGLISH) ? en : zh;
return name;
}
} catch (NoSuchFieldException e) {