haozq
/
lj-zhgd-ht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

导入提示修改

This commit is contained in:
cwchen 2024-08-30 10:33:05 +08:00
parent 7e967d099e
commit 2c8d2ea639
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java
View File

@ -465,7 +465,11 @@ public class PersonMgeServiceImpl implements IPersonMgeService {
String existData2 = isExistData(sameList2); String existData2 = isExistData(sameList2);
String existData3 = isExistData(sameList3); String existData3 = isExistData(sameList3);
String existData4 = isExistData(sameList4); String existData4 = isExistData(sameList4);
if (StringUtils.isNotBlank(existData)) { String errorInfo = returnErrorInfo(existData, existData2, existData3, existData4);
if(StringUtils.isNotBlank(errorInfo)){
return AjaxResult.error(errorInfo);
}
/*if (StringUtils.isNotBlank(existData)) {
return AjaxResult.error(existData); return AjaxResult.error(existData);
} }
if (StringUtils.isNotBlank(existData2)) { if (StringUtils.isNotBlank(existData2)) {
@ -476,7 +480,7 @@ public class PersonMgeServiceImpl implements IPersonMgeService {
} }
if (StringUtils.isNotBlank(existData4)) { if (StringUtils.isNotBlank(existData4)) {
return AjaxResult.error(existData4); return AjaxResult.error(existData4);
} }*/
// 校验库中数据的身份证号、手机号、安全帽编号、马甲编号是否重复 // 校验库中数据的身份证号、手机号、安全帽编号、马甲编号是否重复
List<Map<String, String>> personIsExist = mapper.personIsExist(new PersonVo()); List<Map<String, String>> personIsExist = mapper.personIsExist(new PersonVo());
List<Map<String, String>> aqmCodes = mapper.aqmCodeIsExist(); List<Map<String, String>> aqmCodes = mapper.aqmCodeIsExist();
@ -535,6 +539,28 @@ public class PersonMgeServiceImpl implements IPersonMgeService {
return AjaxResult.success(); return AjaxResult.success();
} }
public String returnErrorInfo(String existData,String existData2,String existData3,String existData4){
if(StringUtils.isEmpty(existData) && StringUtils.isEmpty(existData2)
&& StringUtils.isEmpty(existData3)&& StringUtils.isEmpty(existData4)){
return null;
}else{
StringBuffer sb = new StringBuffer();
if(StringUtils.isNotEmpty(existData)){
sb.append(existData + "<br>");
}
if(StringUtils.isNotEmpty(existData2)){
sb.append(existData2 + "<br>");
}
if(StringUtils.isNotEmpty(existData3)){
sb.append(existData3 + "<br>");
}
if(StringUtils.isNotEmpty(existData4)){
sb.append(existData4 + "<br>");
}
return sb.toString();
}
}
@Override @Override
public AjaxResult getPersonFace(BraceletParamsDto dto) { public AjaxResult getPersonFace(BraceletParamsDto dto) {
if (StringUtils.isBlank(dto.getFilePath())) { if (StringUtils.isBlank(dto.getFilePath())) {
@ -752,6 +778,9 @@ public class PersonMgeServiceImpl implements IPersonMgeService {
* @date 2024/7/17 10:39 * @date 2024/7/17 10:39
*/ */
public Integer setSexData(String value) { public Integer setSexData(String value) {
if(StringUtils.isEmpty(value)){
return null;
}
switch (value) { switch (value) {
case BusinessConstants.MAN: case BusinessConstants.MAN:
return 0; return 0;