FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_3' into 'develop_master'

Browse Source 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!373
This commit is contained in:
super_liu
2022-01-18 03:42:27 +08:00
parent 087f629216 dccdd471f0
commit fe9d3c6ec6
3 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java
+1 -1
View File
@@ -163,7 +163,7 @@ public class SarLawsDetailedListController extends BaseController<SarLawsDetaile
} }
@ApiOperation(value = "标准插入已存在的清单") @ApiOperation(value = "当在编辑标准的国家地区的时候,自动添加到国家地区清单中,并且把标准的是否纳入认证清单改为\"是\"")
@PostMapping("/standardToLaws") @PostMapping("/standardToLaws")
public ResponseMessage standardToLaws(String countryArea,TimeDto timeDto){ public ResponseMessage standardToLaws(String countryArea,TimeDto timeDto){
sarLawsDetailedListService.standardToLaws(countryArea,timeDto); sarLawsDetailedListService.standardToLaws(countryArea,timeDto);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
+2
View File
@@ -724,6 +724,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
} }
sarLawsAttrDetailedListService.insertDetailedList(lawsDetailed.getId(), timeDtos); sarLawsAttrDetailedListService.insertDetailedList(lawsDetailed.getId(), timeDtos);
//更新标准是否纳入认证清单
sarStandardsInfoDao.updateISRELATEACCESSById("1", Arrays.asList(timeDto.getStandId()) );
break; break;
} }
} }
adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java
+40 -39
View File
@@ -94,50 +94,51 @@ public class SarAdvanceSearchUtil {
for (int i = 0; i < searchVOList.size(); i++) { for (int i = 0; i < searchVOList.size(); i++) {
String sql = ""; String sql = "";
SarAdvanceSearchVO searchVO=searchVOList.get(i); SarAdvanceSearchVO searchVO=searchVOList.get(i);
if (StringUtils.isNotBlank(searchVO.getValue())); if (StringUtils.isNotBlank(searchVO.getValue())) {
switch (searchVO.getType()) {
switch (searchVO.getType()){ //多个正则查询
//多个正则查询 case "regexp":
case "regexp": case "REGEXP":
case "REGEXP": if (i == 0) {
if (i==0){ sql += tableName + searchVO.getField() + " " + "REGEXP" + " " + "\'" + searchVO.getValue().replaceAll(",", "|").replaceAll("\\s*", "") + "\'";
sql+=tableName+searchVO.getField()+" " + "REGEXP" + " " + "\'" + searchVO.getValue().replaceAll(",","|").replaceAll("\\s*","") + "\'"; } else {
}else { sql += " AND " + " " + tableName + searchVO.getField() + " " + "REGEXP" + " " + "\'" + searchVO.getValue().replaceAll(",", "|").replaceAll("\\s*", "") + "\'";
sql+=" AND "+" "+tableName+searchVO.getField()+" " + "REGEXP" + " " +"\'"+ searchVO.getValue().replaceAll(",","|").replaceAll("\\s*","") + "\'" ; }
} break;
break;
//模糊查询 //模糊查询
case "LIKE": case "LIKE":
case "like": case "like":
if (i==0){ if (i == 0) {
sql+=tableName+searchVO.getField()+" " + "LIKE" + " " + "concat(concat('%','" +searchVO.getValue() + "'),'%') "; sql += tableName + searchVO.getField() + " " + "LIKE" + " " + "concat(concat('%','" + searchVO.getValue() + "'),'%') ";
}else { } else {
sql+=" AND "+" "+tableName+searchVO.getField()+" " +"LIKE" + " " + "concat(concat('%','" +searchVO.getValue() + "'),'%') "; sql += " AND " + " " + tableName + searchVO.getField() + " " + "LIKE" + " " + "concat(concat('%','" + searchVO.getValue() + "'),'%') ";
} }
break; break;
//日期范围查询 //日期范围查询
case "between": case "between":
case "BETWEEN": case "BETWEEN":
String[] boundaryArray = searchVO.getValue().split(","); String[] boundaryArray = searchVO.getValue().split(",");
if (i==0){ if (i == 0) {
sql+= "DATE_FORMAT("+ tableName+searchVO.getField() + ",'%Y-%m-%d')"+" " + "BETWEEN" + " " +"DATE_FORMAT("+ "\'" + boundaryArray[0].replaceAll("\\s*","") + "\'" +",'%Y-%m-%d')" +" AND "+ "DATE_FORMAT("+ "\'" + boundaryArray[1].replaceAll("\\s*","") + "\'" + ",'%Y-%m-%d')"; sql += "DATE_FORMAT(" + tableName + searchVO.getField() + ",'%Y-%m-%d')" + " " + "BETWEEN" + " " + "DATE_FORMAT(" + "\'" + boundaryArray[0].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')" + " AND " + "DATE_FORMAT(" + "\'" + boundaryArray[1].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')";
}else { } else {
sql+=" AND "+" "+"DATE_FORMAT("+ tableName+searchVO.getField() + ",'%Y-%m-%d')"+" " + "BETWEEN" + " " +"DATE_FORMAT("+ "\'" + boundaryArray[0].replaceAll("\\s*","") + "\'" + ",'%Y-%m-%d')" +" AND "+ "DATE_FORMAT("+ "\'" + boundaryArray[1].replaceAll("\\s*","") + "\'" + ",'%Y-%m-%d')"; sql += " AND " + " " + "DATE_FORMAT(" + tableName + searchVO.getField() + ",'%Y-%m-%d')" + " " + "BETWEEN" + " " + "DATE_FORMAT(" + "\'" + boundaryArray[0].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')" + " AND " + "DATE_FORMAT(" + "\'" + boundaryArray[1].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')";
} }
break; break;
case "equals": case "equals":
case "EQUALS": case "EQUALS":
if (i==0){ if (i == 0) {
sql+= "DATE_FORMAT("+ tableName+searchVO.getField() + ",'%Y-%m-%d')"+" " + "=" + " " +"DATE_FORMAT("+ "\'" + searchVO.getValue() + "\'" +",'%Y-%m-%d')" ; sql += "DATE_FORMAT(" + tableName + searchVO.getField() + ",'%Y-%m-%d')" + " " + "=" + " " + "DATE_FORMAT(" + "\'" + searchVO.getValue() + "\'" + ",'%Y-%m-%d')";
}else { } else {
sql+=" AND "+" "+"DATE_FORMAT("+ tableName+searchVO.getField() + ",'%Y-%m-%d')"+" " + "=" + " " +"DATE_FORMAT("+ "\'" + searchVO.getValue() + "\'" +",'%Y-%m-%d')" ; sql += " AND " + " " + "DATE_FORMAT(" + tableName + searchVO.getField() + ",'%Y-%m-%d')" + " " + "=" + " " + "DATE_FORMAT(" + "\'" + searchVO.getValue() + "\'" + ",'%Y-%m-%d')";
} }
break; break;
default: default:
}
sqlBuilder.append(sql);
} }
sqlBuilder.append(sql);
} }
sqlInfo = sqlBuilder.toString(); sqlInfo = sqlBuilder.toString();
} }