法规和认证清单高级搜索责任人和接口人修改
This commit is contained in:
+11
@@ -323,4 +323,15 @@ public class ProjectCertificationInventoryEOController extends JeroController<Pr
|
||||
public Result<?> addConfigByIds(@RequestBody JSONObject json) {
|
||||
return this.projectCertificationInventoryEOService.addConfigByIds(json);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取责任人和接口人
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "项目库-认证清单表-获取责任人和接口人")
|
||||
@ApiOperation(value="项目库-认证清单表-获取责任人和接口人", notes="项目库-认证清单表-获取责任人和接口人")
|
||||
@GetMapping(value = "/queryDutyPersonByProjectId")
|
||||
public Result<?> queryDutyPersonByProjectId(@RequestParam Map<String,Object> params) {
|
||||
return Result.OK(this.projectCertificationInventoryEOService.queryDutyPersonByProjectId(params));
|
||||
}
|
||||
}
|
||||
|
||||
+13
@@ -527,4 +527,17 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
|
||||
public Result<?> compulsoryTransfer(@RequestBody JSONObject json) {
|
||||
return this.projectLawsInventoryEOService.compulsoryTransfer(json);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过projectId查询责任人
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "项目库-法规清单表-通过projectId查询责任人")
|
||||
@ApiOperation(value="项目库-法规清单表-通过projectId查询责任人", notes="项目库-法规清单表-通过projectId查询责任人")
|
||||
@GetMapping(value = "/queryDutyPersonByProjectId")
|
||||
public Result<?> queryDutyPersonByProjectId(@RequestParam Map<String,Object> params){
|
||||
Map<String, List<Map<String, Object>>> res = this.projectLawsInventoryEOService.queryDutyPersonByProjectId(params);
|
||||
return Result.OK(res);
|
||||
}
|
||||
}
|
||||
|
||||
+1
@@ -253,4 +253,5 @@ public interface IProjectCertificationInventoryEOService extends IService<Projec
|
||||
void certificationInventoryEOListSortByEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
|
||||
void certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
|
||||
void certificationInventoryEOListSortByTaskConfirmEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
|
||||
Map<String, List<Map<String, Object>>> queryDutyPersonByProjectId(Map<String, Object> params);
|
||||
}
|
||||
|
||||
+2
@@ -255,4 +255,6 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
|
||||
Result<?> citeDeliverable(JSONObject json);
|
||||
|
||||
Result<?> compulsoryTransfer(JSONObject json);
|
||||
|
||||
Map<String, List<Map<String, Object>>> queryDutyPersonByProjectId(Map<String, Object> params);
|
||||
}
|
||||
|
||||
+51
@@ -5277,4 +5277,55 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
||||
|
||||
return Result.OK("添加配置成功!");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, List<Map<String, Object>>> queryDutyPersonByProjectId(Map<String, Object> params) {
|
||||
Map<String, List<Map<String, Object>>> result = new HashMap<>();
|
||||
String projectLibraryId = (String) params.get("projectLibraryId");
|
||||
if(StringUtils.isNotEmpty(projectLibraryId)) {
|
||||
LambdaQueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryId);
|
||||
List<ProjectCertificationInventoryEO> pciList = this.list(queryWrapper);
|
||||
List<String> dutyList = new ArrayList<>();
|
||||
List<String> interfaceList = new ArrayList<>();
|
||||
for (ProjectCertificationInventoryEO pci : pciList) {
|
||||
if(StringUtils.isNotEmpty(pci.getDutyPerson())){
|
||||
dutyList.add(pci.getDutyPerson());
|
||||
}
|
||||
if(StringUtils.isNotEmpty(pci.getSdt())){
|
||||
interfaceList.add(pci.getSdt());
|
||||
}
|
||||
}
|
||||
if(CollectionUtils.isNotEmpty(dutyList)){
|
||||
List<Map<String, Object>> resList = new ArrayList<>();
|
||||
List<SysUser> userList = this.sysUserService.querySysUserListByIdList(dutyList);
|
||||
if(CollectionUtils.isNotEmpty(userList)){
|
||||
for (SysUser user : userList) {
|
||||
Map<String,Object> userMap = new HashMap<>();
|
||||
userMap.put("id",user.getId());
|
||||
userMap.put("userName",user.getUsername());
|
||||
resList.add(userMap);
|
||||
}
|
||||
}
|
||||
result.put("dutyList",resList);
|
||||
}
|
||||
|
||||
if(CollectionUtils.isNotEmpty(interfaceList)){
|
||||
List<Map<String, Object>> resList = new ArrayList<>();
|
||||
List<SysUser> userList = this.sysUserService.querySysUserListByIdList(interfaceList);
|
||||
if(CollectionUtils.isNotEmpty(userList)){
|
||||
for (SysUser user : userList) {
|
||||
Map<String,Object> userMap = new HashMap<>();
|
||||
userMap.put("id",user.getId());
|
||||
userMap.put("userName",user.getUsername());
|
||||
resList.add(userMap);
|
||||
}
|
||||
}
|
||||
result.put("interfaceList",resList);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
+2651
-2479
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user