招工列表

ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectRecruitApplyController.java

@@ -34,7 +34,7 @@ public class AppBgtProjectRecruitApplyController extends BaseController {
 
 
 
-	@ApiOperation("查询包工头招工申请列表")
+	@ApiOperation("App查询包工头招工申请列表")
 	@GetMapping("/list")
 	public List<BgtProjectRecruitApplyVO> list(@Validated BgtProjectRecruitApplyQueryDTO dto) {
 		return iBgtProjectRecruitApplyService.appQueryList(dto);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectRecruitController.java

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.bgt;
 
 import com.ruoyi.bgt.bo.BgtProjectRecruitQueryBo;
 import com.ruoyi.bgt.domain.BgtProjectRecruit;
+import com.ruoyi.bgt.domain.dto.BgtProjectRecruitQueryDTO;
+import com.ruoyi.bgt.domain.vo.BgtProjectRecruitVO;
 import com.ruoyi.bgt.service.IBgtProjectRecruitService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -42,8 +44,8 @@ public class AppBgtProjectRecruitController extends BaseController {
      */
     @ApiOperation("App我的招工")
     @GetMapping("/list")
-    public TableDataInfo<BgtProjectRecruit> list(@Validated BgtProjectRecruitQueryBo bo) {
+    public TableDataInfo<BgtProjectRecruitVO> list(@Validated BgtProjectRecruitQueryDTO dto) {
-        return iBgtProjectRecruitService.queryPageList(bo);
+        return iBgtProjectRecruitService.appQueryPageList(dto);
     }
 
 	@ApiOperation("App申请者列表")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtUserController.java

@@ -40,10 +40,6 @@ public class AppBgtUserController extends BaseController {
 	}
 
 
-
-	/**
-	 * 实名认证
-	 */
 	@ApiOperation("个人信息")
 	@RepeatSubmit
 	@GetMapping("/{id}")

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java

@@ -96,6 +96,9 @@ public class BgtProjectRecruit implements Serializable {
     @ApiModelProperty("招工要求")
     private String recruitRequirement;
 
+	@ApiModelProperty("创建者ID")
+	private Long userId;
+
     /** 删除标志（0代表存在 2代表删除） */
     @Excel(name = "删除标志" , readConverterExp = "0=代表存在,2=代表删除")
     @ApiModelProperty("删除标志（0代表存在 2代表删除）")

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtProjectRecruitApplyQueryDTO.java

@@ -1,12 +1,20 @@
 package com.ruoyi.bgt.domain.dto;
 
 import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("包工头招工申请列表查询对象")
 public class BgtProjectRecruitApplyQueryDTO extends BaseEntity {
 
 	@ApiModelProperty("招工ID")
 	private Long recruitId;
+
+	public BgtProjectRecruitApplyQueryDTO(Long recruitId) {
+		this.recruitId = recruitId;
+	}
 }

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtProjectRecruitQueryDTO.java

@@ -0,0 +1,73 @@
+package com.ruoyi.bgt.domain.dto;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 包工头招工分页查询对象 bgt_project_recruit
+ *
+ * @author ruoyi
+ * @date 2025-02-17
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("包工头招工分页查询对象")
+public class BgtProjectRecruitQueryDTO extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+
+	@ApiModelProperty("创建者Id")
+	private Long userId;
+
+	@ApiModelProperty("招工名称")
+	private String recruitName;
+
+//	/** 项目ID */
+//	@ApiModelProperty("项目ID")
+//	private Long projectId;
+//	/** 标段ID */
+//	@ApiModelProperty("标段ID")
+//	private Long sectionId;
+//	/** 分包ID */
+//	@ApiModelProperty("分包ID")
+//	private Long subId;
+//	/** 任务ID */
+//	@ApiModelProperty("任务ID")
+//	private Long taskId;
+//	/** 招工名称 */
+
+//	/** 招工地址 */
+//	@ApiModelProperty("招工地址")
+//	private String recruitAddress;
+//	/** 招工金额 */
+//	@ApiModelProperty("招工金额")
+//	private Long recruitAmount;
+//	/** 招工数量 */
+//	@ApiModelProperty("招工数量")
+//	private Long recruitStaffNum;
+//	/** 招工开始时间 */
+//	@ApiModelProperty("招工开始时间")
+//	private String recruitBeginTime;
+//	/** 联系人 */
+//	@ApiModelProperty("联系人")
+//	private String recruitContactPerson;
+//	/** 联系电话 */
+//	@ApiModelProperty("联系电话")
+//	private String recruitContactPhone;
+//	/** 招工描述 */
+//	@ApiModelProperty("招工描述")
+//	private String subDescribe;
+//	/** 招工要求 */
+//	@ApiModelProperty("招工要求")
+//	private String recruitRequirement;
+
+}

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtProjectRecruitVO.java

@@ -9,6 +9,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 包工头招工对象 bgt_project_recruit
@@ -28,6 +29,9 @@ public class BgtProjectRecruitVO implements Serializable {
     @ApiModelProperty("主键ID")
     private Long id;
 
+	@ApiModelProperty("任务名称")
+	private String taskName;
+
     @ApiModelProperty("招工名称")
     private String recruitName;
 
@@ -47,5 +51,7 @@ public class BgtProjectRecruitVO implements Serializable {
 	@JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime createTime;
 
+	@ApiModelProperty("申请者列表")
+	List<BgtProjectRecruitApplyVO> applylist;
 
 }

ruoyi-system/src/main/java/com/ruoyi/bgt/mapper/BgtProjectRecruitMapper.java

@@ -1,9 +1,13 @@
 package com.ruoyi.bgt.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.bgt.domain.BgtProjectRecruit;
-import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.bgt.domain.dto.BgtProjectRecruitQueryDTO;
+import com.ruoyi.bgt.domain.vo.BgtProjectRecruitVO;
 import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
 import org.apache.ibatis.annotations.CacheNamespace;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 包工头招工Mapper接口
@@ -15,4 +19,5 @@ import org.apache.ibatis.annotations.CacheNamespace;
 @CacheNamespace(implementation = MybatisPlusRedisCache.class, eviction = MybatisPlusRedisCache.class)
 public interface BgtProjectRecruitMapper extends BaseMapperPlus<BgtProjectRecruit> {
 
+	Page<BgtProjectRecruitVO> appQueryPageList(@Param("page") Page<BgtProjectRecruitQueryDTO> page, @Param("dto") BgtProjectRecruitQueryDTO dto);
 }

ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtProjectRecruitService.java

@@ -1,7 +1,9 @@
 package com.ruoyi.bgt.service;
 
-import com.ruoyi.bgt.domain.BgtProjectRecruit;
 import com.ruoyi.bgt.bo.BgtProjectRecruitQueryBo;
+import com.ruoyi.bgt.domain.BgtProjectRecruit;
+import com.ruoyi.bgt.domain.dto.BgtProjectRecruitQueryDTO;
+import com.ruoyi.bgt.domain.vo.BgtProjectRecruitVO;
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -52,4 +54,9 @@ public interface IBgtProjectRecruitService extends IServicePlus<BgtProjectRecrui
      * @return
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	/**
+	 * 查询列表
+	 */
+	TableDataInfo<BgtProjectRecruitVO> appQueryPageList(BgtProjectRecruitQueryDTO dto);
 }

ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitServiceImpl.java

@@ -7,11 +7,16 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.bgt.bo.BgtProjectRecruitQueryBo;
 import com.ruoyi.bgt.domain.BgtProjectRecruit;
+import com.ruoyi.bgt.domain.dto.BgtProjectRecruitApplyQueryDTO;
+import com.ruoyi.bgt.domain.dto.BgtProjectRecruitQueryDTO;
+import com.ruoyi.bgt.domain.vo.BgtProjectRecruitVO;
 import com.ruoyi.bgt.mapper.BgtProjectRecruitMapper;
+import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService;
 import com.ruoyi.bgt.service.IBgtProjectRecruitService;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.PageUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -27,6 +32,10 @@ import java.util.Map;
 @Service
 public class BgtProjectRecruitServiceImpl extends ServicePlusImpl<BgtProjectRecruitMapper, BgtProjectRecruit> implements IBgtProjectRecruitService {
 
+	@Autowired
+	private IBgtProjectRecruitApplyService bgtProjectRecruitApplyService;
+
+
     @Override
     public BgtProjectRecruit queryById(Long id){
         return getById(id);
@@ -92,4 +101,16 @@ public class BgtProjectRecruitServiceImpl extends ServicePlusImpl<BgtProjectRecr
         }
         return removeByIds(ids);
     }
+
+	@Override
+	public TableDataInfo<BgtProjectRecruitVO> appQueryPageList(BgtProjectRecruitQueryDTO dto) {
+		Page<BgtProjectRecruitQueryDTO> queryDTOPage = new Page<>();
+		queryDTOPage.setCurrent(dto.getPageNum());
+		queryDTOPage.setSize(dto.getPageSize());
+		Page<BgtProjectRecruitVO> queryVOPage = baseMapper.appQueryPageList(queryDTOPage, dto);
+		for(BgtProjectRecruitVO vo : queryVOPage.getRecords()) {
+			vo.setApplylist(bgtProjectRecruitApplyService.appQueryList(new BgtProjectRecruitApplyQueryDTO(vo.getId())));
+		}
+		return PageUtils.buildDataInfo(queryVOPage);
+	}
 }

ruoyi-system/src/main/java/com/ruoyi/fbs/domain/FbsProjectTask.java

@@ -105,6 +105,9 @@ public class FbsProjectTask implements Serializable {
 	@ApiModelProperty("任务状态（1进行中 2已完成）")
 	private String status;
 
+	@ApiModelProperty("创建者ID")
+	private Long createId;
+
     /** 删除标志（0代表存在 2代表删除） */
     @Excel(name = "删除标志" , readConverterExp = "0=代表存在,2=代表删除")
     @ApiModelProperty("删除标志（0代表存在 2代表删除）")

ruoyi-system/src/main/java/com/ruoyi/zbf/domain/ZbfProject.java

@@ -32,8 +32,8 @@ public class ZbfProject implements Serializable {
     private Long id;
 
     /** 唯一标识 */
-    @Excel(name = "唯一标识")
+    @Excel(name = "创建者ID")
-    @ApiModelProperty("唯一标识")
+    @ApiModelProperty("创建者ID")
     private Long userId;
 
     /** 单位名称 */

ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitMapper.xml

@@ -27,5 +27,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark" column="remark"/>
     </resultMap>
 
+    <select id="appQueryPageList" resultType="com.ruoyi.bgt.domain.vo.BgtProjectRecruitVO">
+        select bpr.id,bpr.recruit_name,bpr.recruit_address,bpr.recruit_amount,bpr.recruit_staff_num,bpr.recruit_requirement,bpr.create_time,fpt.task_name
+        from bgt_project_recruit bpr left join fbs_project_task  fpt on bpr.task_id = fpt.id
+        <where>
+            <if test="dto.user_id != null ">
+               and bpr.user_id = #{dto.userId}
+            </if>
+            <if test="dto.recruitName != null  and dto.recruitName != ''">
+               and bpr.recruit_name like concat('%', #{dto.recruitName}, '%')
+            </if>
+        </where>
+    </select>
 
 </mapper>