From 90c9c3e5d6c58ec9ed50ce7a46ea34f70abe6b40 Mon Sep 17 00:00:00 2001 From: zt Date: Fri, 18 Apr 2025 17:28:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{controller => }/WgzAppController.java | 2 +- .../WgzAttendanceController.java | 2 +- .../WgzDailyClockController.java | 2 +- .../{controller => }/WgzLeaveController.java | 2 +- .../WgzMessageController.java | 2 +- .../WgzPayCalculationController.java | 2 +- .../WgzPayCalculationFilesController.java | 2 +- .../WgzQuestionBankController.java | 2 +- .../WgzQuestionCategoryController.java | 2 +- .../WgzQuestionSaveController.java | 2 +- .../WgzQuestionsConfigurationController.java | 2 +- .../WgzReissueacardController.java | 2 +- .../WgzScoreRecordController.java | 2 +- .../{controller => }/WgzUserController.java | 2 +- .../fbs/service/impl/FbsUserServiceImpl.java | 7 +- .../zbf/domain/dto/ZbfProgressListDTO.java | 6 +- .../ZbfProjectSubcontractingApplyListVO.java | 5 +- .../vo/ZbfProjectSubcontractingUpdateVO.java | 3 + .../service/impl/ZbfProjectServiceImpl.java | 100 +++++++++++------- .../zbf/service/impl/ZbfUserServiceImpl.java | 2 +- .../ZbfProjectSubcontractingApplyMapper.xml | 7 +- 21 files changed, 94 insertions(+), 64 deletions(-) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/{controller => }/WgzAppController.java (99%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/{controller => }/WgzAttendanceController.java (98%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/{controller => }/WgzDailyClockController.java (98%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/{controller => }/WgzLeaveController.java (98%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/{controller => }/WgzMessageController.java (98%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/{controller => }/WgzPayCalculationController.java (98%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/{controller => }/WgzPayCalculationFilesController.java (98%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/{controller => }/WgzQuestionBankController.java (98%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/{controller => }/WgzQuestionCategoryController.java (98%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/{controller => }/WgzQuestionSaveController.java (98%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/{controller => }/WgzQuestionsConfigurationController.java (98%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/{controller => }/WgzReissueacardController.java (98%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/{controller => }/WgzScoreRecordController.java (98%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/{controller => }/WgzUserController.java (98%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzAppController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzAppController.java index 876ac09..c47da3e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzAppController.java @@ -1,4 +1,4 @@ - package com.ruoyi.web.controller.wgz.controller; + package com.ruoyi.web.controller.wgz; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAttendanceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzAttendanceController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAttendanceController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzAttendanceController.java index 98dcbfe..3830edb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAttendanceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzAttendanceController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.wgz.controller; +package com.ruoyi.web.controller.wgz; import java.util.List; import java.util.Arrays; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzDailyClockController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzDailyClockController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzDailyClockController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzDailyClockController.java index 6708731..fc08d44 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzDailyClockController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzDailyClockController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.wgz.controller; +package com.ruoyi.web.controller.wgz; import java.util.List; import java.util.Arrays; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzLeaveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzLeaveController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzLeaveController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzLeaveController.java index 0a133f3..025e6b4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzLeaveController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzLeaveController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.wgz.controller; +package com.ruoyi.web.controller.wgz; import java.util.List; import java.util.Arrays; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzMessageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzMessageController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzMessageController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzMessageController.java index 0a6b665..119b1a7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzMessageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzMessageController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.wgz.controller; +package com.ruoyi.web.controller.wgz; import java.util.List; import java.util.Arrays; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzPayCalculationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzPayCalculationController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzPayCalculationController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzPayCalculationController.java index d6e1e2b..416d4b2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzPayCalculationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzPayCalculationController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.wgz.controller; +package com.ruoyi.web.controller.wgz; import java.util.List; import java.util.Arrays; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzPayCalculationFilesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzPayCalculationFilesController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzPayCalculationFilesController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzPayCalculationFilesController.java index f5c2226..e165a63 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzPayCalculationFilesController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzPayCalculationFilesController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.wgz.controller; +package com.ruoyi.web.controller.wgz; import java.util.List; import java.util.Arrays; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzQuestionBankController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzQuestionBankController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzQuestionBankController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzQuestionBankController.java index 2593d19..9e6bc88 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzQuestionBankController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzQuestionBankController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.wgz.controller; +package com.ruoyi.web.controller.wgz; import java.util.List; import java.util.Arrays; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzQuestionCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzQuestionCategoryController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzQuestionCategoryController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzQuestionCategoryController.java index 7800b3e..a3827d9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzQuestionCategoryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzQuestionCategoryController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.wgz.controller; +package com.ruoyi.web.controller.wgz; import java.util.List; import java.util.Arrays; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzQuestionSaveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzQuestionSaveController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzQuestionSaveController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzQuestionSaveController.java index 6b7791a..22fbec6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzQuestionSaveController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzQuestionSaveController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.wgz.controller; +package com.ruoyi.web.controller.wgz; import java.util.List; import java.util.Arrays; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzQuestionsConfigurationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzQuestionsConfigurationController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzQuestionsConfigurationController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzQuestionsConfigurationController.java index 81992ab..a20c508 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzQuestionsConfigurationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzQuestionsConfigurationController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.wgz.controller; +package com.ruoyi.web.controller.wgz; import java.util.List; import java.util.Arrays; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzReissueacardController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzReissueacardController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzReissueacardController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzReissueacardController.java index 0d383da..44a48e4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzReissueacardController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzReissueacardController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.wgz.controller; +package com.ruoyi.web.controller.wgz; import java.util.List; import java.util.Arrays; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzScoreRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzScoreRecordController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzScoreRecordController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzScoreRecordController.java index a0c54c0..ec4a9ae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzScoreRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzScoreRecordController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.wgz.controller; +package com.ruoyi.web.controller.wgz; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzUserController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzUserController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzUserController.java index 6c7122e..ce6d410 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzUserController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.wgz.controller; +package com.ruoyi.web.controller.wgz; import java.util.List; import java.util.Arrays; diff --git a/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsUserServiceImpl.java index 2cda89c..1d30e20 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsUserServiceImpl.java @@ -142,14 +142,17 @@ public class FbsUserServiceImpl extends ServicePlusImpl companyService.save(company); FbsUser fbsUser = selectUserByUserId(SecurityUtils.getAppUserId()); fbsUser.setCompanyId(company.getId()); - fbsUser.setUsername(company.getCompanyName()); +// fbsUser.setUsername(company.getCompanyName()); updateById(fbsUser); return company.getId(); } @Override public FbsUser selectUserByUserId(Long userId) { - return baseMapper.selectOne(new LambdaQueryWrapper().eq(FbsUser::getUserId, userId)); + FbsUser fbsUser = baseMapper.selectOne(new LambdaQueryWrapper().eq(FbsUser::getUserId, userId)); + Company byId = companyService.getById(fbsUser.getCompanyId()); + fbsUser.setCompanyName(byId.getCompanyName()); + return fbsUser; } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProgressListDTO.java b/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProgressListDTO.java index fa035ee..cae3fa4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProgressListDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProgressListDTO.java @@ -5,8 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; - @Data @Accessors(chain = true) @ApiModel("总包方任务进度列表查询对象") @@ -19,6 +17,8 @@ public class ZbfProgressListDTO { private Integer pageNum; @ApiModelProperty("项目分包Id") - @NotNull(message = "项目分包Id不能为空") private Long subId; + + @ApiModelProperty("项目Id") + private Long projectId; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/vo/ZbfProjectSubcontractingApplyListVO.java b/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/vo/ZbfProjectSubcontractingApplyListVO.java index be47398..e40b354 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/vo/ZbfProjectSubcontractingApplyListVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/vo/ZbfProjectSubcontractingApplyListVO.java @@ -31,9 +31,12 @@ public class ZbfProjectSubcontractingApplyListVO { @ApiModelProperty("电话") private String phone; - @ApiModelProperty("电话") + @ApiModelProperty("头像") private String avatarName; + @ApiModelProperty("公司名字") + private String companyName; + @ApiModelProperty("申请状态（0申请中 1已同意 2已拒绝 3 已取消）") private String applyStatus; diff --git a/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/vo/ZbfProjectSubcontractingUpdateVO.java b/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/vo/ZbfProjectSubcontractingUpdateVO.java index 06c2b20..273de08 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/vo/ZbfProjectSubcontractingUpdateVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/vo/ZbfProjectSubcontractingUpdateVO.java @@ -36,4 +36,7 @@ public class ZbfProjectSubcontractingUpdateVO { @ApiModelProperty("备注") private String remark; + @ApiModelProperty("是否被申请") + private Boolean isApply; + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfProjectServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfProjectServiceImpl.java index f535d29..7725465 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfProjectServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfProjectServiceImpl.java @@ -512,13 +512,13 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl taskIds = taskList.stream().map(FbsProjectTask::getId).collect(Collectors.toList()); - if(CollectionUtil.isNotEmpty(taskIds)){ + if (CollectionUtil.isNotEmpty(taskIds)) { List progressByTaskIds = bgtProjectTaskProgressService.getProgressByTaskIds(taskIds); vo.setProgress(progressByTaskIds.stream().mapToInt(BgtProjectTaskProgress::getProgress).sum()); vo.setTotalProgress(taskList.size() * 100); } - if(vo.getTotalProgress() != 0){ + if (vo.getTotalProgress() != 0) { int i = new BigDecimal(vo.getProgress()).divide(new BigDecimal(vo.getTotalProgress()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)).intValue(); vo.setProgressCompute(i); } @@ -534,7 +534,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl taskIds = taskList.stream().map(FbsProjectTask::getId).collect(Collectors.toList()); - if(CollectionUtil.isNotEmpty(taskIds)){ + if (CollectionUtil.isNotEmpty(taskIds)) { TableDataInfo progressByTaskIds = bgtProjectTaskProgressService.getProgressByTaskIds(dto.getPageSize(), dto.getPageNum(), taskIds); fbsProgressListVOPage.setTotal(progressByTaskIds.getTotal()); fbsProgressListVOPage.setRecords(BeanUtil.copyToList(progressByTaskIds.getRows(), FbsProgressListVO.class)); @@ -549,7 +549,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl subIds = subList.stream().map(ZbfProjectSubcontracting::getId).collect(Collectors.toList()); + List subIds = subList.stream().map(ZbfProjectSubcontracting::getId).collect(Collectors.toList()); //总金额 BigDecimal totalAmount = subList.stream().map(ZbfProjectSubcontracting::getSubAmount).reduce(BigDecimal.ZERO, BigDecimal::add); @@ -557,8 +557,8 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl passList= fbsWageApplicationService.getPassListBySubIds(subIds); + if (CollectionUtil.isNotEmpty(subIds)) { + List passList = fbsWageApplicationService.getPassListBySubIds(subIds); BigDecimal receiveAmount = passList.stream().map(FbsWageApplication::getApplicantAmount).reduce(BigDecimal.ZERO, BigDecimal::add); vo.setReceiveAmount(receiveAmount); @@ -572,7 +572,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl payList = bgtWageApplicationService.getPassListByTaskIds(subIds); BigDecimal payAmount = payList.stream().map(BgtWageApplication::getApplicantAmount).reduce(BigDecimal.ZERO, BigDecimal::add); vo.setPayAmount(payAmount); @@ -588,7 +588,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl addList = new ArrayList<>(); for (ZbfProjectSubcontractingAddDTO sub : section.getSubList()) { - ZbfProjectSubcontracting projectSubcontracting = BeanUtil.copyProperties(sub, ZbfProjectSubcontracting.class,"id"); + ZbfProjectSubcontracting projectSubcontracting = BeanUtil.copyProperties(sub, ZbfProjectSubcontracting.class, "id"); projectSubcontracting.setProjectId(project.getId()); projectSubcontracting.setSectionId(projectSection.getId()); addList.add(projectSubcontracting); @@ -622,70 +622,81 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl sectionIds = applyList.stream().map(ZbfProjectSubcontractingApply::getSectionId).collect(Collectors.toSet()); Set subIds = applyList.stream().map(ZbfProjectSubcontractingApply::getSubId).collect(Collectors.toSet()); + //修改ID Set sectionUpdateIds = new HashSet<>(); + //新增ID Set sectionAddIds = new HashSet<>(); + //删除ID + Set sectionDeleteIds = new HashSet<>(); List projectSectionUpdateList = new ArrayList<>(); Set subUpdateIds = new HashSet<>(); + Set subAddIds = new HashSet<>(); + Set subDeleteIds = new HashSet<>(); List projectSubAddList = new ArrayList<>(); List projectSubUpdateList = new ArrayList<>(); for (ZbfProjectSectionAddDTO section : dto.getSectionList()) { ZbfProjectSection projectSection = BeanUtil.copyProperties(section, ZbfProjectSection.class); projectSection.setProjectId(dto.getId()); - if (section.getId() == null){ + if (section.getId() == null) { zbfProjectSectionService.save(projectSection); sectionAddIds.add(projectSection.getId()); - }else { + } else { projectSectionUpdateList.add(projectSection); sectionUpdateIds.add(section.getId()); } for (ZbfProjectSubcontractingAddDTO sub : section.getSubList()) { - ZbfProjectSubcontracting projectSubcontracting = BeanUtil.copyProperties(sub, ZbfProjectSubcontracting.class,"id"); + ZbfProjectSubcontracting projectSubcontracting = BeanUtil.copyProperties(sub, ZbfProjectSubcontracting.class, "id"); projectSubcontracting.setProjectId(dto.getId()); projectSubcontracting.setSectionId(projectSection.getId()); - if(sub.getId() == null){ + if (sub.getId() == null) { projectSubAddList.add(projectSubcontracting); - }else { + } else { projectSubUpdateList.add(projectSubcontracting); subUpdateIds.add(sub.getId()); } } } - if(!sectionUpdateIds.containsAll(sectionIds)){ + if (!sectionUpdateIds.containsAll(sectionIds)) { throw new BaseException("不能删除包含存在申请的分包的标段"); } - if(!subUpdateIds.containsAll(subIds)){ + if (!subUpdateIds.containsAll(subIds)) { throw new BaseException("不能删除存在申请的分包"); } //更新项目 ZbfProject project = BeanUtil.copyProperties(dto, ZbfProject.class); boolean update = updateById(project); //更新标段 - if(CollectionUtil.isNotEmpty(projectSectionUpdateList)){ + if (CollectionUtil.isNotEmpty(projectSectionUpdateList)) { zbfProjectSectionService.updateBatchById(projectSectionUpdateList); } //更新分包 - if(CollectionUtil.isNotEmpty(projectSubUpdateList)){ + if (CollectionUtil.isNotEmpty(projectSubUpdateList)) { zbfProjectSubcontractingService.updateBatchById(projectSubUpdateList); } //新增分包 - if(CollectionUtil.isNotEmpty(projectSubAddList)){ + if (CollectionUtil.isNotEmpty(projectSubAddList)) { zbfProjectSubcontractingService.saveBatch(projectSubAddList); - Set subAddIds = projectSubAddList.stream().map(ZbfProjectSubcontracting::getId).collect(Collectors.toSet()); + subAddIds = projectSubAddList.stream().map(ZbfProjectSubcontracting::getId).collect(Collectors.toSet()); subUpdateIds.addAll(subAddIds); } //删除标段 + sectionDeleteIds.addAll(sectionUpdateIds); + sectionDeleteIds.addAll(sectionAddIds); zbfProjectSectionService.remove(Wrappers.lambdaQuery() .eq(ZbfProjectSection::getProjectId, dto.getId()) - .notIn(ZbfProjectSection::getId, sectionUpdateIds.addAll(sectionAddIds)) + .notIn(CollectionUtil.isNotEmpty(sectionDeleteIds), ZbfProjectSection::getId, sectionUpdateIds) ); + //删除分包 + subDeleteIds.addAll(subUpdateIds); + subDeleteIds.addAll(subAddIds); zbfProjectSubcontractingService.remove(Wrappers.lambdaQuery() .eq(ZbfProjectSubcontracting::getProjectId, dto.getId()) - .notIn(ZbfProjectSubcontracting::getId, subUpdateIds) + .notIn(CollectionUtil.isNotEmpty(subDeleteIds), ZbfProjectSubcontracting::getId, subUpdateIds) ); return update; @@ -705,8 +716,15 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl subList = zbfProjectSubcontractingService.list(Wrappers.lambdaQuery() .eq(ZbfProjectSubcontracting::getSectionId, zbfProjectSection.getId())); - List zbfProjectSubcontractingListVOS = BeanUtil.copyToList(subList, ZbfProjectSubcontractingUpdateVO.class); + List zbfProjectSubcontractingListVOS = new ArrayList<>(); + for (ZbfProjectSubcontracting sub : subList) { + ZbfProjectSubcontractingUpdateVO zbfProjectSubcontractingUpdateVO = BeanUtil.copyProperties(sub, ZbfProjectSubcontractingUpdateVO.class); + int count = zbfProjectSubcontractingApplyService.count(Wrappers.lambdaQuery() + .eq(ZbfProjectSubcontractingApply::getSubId, sub.getId())); + zbfProjectSubcontractingUpdateVO.setIsApply(count > 0); + zbfProjectSubcontractingListVOS.add(zbfProjectSubcontractingUpdateVO); + } ZbfProjectSectionUpdateVO zbfProjectSectionUpdateVO = new ZbfProjectSectionUpdateVO(); BeanUtil.copyProperties(zbfProjectSection, zbfProjectSectionUpdateVO); zbfProjectSectionUpdateVO.setSubList(zbfProjectSubcontractingListVOS); @@ -719,7 +737,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl queryZbfList(ZbfProjectListDTO dto) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ZbfProject::getUserId, SecurityUtils.getAppUserId()); wrapper.like(StrUtil.isNotBlank(dto.getProjectName()), ZbfProject::getProjectName, dto.getProjectName()); wrapper.orderByDesc(ZbfProject::getId); @@ -727,7 +745,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl result = page(PageUtils.buildPage(), wrapper); List zbfProjectListVOS = BeanUtil.copyToList(result.getRecords(), ZbfProjectListVO.class); - for (ZbfProjectListVO zbfProjectListVO : zbfProjectListVOS){ + for (ZbfProjectListVO zbfProjectListVO : zbfProjectListVOS) { //标段处理 List sectionListVO = new ArrayList<>(); //查询项目下的所有标段 @@ -759,7 +777,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl wrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ZbfProject::getUserId, SecurityUtils.getAppUserId()); List list = list(wrapper); zbfProjectCountVO.setAllCount(list.size()); @@ -772,7 +790,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl conciseList(ZbfProjectListDTO dto) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ZbfProject::getUserId, SecurityUtils.getAppUserId()); wrapper.like(StrUtil.isNotBlank(dto.getProjectName()), ZbfProject::getProjectName, dto.getProjectName()); wrapper.eq(StrUtil.isNotBlank(dto.getProjectStatus()), ZbfProject::getProjectStatus, dto.getProjectStatus()); @@ -821,7 +839,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl taskIds = list.stream().map(FbsProjectTask::getId).collect(Collectors.toList()); zbfPersonCountVO.setWgzCount(0); - if(CollectionUtil.isNotEmpty(taskIds)){ + if (CollectionUtil.isNotEmpty(taskIds)) { //任务下的招工 List recruitApplyList = bgtProjectRecruitApplyService.list(Wrappers.lambdaQuery() .in(BgtProjectRecruitApply::getTaskId, taskIds) @@ -829,7 +847,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl zbfDayAttendanceCountVOS = wgzAttendanceService.countDayByProjectId(id, previousDate, now); - List countList = DataUtil.zbfFillMissingDates(zbfDayAttendanceCountVOS, previousDate, now); + List countList = DataUtil.zbfFillMissingDates(zbfDayAttendanceCountVOS, previousDate, now); ZbfDayAttendanceCountVO zbfDayAttendanceCountVO = countList.get(countList.size() - 1); vo.setReportToDutyNum(zbfDayAttendanceCountVO.getReportToDutyNum()); vo.setCountList(countList); Integer total = wgzAttendanceService.dayTotalNumByProjectId(id, now); vo.setTotalCount(total); vo.setRate(0); - if(total!=null && total>0){ + if (total != null && total > 0) { int rate = new BigDecimal(vo.getReportToDutyNum()).divide(new BigDecimal(total), 2, RoundingMode.HALF_UP) .multiply(new BigDecimal(100)).intValue(); vo.setRate(rate); @@ -862,7 +880,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl taskIds = taskList.stream().map(FbsProjectTask::getId).collect(Collectors.toList()); - if(CollectionUtil.isNotEmpty(taskIds)){ + if (CollectionUtil.isNotEmpty(taskIds)) { List progressByTaskIds = bgtProjectTaskProgressService.getProgressByTaskIds(taskIds); vo.setProgress(progressByTaskIds.stream().mapToInt(BgtProjectTaskProgress::getProgress).sum()); @@ -876,10 +894,10 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl voPage = new Page<>(); //查询所有创建的任务 List taskList = fbsProjectTaskService.list(Wrappers.lambdaQuery() - .eq(FbsProjectTask::getProjectId, dto) + .eq(FbsProjectTask::getProjectId, dto.getProjectId()) ); List taskIds = taskList.stream().map(FbsProjectTask::getId).collect(Collectors.toList()); - if(CollectionUtil.isNotEmpty(taskIds)){ + if (CollectionUtil.isNotEmpty(taskIds)) { TableDataInfo progressByTaskIds = bgtProjectTaskProgressService.getProgressByTaskIds(dto.getPageSize(), dto.getPageNum(), taskIds); voPage.setTotal(progressByTaskIds.getTotal()); voPage.setRecords(BeanUtil.copyToList(progressByTaskIds.getRows(), ZbfProgressListVO.class)); @@ -893,7 +911,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl subList = zbfProjectSubcontractingService.list(Wrappers.lambdaQuery() .eq(ZbfProjectSubcontracting::getProjectId, projectId) ); - List subIds = subList.stream().map(ZbfProjectSubcontracting::getId).collect(Collectors.toList()); + List subIds = subList.stream().map(ZbfProjectSubcontracting::getId).collect(Collectors.toList()); //总金额 BigDecimal totalAmount = subList.stream().map(ZbfProjectSubcontracting::getSubAmount).reduce(BigDecimal.ZERO, BigDecimal::add); @@ -902,8 +920,8 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl passList= fbsWageApplicationService.getPassListBySubIds(subIds); + if (CollectionUtil.isNotEmpty(subIds)) { + List passList = fbsWageApplicationService.getPassListBySubIds(subIds); BigDecimal payAmount = passList.stream().map(FbsWageApplication::getApplicantAmount).reduce(BigDecimal.ZERO, BigDecimal::add); vo.setPayAmount(payAmount); @@ -912,10 +930,10 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl taskIds = taskList.stream().map(FbsProjectTask::getId).collect(Collectors.toList()); - if(CollectionUtil.isNotEmpty(taskIds)){ + if (CollectionUtil.isNotEmpty(taskIds)) { List passListByTaskIds = wgzPayCalculationService.getPassListByTaskIds(taskIds); - for (WgzPayCalculation wgzPayCalculation : passListByTaskIds){ + for (WgzPayCalculation wgzPayCalculation : passListByTaskIds) { BigDecimal multiply = wgzPayCalculation.getRecruitAmount().multiply(new BigDecimal(wgzPayCalculation.getNum())); wgzAmount = wgzAmount.add(multiply); } @@ -928,7 +946,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl zbfSwitchList(ZbfProjectSwitchListDTO dto) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ZbfProject::getUserId, SecurityUtils.getAppUserId()); wrapper.like(StrUtil.isNotBlank(dto.getProjectName()), ZbfProject::getProjectName, dto.getProjectName()); Page result = page(PageUtils.buildPage(), wrapper); diff --git a/ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfUserServiceImpl.java index c980e25..d7ff0c4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfUserServiceImpl.java @@ -144,7 +144,7 @@ public class ZbfUserServiceImpl extends ServicePlusImpl companyService.save(company); ZbfUser zbfUser = selectUserByUserId(SecurityUtils.getAppUserId()); zbfUser.setCompanyId(company.getId()); - zbfUser.setUsername(company.getCompanyName()); +// zbfUser.setUsername(company.getCompanyName()); updateById(zbfUser); return company.getId(); } diff --git a/ruoyi-system/src/main/resources/mapper/zbf/ZbfProjectSubcontractingApplyMapper.xml b/ruoyi-system/src/main/resources/mapper/zbf/ZbfProjectSubcontractingApplyMapper.xml index 3ab583d..1079194 100644 --- a/ruoyi-system/src/main/resources/mapper/zbf/ZbfProjectSubcontractingApplyMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/zbf/ZbfProjectSubcontractingApplyMapper.xml @@ -28,8 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" zpsa.apply_status, fu.username, fu.phone, - fu.avatar_name - from zbf_project_subcontracting_apply zpsa left join fbs_user fu on zpsa.fbs_user_id = fu.user_id + fu.avatar_name, + cc.company_name + from zbf_project_subcontracting_apply zpsa + left join fbs_user fu on zpsa.fbs_user_id = fu.user_id + left join common_company cc on fu.company_id = cc.id where zpsa.sub_id = #{dto.subId} and fu.username like concat('%', #{dto.username}, '%')