java/SmartPlatform.git

			@@ -56,7 +56,7 @@
			@Resource
			private OaApprovalApplicationsService approvalApplicationsService;
			@Resource
			private OaApprovalApplicationAdvertisementService approvalApplicationAdvertisementService;
			private OaApprovalApplicationAdService approvalApplicationAdvertisementService;
			@Resource
			private OaApprovalApplicationContactService approvalApplicationContactService;
			@Resource
			@@ -138,9 +138,9 @@
			Map<Integer, List<OaApprovalApplicationAssetItem>> approvalApplicationAssetItemMap = approvalApplicationAssetItemService.lambdaQuery()
			.in(OaApprovalApplicationAssetItem::getApprovalApplicationId, applicationIds).list()
			.stream().collect(Collectors.groupingBy(OaApprovalApplicationAssetItem::getApprovalApplicationId));
			Map<Integer, OaApprovalApplicationAdvertisement> approvalApplicationAdvertisementMap = approvalApplicationAdvertisementService.lambdaQuery()
			.in(OaApprovalApplicationAdvertisement::getApprovalApplicationId, applicationIds).list()
			.stream().collect(Collectors.toMap(OaApprovalApplicationAdvertisement::getApprovalApplicationId, e -> e));
			Map<Integer, OaApprovalApplicationAd> approvalApplicationAdvertisementMap = approvalApplicationAdvertisementService.lambdaQuery()
			.in(OaApprovalApplicationAd::getApprovalApplicationId, applicationIds).list()
			.stream().collect(Collectors.toMap(OaApprovalApplicationAd::getApprovalApplicationId, e -> e));
			Map<Integer, OaApprovalApplicationAttendance> applicationAttendanceMap = approvalApplicationAttendanceService.lambdaQuery()
			.in(OaApprovalApplicationAttendance::getApprovalApplicationId, applicationIds).list()
			.stream().collect(Collectors.toMap(OaApprovalApplicationAttendance::getApprovalApplicationId, e -> e));
			@@ -282,11 +282,11 @@
			}
			break;
			case 17:
			OaApprovalApplicationAdvertisement oaApprovalApplicationAdvertisement = approvalApplicationAdvertisementMap.get(approvalApplication.getId());
			if (oaApprovalApplicationAdvertisement!=null){
			approvalTodoVO.setTitle(oaApprovalApplicationAdvertisement.getTitle());
			approvalTodoVO.setContent(oaApprovalApplicationAdvertisement.getContent());
			approvalTodoVO.setAmount(oaApprovalApplicationAdvertisement.getTotalAmount());
			OaApprovalApplicationAd oaApprovalApplicationAd = approvalApplicationAdvertisementMap.get(approvalApplication.getId());
			if (oaApprovalApplicationAd !=null){
			approvalTodoVO.setTitle(oaApprovalApplicationAd.getTitle());
			approvalTodoVO.setContent(oaApprovalApplicationAd.getContent());
			approvalTodoVO.setAmount(oaApprovalApplicationAd.getTotalAmount());
			}
			break;
			}
			@@ -783,7 +783,7 @@
			res.setApplicationReason(approvalApplicationsBack.getApplicationReason());
			res.setAttachmentUrl(approvalApplicationsBack.getAttachmentUrl());
			res.setOperateTime(approvalApplicationAssetBack.getOperateTime());
			res.setExpectReturnDate(approvalApplicationAssetBack.getExpectReturnDate());
			res.setExpectReturnDate(approvalApplicationAssetBack.getOperateTime());
			res.setTitle(approvalApplicationAssetBack.getTitle());
			res.setApplicationCode(approvalApplications.getApplicationCode());
			res.setIsAudit(extracted(id, approvalApplications));
			@@ -1027,8 +1027,8 @@
			@GetMapping(value = "/detailAdvertisement")
			public R<AdvertisementDetailVO> detailAdvertisement(@ApiParam("申请单d")Integer id) {
			OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
			OaApprovalApplicationAdvertisement applicationAdvertisement = approvalApplicationAdvertisementService.lambdaQuery()
			.eq(OaApprovalApplicationAdvertisement::getApprovalApplicationId, approvalApplications.getId())
			OaApprovalApplicationAd applicationAdvertisement = approvalApplicationAdvertisementService.lambdaQuery()
			.eq(OaApprovalApplicationAd::getApprovalApplicationId, approvalApplications.getId())
			.last("limit 1").one();

			List<OaApprovalFlowAudit> approvalFlowAudits = approvalFlowAuditService.lambdaQuery().eq(OaApprovalFlowAudit::getApprovalApplicationId, approvalApplications.getId())
			@@ -1067,6 +1067,8 @@
			}
			private List<ApprovalFlowNodeListVO> getFlowNodeList(SysUser sysUser, List<OaApprovalFlowAudit> approvalFlowAudits
			,List<OaApprovalFlowNode> approvalFlowNodes) {
			Map<Long, String> userMap = sysUserService.selectAllList().stream()
			.collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName));
			List<ApprovalFlowNodeListVO> approvalFlowNodeListVOS = new ArrayList<>();
			Map<Integer, OaApprovalFlowAudit> approvalFlowAuditMap = approvalFlowAudits.stream().collect(Collectors.toMap(OaApprovalFlowAudit::getFlowNodeId, e -> e));

			@@ -1075,6 +1077,7 @@
			if (sysUser!=null){
			approvalFlowNodeListVO.setUserName(sysUser.getNickName());
			}
			approvalFlowNodeListVO.setSignFlag(false);
			approvalFlowNodeListVOS.add(approvalFlowNodeListVO);
			for (OaApprovalFlowNode approvalFlowNode : approvalFlowNodes) {
			ApprovalFlowNodeListVO approvalFlowNodeVO = new ApprovalFlowNodeListVO();
			@@ -1082,12 +1085,16 @@
			OaApprovalFlowAudit approvalFlowAudit = approvalFlowAuditMap.get(approvalFlowNode.getId());
			if (approvalFlowAudit!=null){
			approvalFlowNodeVO.setFlowName(approvalFlowAudit.getFlowName());
			approvalFlowNodeVO.setUserName(approvalFlowAudit.getUserName());
			String s = userMap.get(approvalFlowAudit.getUserId().longValue());
			if (s!=null){
			approvalFlowNodeVO.setUserName(s);
			}
			approvalFlowNodeVO.setSignPicUrl(approvalFlowAudit.getSignPicUrl());
			approvalFlowNodeVO.setApprovalStatus(approvalFlowAudit.getApprovalStatus());
			}else{
			approvalFlowNodeVO.setFlowName(approvalFlowNode.getFlowName());
			}
			approvalFlowNodeVO.setSignFlag(approvalFlowNode.getSignFlag());
			approvalFlowNodeListVOS.add(approvalFlowNodeVO);
			}
			return approvalFlowNodeListVOS;