优化

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsUserServiceImpl.java

@@ -142,14 +142,17 @@ public class FbsUserServiceImpl extends ServicePlusImpl<FbsUserMapper, FbsUser>
 		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<FbsUser>().eq(FbsUser::getUserId, userId));
+		FbsUser fbsUser = baseMapper.selectOne(new LambdaQueryWrapper<FbsUser>().eq(FbsUser::getUserId, userId));
+		Company byId = companyService.getById(fbsUser.getCompanyId());
+		fbsUser.setCompanyName(byId.getCompanyName());
+		return fbsUser;
 	}
 
 	@Override

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;
 }

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;
 

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;
+
 }

ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfProjectServiceImpl.java

@@ -622,11 +622,17 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
 		Set<Long> sectionIds = applyList.stream().map(ZbfProjectSubcontractingApply::getSectionId).collect(Collectors.toSet());
 		Set<Long> subIds = applyList.stream().map(ZbfProjectSubcontractingApply::getSubId).collect(Collectors.toSet());
 
+		//修改ID
 		Set<Long> sectionUpdateIds = new HashSet<>();
+		//新增ID
 		Set<Long> sectionAddIds = new HashSet<>();
+		//删除ID
+		Set<Long> sectionDeleteIds = new HashSet<>();
 		List<ZbfProjectSection> projectSectionUpdateList = new ArrayList<>();
 
 		Set<Long> subUpdateIds = new HashSet<>();
+		Set<Long> subAddIds = new HashSet<>();
+		Set<Long> subDeleteIds = new HashSet<>();
 		List<ZbfProjectSubcontracting> projectSubAddList = new ArrayList<>();
 		List<ZbfProjectSubcontracting> projectSubUpdateList = new ArrayList<>();
 
@@ -673,19 +679,24 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
 		//新增分包
 		if (CollectionUtil.isNotEmpty(projectSubAddList)) {
 			zbfProjectSubcontractingService.saveBatch(projectSubAddList);
-			Set<Long> 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.<ZbfProjectSection>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.<ZbfProjectSubcontracting>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<ZbfProjectMapper, Zbf
 			//查询标段下的所有的分包
 			List<ZbfProjectSubcontracting> subList = zbfProjectSubcontractingService.list(Wrappers.<ZbfProjectSubcontracting>lambdaQuery()
 				.eq(ZbfProjectSubcontracting::getSectionId, zbfProjectSection.getId()));
-			List<ZbfProjectSubcontractingUpdateVO> zbfProjectSubcontractingListVOS = BeanUtil.copyToList(subList, ZbfProjectSubcontractingUpdateVO.class);
+			List<ZbfProjectSubcontractingUpdateVO> zbfProjectSubcontractingListVOS = new ArrayList<>();
+			for (ZbfProjectSubcontracting sub : subList) {
 
+				ZbfProjectSubcontractingUpdateVO zbfProjectSubcontractingUpdateVO = BeanUtil.copyProperties(sub, ZbfProjectSubcontractingUpdateVO.class);
+				int count = zbfProjectSubcontractingApplyService.count(Wrappers.<ZbfProjectSubcontractingApply>lambdaQuery()
+					.eq(ZbfProjectSubcontractingApply::getSubId, sub.getId()));
+				zbfProjectSubcontractingUpdateVO.setIsApply(count > 0);
+				zbfProjectSubcontractingListVOS.add(zbfProjectSubcontractingUpdateVO);
+ 			}
 			ZbfProjectSectionUpdateVO zbfProjectSectionUpdateVO = new ZbfProjectSectionUpdateVO();
 			BeanUtil.copyProperties(zbfProjectSection, zbfProjectSectionUpdateVO);
 			zbfProjectSectionUpdateVO.setSubList(zbfProjectSubcontractingListVOS);
@@ -876,7 +894,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
 		Page<ZbfProgressListVO> voPage = new Page<>();
 		//查询所有创建的任务
 		List<FbsProjectTask> taskList = fbsProjectTaskService.list(Wrappers.<FbsProjectTask>lambdaQuery()
-			.eq(FbsProjectTask::getProjectId, dto)
+			.eq(FbsProjectTask::getProjectId, dto.getProjectId())
 		);
 		List<Long> taskIds = taskList.stream().map(FbsProjectTask::getId).collect(Collectors.toList());
 		if (CollectionUtil.isNotEmpty(taskIds)) {

ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfUserServiceImpl.java

@@ -144,7 +144,7 @@ public class ZbfUserServiceImpl extends ServicePlusImpl<ZbfUserMapper, ZbfUser>
 		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();
 	}

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
+               fu.avatar_name,
-        from zbf_project_subcontracting_apply zpsa left join fbs_user fu on zpsa.fbs_user_id = fu.user_id
+               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}
         <if test="dto.username != null and dto.username != ''">
             and fu.username like concat('%', #{dto.username}, '%')