zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

消息，确认进场

Browse Source
This commit is contained in:
zt
2025-03-20 09:32:34 +08:00
parent 6553cc2b59
commit 7ce41a73f6
11 changed files with 212 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtMessageDetailDTO.java
View File

@ -40,4 +40,7 @@ public class BgtMessageDetailDTO {
@ApiModelProperty("小类型（字典bgt_message_small_type）")
private String messageSmallType;
@ApiModelProperty("是否待处理")
private Boolean isHandle;
}

4
ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtProjectRecruitApplyService.java
View File

@ -109,6 +109,10 @@ public interface IBgtProjectRecruitApplyService extends IServicePlus<BgtProjectR
*/
Boolean consent(BgtProjectRecruitApplyConsentDTO dto);
/**
* 确认进场
*/
Boolean confirm(Long id);
/**
* 指定日期所有人员出勤情况
*/

2
ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java
View File

@ -44,6 +44,7 @@ import java.util.Map;
import java.util.stream.Collectors;
import static com.ruoyi.common.constants.BgtMessageConstant.*;
import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.OPERATION_NEED;
/**
* 消息Service业务层处理
@ -190,6 +191,7 @@ public class BgtMessageServiceImpl extends ServicePlusImpl<BgtMessageMapper, Bgt
wrapper.eq(BgtMessage::getRecipientId, SecurityUtils.getAppUserId());
wrapper.eq(StrUtil.isNotBlank(dto.getMessageLargeType()), BgtMessage::getMessageLargeType, dto.getMessageLargeType());
wrapper.eq(StrUtil.isNotBlank(dto.getMessageSmallType()), BgtMessage::getMessageSmallType, dto.getMessageSmallType());
wrapper.eq(dto.getIsHandle(), BgtMessage::getIsOperation,OPERATION_NEED);
if(dto.getDate() != null) {
wrapper.between(BgtMessage::getCreateTime, dto.getDate().atStartOfDay(), dto.getDate().atStartOfDay().with(LocalTime.MAX));
}

13
ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java
View File

@ -281,6 +281,17 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
return updateById(recruitApply);
}
@Override
public Boolean confirm(Long id) {
BgtProjectRecruitApply recruitApply = getById(id);
if(recruitApply == null){
throw new BaseException("该申请人员不存在");
}
recruitApply.setEntryTime(LocalDate.now());
recruitApply.setStatus(RecruitApplyStatus.WORKING.getCode());
return updateById(recruitApply);
}
/**
* LC-APP相关
@ -387,7 +398,7 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
setTableId(bgtProjectRecruitApply.getId()).
setTableName(SqlHelper.table(BgtProjectRecruitApply.class).getTableName()).
setMessageLargeType(BGT_LARGE_OTHER).
setMessageSmallType(BGT_TYPE_SIGN_UP);
setMessageSmallType(BGT_TYPE_SIGN_UP).setIsOperation(OPERATION_NEED);
if (!iBgtMessageService.sendAMessage(bgtMessage)) {
throw new RuntimeException("发送消息失败！");
}

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

@ -296,7 +296,7 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
setTableId(dc.getId()).
setTableName(SqlHelper.table(WgzDailyClock.class).getTableName()).
setMessageLargeType(BGT_LARGE_OTHER).
setMessageSmallType(BGT_SMALL_REPORT_MAKE_UP);
setMessageSmallType(BGT_SMALL_REPORT_MAKE_UP).setIsOperation(OPERATION_NEED);
if (!iBgtMessageService.sendAMessage(bgtMessage)){
throw new RuntimeException("发送日报补卡消息失败！");
}
@ -336,10 +336,10 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
Page<BgtDailyClockListDTO> queryDTOPage = new Page<>();
queryDTOPage.setCurrent(dto.getPageNum());
queryDTOPage.setSize(dto.getPageSize());
if( "5".equals(dto.getAuditorType()) ){
if( AuditStatus.READ.getCode().equals(dto.getAuditorType()) ){
dto.setIsRead(true);
}
if( "1".equals(dto.getAuditorType()) ){
if( AuditStatus.AUDIT.getCode().equals(dto.getAuditorType()) ){
dto.setIsAudit(true);
}

2
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java
View File

@ -215,7 +215,7 @@ public class WgzLeaveServiceImpl extends ServicePlusImpl<WgzLeaveMapper, WgzLeav
setTableId(wgzLeave.getId()).
setTableName(SqlHelper.table(WgzLeave.class).getTableName()).
setMessageLargeType(BGT_LARGE_OTHER).
setMessageSmallType(BGT_SMALL_LEAVE);
setMessageSmallType(BGT_SMALL_LEAVE).setIsOperation(OPERATION_NEED);
if (!iBgtMessageService.sendAMessage(bgtMessage)) {
throw new RuntimeException("发送请假申请消息失败！");
}

3
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java
View File

@ -40,7 +40,6 @@ import com.ruoyi.wgz.domain.*;
import com.ruoyi.wgz.mapper.WgzPayCalculationMapper;
import com.ruoyi.wgz.service.*;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.xmlbeans.impl.validator.ValidatingXMLStreamReader;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -270,7 +269,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
setTableId(wgzPayCalculation.getId()).
setTableName(SqlHelper.table(WgzPayCalculation.class).getTableName()).
setMessageLargeType(BGT_LARGE_OTHER).
setMessageSmallType(BGT_SMALL_PAY);
setMessageSmallType(BGT_SMALL_PAY).setIsOperation(OPERATION_NEED);
if (!iBgtMessageService.sendAMessage(bgtMessage)){
throw new RuntimeException("发送补卡消息失败！");
}

2
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java
View File

@ -211,7 +211,7 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl<WgzReissueacardM
setTableId(wgzReissueacard.getId()).
setTableName(SqlHelper.table(WgzReissueacard.class).getTableName()).
setMessageLargeType(BGT_LARGE_OTHER).
setMessageSmallType(BGT_SMALL_MAKE_UP);
setMessageSmallType(BGT_SMALL_MAKE_UP).setIsOperation(OPERATION_NEED);
if (!iBgtMessageService.sendAMessage(bgtMessage)) {
throw new RuntimeException("发送补卡消息失败！");
}