修改：招工列表、申请报名

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppDailyClockReq.java

@@ -0,0 +1,41 @@
+package com.ruoyi.wgz.bo.req;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("日报打卡请求对象")
+public class WgzAppDailyClockReq implements Serializable {
+
+	@ApiModelProperty("今日完成工作")
+	private String finishToday;
+
+	@ApiModelProperty("未完成工作")
+	private String unfinished;
+
+	@ApiModelProperty("明日工作")
+	private String workTomorrow;
+
+	@ApiModelProperty("协调与帮助")
+	private String coordinate;
+
+	@ApiModelProperty("附件，多个逗号分隔")
+	private String attachment;
+
+	@ApiModelProperty("日报位置")
+	private String pnchOsition;
+
+}

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppGetMessageListReq.java

@@ -14,12 +14,10 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @ApiModel("获取消息列表请求参数")
 public class WgzAppGetMessageListReq extends PageReq {
-	@ApiModelProperty("接收人")
-	@Hidden
+	@ApiModelProperty(value = "接收人",hidden = true)
 	private Long recipientId;
 
 	@ApiModelProperty("0 全部 1报名 2工资 3其他")
-	@Hidden
 	private String largeType;
 
 	@ApiModelProperty("largeType为3填写 (0补卡 1系统)")

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppJobListingReq.java

@@ -1,5 +1,6 @@
 package com.ruoyi.wgz.bo.req;
 
+import com.ruoyi.common.bo.PageReq;
 import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,17 +11,5 @@ import java.io.Serializable;
 
 @Data
 @ApiModel("首页-招工列表请求对象")
-public class WgzAppJobListingReq implements Serializable {
-	/** 分页大小 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/** 当前页数 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-
-	@ApiModelProperty("创建者Id")
-	private Long userId;
-
-	@ApiModelProperty("招工名称")
-	private String recruitName;
+public class WgzAppJobListingReq extends PageReq {
 }

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUnderwayReq.java

@@ -17,11 +17,10 @@ import java.time.LocalDateTime;
 @Accessors(chain = true)
 @ApiModel("项目进行中请求对象")
 public class WgzAppUnderwayReq extends PageReq {
-	@ApiModelProperty("招工ID")
+	@ApiModelProperty("1进行中 2已完成")
 	private String type;
 
 
-	@ApiModelProperty("务工者唯一标识")
-	@Hidden
+	@ApiModelProperty(value = "务工者唯一标识",hidden = true)
 	private Long userId;
 }

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppJobListingRes.java

@@ -46,8 +46,9 @@ public class WgzAppJobListingRes implements Serializable {
 	@ApiModelProperty("工种")
 	private String typeOfWork;
 
-	@ApiModelProperty("申请者列表")
-	List<BgtProjectRecruitApplyVO> applylist;
+	@ApiModelProperty("申请者数量")
+	private Integer numberOfRegistered;
+
 
 
 

ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.wgz.bo.WgzDailyClockQueryBo;
 import com.ruoyi.wgz.bo.req.WgzAppDailyCalendarReq;
+import com.ruoyi.wgz.bo.req.WgzAppDailyClockReq;
 import com.ruoyi.wgz.bo.req.WgzAppDailyRecordReq;
 import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes;
 import com.ruoyi.wgz.bo.res.WgzUserDailyCalendarRes;
@@ -74,6 +75,11 @@ public interface IWgzDailyClockService extends IServicePlus<WgzDailyClock> {
 	 */
 	WgzUserDailyCalendarRes userDailyCalendar(@Validated WgzAppDailyCalendarReq req);
 
+	/**
+	 * 日报打卡
+	 */
+	Boolean userDailyClock(WgzAppDailyClockReq req);
+
 	/**
 	 * 日报日历·日报记录（历史记录分页查询）
 	 */

ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java

@@ -7,10 +7,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.bgt.domain.BgtProjectRecruit;
+import com.ruoyi.bgt.domain.BgtProjectRecruitApply;
 import com.ruoyi.bgt.domain.dto.BgtDailyClockListDTO;
 import com.ruoyi.bgt.domain.dto.BgtDailyClockUpdateDTO;
 import com.ruoyi.bgt.domain.vo.BgtDailyClockDetailVO;
 import com.ruoyi.bgt.domain.vo.BgtDailyClockListVO;
+import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService;
 import com.ruoyi.bgt.service.IBgtProjectRecruitService;
 import com.ruoyi.bgt.service.IBgtUserService;
 import com.ruoyi.common.core.domain.entity.BgtUser;
@@ -20,6 +22,7 @@ import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.wgz.bo.WgzDailyClockQueryBo;
 import com.ruoyi.wgz.bo.req.WgzAppDailyCalendarReq;
+import com.ruoyi.wgz.bo.req.WgzAppDailyClockReq;
 import com.ruoyi.wgz.bo.req.WgzAppDailyRecordReq;
 import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes;
 import com.ruoyi.wgz.bo.res.WgzUserDailyCalendarRes;
@@ -28,6 +31,7 @@ import com.ruoyi.wgz.domain.WgzDailyClock;
 import com.ruoyi.wgz.mapper.WgzDailyClockMapper;
 import com.ruoyi.wgz.service.IWgzDailyClockService;
 import com.ruoyi.wgz.service.IWgzLeaveService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -53,6 +57,12 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
 	@Autowired
 	private IBgtProjectRecruitService recruitService;
 
+	@Autowired
+	private IBgtProjectRecruitApplyService iBgtProjectRecruitApplyService;
+
+	@Autowired
+	private IBgtProjectRecruitService iBgtProjectRecruitService;
+
     @Override
     public WgzDailyClock queryById(Long id){
         return getById(id);
@@ -167,7 +177,23 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
 		return new WgzUserDailyCalendarRes().setDailyCalendar(fh);
 	}
 
-    @Override
+	@Override
+	public Boolean userDailyClock(WgzAppDailyClockReq req) {
+		//1、获取当前人、当前工的上下班时间范围
+		Long appUserId = SecurityUtils.getAppUserId();
+		BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId);
+		BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getId());
+		//1、组装数据
+		WgzDailyClock dc = new WgzDailyClock();
+		BeanUtils.copyProperties(req,dc);
+		dc.setRecruitId(appUserId);
+		dc.setUserId(appUserId);
+		dc.setDilyTime(LocalDateTime.now());
+		dc.setAuditorUserId(appById.getUserId());
+		return baseMapper.insert(dc) > 0;
+	}
+
+	@Override
     public TableDataInfo<WgzAppUserDailyRecordRes> userDailyRecord(WgzAppDailyRecordReq req) {
         Page<WgzAppDailyRecordReq> pe = new Page<>();
         pe.setCurrent(req.getPageNum());