productDev/dmvisit.git

			@@ -6,6 +6,7 @@
			import com.doumee.core.annotation.pr.PreventRepeat;
			import com.doumee.core.constants.ResponseStatus;
			import com.doumee.core.exception.BusinessException;
			import com.doumee.dao.business.vo.HiddenDangerDataVO;
			import com.doumee.service.business.third.model.ApiResponse;
			import com.doumee.service.business.third.model.LoginUserInfo;
			import com.doumee.service.business.third.model.PageData;
			@@ -120,10 +121,9 @@

			@ApiOperation("隐患数据统计")
			@PostMapping("/hiddenDangerData")
			public ApiResponse hiddenDangerData (@RequestBody HiddenDanger hiddenDanger,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
			public ApiResponse<HiddenDangerDataVO> hiddenDangerData (@RequestBody HiddenDanger hiddenDanger, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
			hiddenDanger.setLoginUserInfo(getLoginUser(token));
			hiddenDangerService.hiddenDangerData(hiddenDanger);
			return ApiResponse.success("操作成功");
			return ApiResponse.success("操作成功",hiddenDangerService.hiddenDangerData(hiddenDanger));
			}

			@@ -801,6 +801,9 @@
			List<HiddenDangerParam> hiddenDangerParamList = hiddenDangerParamMapper.selectList(new QueryWrapper<HiddenDangerParam>()
			.lambda().eq(HiddenDangerParam::getIsdeleted,Constants.ZERO).eq(HiddenDangerParam::getType,Constants.ONE));
			for (Integer cateId:cateSetList) {
			if(Objects.isNull(cateId)){
			continue;
			}
			Optional<HiddenDangerParam> optionalHiddenDanger = hiddenDangerParamList.stream().filter(i->Constants.equalsInteger(i.getId(),cateId)).findAny();
			if(optionalHiddenDanger.isPresent()){
			GeneralDataVO generalDataVO = new GeneralDataVO();
			@@ -810,7 +813,8 @@
			generalDataVO.setTotal(total);
			generalDataVO.setRata(
			Constants.equalsInteger(total,Constants.ZERO)?
			BigDecimal.ZERO:new BigDecimal(total.toString()).divide(new BigDecimal(hiddenDangerDataVO.getTotal().toString()),2).multiply(new BigDecimal("100"))
			BigDecimal.ZERO:new BigDecimal(total.toString())
			.divide(new BigDecimal(hiddenDangerDataVO.getTotal().toString()),2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))
			);
			cateGeneralDataList.add(generalDataVO);
			}
			@@ -825,6 +829,9 @@
			List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>()
			.lambda().eq(Company::getIsdeleted,Constants.ZERO));
			for (Integer companyId:companyIdSetList) {
			if(Objects.isNull(companyId)){
			continue;
			}
			Optional<Company> optionalCompany = companyList.stream().filter(i->Constants.equalsInteger(i.getId(),companyId)).findAny();
			if(optionalCompany.isPresent()){
			GeneralDataVO generalDataVO = new GeneralDataVO();

	server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史