WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_20230911_UAT' into fix_20230911_UAT

Browse Source
This commit is contained in:
gaosong
2023-12-22 17:53:39 +08:00
parent 62f52fa0fd cc2cb76438
commit 99ea589b2d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+2 -1
View File
@@ -731,7 +731,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@ApiOperation(value="催办", notes="催办") @ApiOperation(value="催办", notes="催办")
@PostMapping(value = "/urge") @PostMapping(value = "/urge")
public void urge(@RequestBody Map<String,Object> map){ public Result<?> urge(@RequestBody Map<String,Object> map){
String ids = (String)map.get("ids"); String ids = (String)map.get("ids");
String projectId = (String)map.get("projectId"); String projectId = (String)map.get("projectId");
String title = (String)map.get("title"); String title = (String)map.get("title");
@@ -739,6 +739,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
String projectVersion = (String)map.get("projectVersion"); String projectVersion = (String)map.get("projectVersion");
String paramsManifestId = (String)map.get("paramsManifestId"); String paramsManifestId = (String)map.get("paramsManifestId");
paramsCollectManifestEOService.urge(ids,projectId,title,inventoryVersion,projectVersion,paramsManifestId); paramsCollectManifestEOService.urge(ids,projectId,title,inventoryVersion,projectVersion,paramsManifestId);
return Result.OK("催办成功");
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+1 -1
View File
@@ -8147,7 +8147,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
//最新的截止时间 //最新的截止时间
List<Date> deadlineList = paramsCollectManifestEOList.stream() List<Date> deadlineList = paramsCollectManifestEOList.stream()
.filter(e -> ObjectUtils.isEmpty(e.getDeadline())).map(ParamsCollectManifestEO::getDeadline).collect(Collectors.toList()); .filter(e -> ObjectUtils.isNotEmpty(e.getDeadline())).map(ParamsCollectManifestEO::getDeadline).collect(Collectors.toList());
Date deadline = null; Date deadline = null;
if(ObjectUtils.isNotEmpty(deadlineList)){ if(ObjectUtils.isNotEmpty(deadlineList)){
Collections.sort(deadlineList, new Comparator<Date>() { Collections.sort(deadlineList, new Comparator<Date>() {