优化

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zbf/AppZbfProjectController.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.fbs.domain.FbsWageApplication;
 import com.ruoyi.fbs.service.IFbsWageApplicationService;
+import com.ruoyi.wgz.service.IWgzAttendanceService;
 import com.ruoyi.zbf.domain.ZbfProject;
 import com.ruoyi.zbf.domain.dto.*;
 import com.ruoyi.zbf.domain.vo.*;
@@ -20,6 +21,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * 总包方项目Controller
@@ -35,7 +37,7 @@ public class AppZbfProjectController extends BaseController {
 
     private final IZbfProjectService iZbfProjectService;
 	private final IFbsWageApplicationService iFbsWageApplicationService;
-
+	private final IWgzAttendanceService attendanceService;
 
     @ApiOperation("总包方新增项目")
     @Log(title = "总包方新增项目", businessType = BusinessType.INSERT)
@@ -59,7 +61,6 @@ public class AppZbfProjectController extends BaseController {
 		return AjaxResult.success(iZbfProjectService.zbfEditInfo(projectId));
 	}
 
-
 	@ApiOperation("总包方查询我的项目列表")
 	@GetMapping("/list")
 	public TableDataInfo<ZbfProjectListVO> list(@Validated ZbfProjectListDTO dto) {
@@ -78,7 +79,6 @@ public class AppZbfProjectController extends BaseController {
 		return iZbfProjectService.conciseList(dto);
 	}
 
-
 	@ApiOperation("总包方项目详情-项目信息")
 	@GetMapping("/{projectId}")
 	public AjaxResult<ZbfProjectDetailVO> zbfInfo(@NotNull(message = "主键不能为空")
@@ -141,9 +141,16 @@ public class AppZbfProjectController extends BaseController {
 	}
 
 
+	@ApiOperation("总包方项目详情-考勤情况-查看更多")
+	@GetMapping("/allCount")
+	public AjaxResult<ZbfAttendanceVO> allCount(@Validated ZbfAttendanceDTO dto) {
+		return AjaxResult.success(attendanceService.zbfAllCount(dto));
+	}
 
-
-
-
+	@ApiOperation("总包方项目详情-考勤情况-查看更多")
+	@GetMapping("/histogram")
+	public AjaxResult<List<ZbfDayAttendanceCountVO>> histogram(@Validated ZbfAttendanceDTO dto) {
+		return AjaxResult.success(attendanceService.zbfHistogram(dto));
+	}
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zbf/AppZbfProjectSubcontractingApplyController.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.zbf.domain.ZbfProjectSubcontractingApply;
 import com.ruoyi.zbf.domain.dto.ZbfProjectSubApplyListDTO;
 import com.ruoyi.zbf.domain.vo.ZbfProjectSubcontractingApplyListVO;
 import com.ruoyi.zbf.service.IZbfProjectSubcontractingApplyService;
@@ -42,9 +43,17 @@ public class AppZbfProjectSubcontractingApplyController extends BaseController {
     }
 
 	@ApiOperation("总包方项目分包详情-分包商申请列表")
-	@GetMapping("/fbsList/{subId}")
+	@GetMapping("/fbsList")
 	public TableDataInfo<ZbfProjectSubcontractingApplyListVO> getFbsList(ZbfProjectSubApplyListDTO dto) {
 		return iZbfProjectSubcontractingApplyService.getFbsList(dto);
 	}
 
+	@ApiOperation("总包方消息-分包商申请列表")
+	@GetMapping("/message/fbsList")
+	public TableDataInfo<ZbfProjectSubcontractingApplyListVO> getFbsListByApplyId(ZbfProjectSubApplyListDTO dto) {
+		ZbfProjectSubcontractingApply byId = iZbfProjectSubcontractingApplyService.getById(dto.getSubApplyId());
+		dto.setSubId(byId.getSubId());
+		return iZbfProjectSubcontractingApplyService.getFbsList(dto);
+	}
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zbf/AppZbfProjectSubcontractingController.java

@@ -9,11 +9,13 @@ import com.ruoyi.fbs.domain.FbsWageApplication;
 import com.ruoyi.fbs.service.IFbsUserService;
 import com.ruoyi.fbs.service.IFbsWageApplicationService;
 import com.ruoyi.zbf.domain.ZbfProjectSubcontracting;
+import com.ruoyi.zbf.domain.ZbfProjectSubcontractingApply;
 import com.ruoyi.zbf.domain.dto.ZbfProgressListDTO;
 import com.ruoyi.zbf.domain.dto.ZbfSubBgtListDTO;
 import com.ruoyi.zbf.domain.dto.ZbfWageApplicationListDTO;
 import com.ruoyi.zbf.domain.vo.*;
 import com.ruoyi.zbf.service.IZbfProjectSectionService;
+import com.ruoyi.zbf.service.IZbfProjectSubcontractingApplyService;
 import com.ruoyi.zbf.service.IZbfProjectSubcontractingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -43,6 +45,7 @@ public class AppZbfProjectSubcontractingController extends BaseController {
 	private final IZbfProjectSectionService iZbfProjectSectionService;
 	private final IFbsUserService iFbsUserService;
 	private final IFbsWageApplicationService iFbsWageApplicationService;
+	private final IZbfProjectSubcontractingApplyService iZbfProjectSubcontractingApplyService;
 
 	@ApiOperation("总包方项目分包详情-分包信息")
 	@GetMapping("/{id}")
@@ -101,7 +104,16 @@ public class AppZbfProjectSubcontractingController extends BaseController {
 	}
 
 
-
+	@ApiOperation("总包方消息-分包信息")
+	@GetMapping("/message/{id}")
+	public AjaxResult<ZbfProjectSubcontractingDetailVO> getInfoByApplyId(@NotNull(message = "主键不能为空")
+																@PathVariable("id") Long id) {
+		ZbfProjectSubcontractingApply subcontractingApply = iZbfProjectSubcontractingApplyService.queryById(id);
+		ZbfProjectSubcontracting zbfProjectSubcontracting = iZbfProjectSubcontractingService.queryById(subcontractingApply.getSubId());
+		ZbfProjectSubcontractingDetailVO vo = BeanUtil.copyProperties(zbfProjectSubcontracting, ZbfProjectSubcontractingDetailVO.class);
+		vo.setSectionName(iZbfProjectSectionService.getById(vo.getSectionId()).getSectionName());
+		return AjaxResult.success(vo);
+	}
 
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zbf/AppZbfProjectTaskController.java

@@ -110,6 +110,13 @@ public class AppZbfProjectTaskController extends BaseController {
 		return iBgtWageApplicationService.taskWageList(dto);
 	}
 
+	@ApiOperation("总包方查询任务详情-工资结算审批列表-详情")
+	@GetMapping("/wageInfo/{id}")
+	public AjaxResult<BgtWageApplication> bgtWageInfo(@NotNull(message = "主键不能为空")
+														  @PathVariable("id") Long id) {
+		return AjaxResult.success(iBgtWageApplicationService.getById(id));
+	}
+
 	@ApiOperation("总包方查询任务详情-单个-务工人员数量")
 	@GetMapping("/wgzList")
 	public TableDataInfo<BgtProjectRecruitApplyVO> taskWgzList(@Validated FbsProjectTaskUserDTO dto) {
@@ -134,12 +141,6 @@ public class AppZbfProjectTaskController extends BaseController {
 		return iBgtProjectRecruitApplyService.taskWgzListAll(dto);
 	}
 
-//	@ApiOperation("分包商查询任务详情-任务切换列表")
-//	@GetMapping("/switchList")
-//	public TableDataInfo<FbsProjectTaskListVO> switchList(FbsTaskSwitchListDTO dto) {
-//		return iFbsProjectTaskService.switchList(dto);
-//	}
-
 	@ApiOperation("总包方查询包工头信息(点头像)")
 	@GetMapping("/bgt/{userId}")
 	public AjaxResult<BgtUser> bgt(@NotNull(message = "主键不能为空")