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-04-02 11:09:53 +08:00
parent ed14f2399d
commit 223cae5edc
83 changed files with 2994 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsProjectTaskUpdateDTO.java
View File

@ -53,4 +53,7 @@ public class FbsProjectTaskUpdateDTO {
@ApiModelProperty("资质要求")
private String qualification;
@ApiModelProperty("备注")
private String remark;
}

12
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailVO.java
View File

@ -23,12 +23,21 @@ public class AppTaskDetailVO {
@ApiModelProperty("项目ID")
private Long projectId;
@ApiModelProperty("项目名")
private String projectName;
@ApiModelProperty("标段ID")
private Long sectionId;
@ApiModelProperty("标段名称")
private String sectionName;
@ApiModelProperty("分包ID")
private Long subId;
@ApiModelProperty("分包主题")
private String subName;
/** 任务名称 */
@ApiModelProperty("任务名称")
private String taskName;
@ -82,9 +91,6 @@ public class AppTaskDetailVO {
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("项目名")
private String projectName;
@ApiModelProperty("发布时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime;

21
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/FbsProjectListCountVO.java Normal file
View File

@ -0,0 +1,21 @@
package com.ruoyi.fbs.domain.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("分包商项目列表统计")
public class FbsProjectListCountVO {
@ApiModelProperty("申请中数量")
private Integer applyCount;
@ApiModelProperty("已加入数量")
private Integer joinCount;
@ApiModelProperty("已竣工数量")
private Integer completeCount;
}

3
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/FbsProjectListVO.java
View File

@ -22,6 +22,9 @@ public class FbsProjectListVO {
@ApiModelProperty("项目地址")
private String projectAddress;
@ApiModelProperty("项目图片")
private String projectImg;
@ApiModelProperty("项目状态(0-未开工，1-已开工，2已竣工，3已停工)")
private String projectStatus;

3
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/FbsProjectSectionListVO.java
View File

@ -19,6 +19,9 @@ public class FbsProjectSectionListVO {
@ApiModelProperty("标段名称")
private String sectionName;
@ApiModelProperty("项目地址")
private String projectAddress;
@ApiModelProperty("分包列表")
private List<FbsProjectSubcontractingListVO> subList;

71
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/FbsProjectSubcontractingDetailVO.java Normal file
View File

@ -0,0 +1,71 @@
package com.ruoyi.fbs.domain.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 总包方项目分包对象 zbf_project_subcontracting
*
* @author ruoyi
* @date 2025-02-17
*/
@Data
@Accessors(chain = true)
@ApiModel("分包商查询项目分包详情视图对象")
public class FbsProjectSubcontractingDetailVO {
/** 主键ID */
@ApiModelProperty("主键ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ApiModelProperty("项目ID")
private Long projectId;
@ApiModelProperty("标段ID")
private Long sectionId;
@ApiModelProperty("标段名")
private String sectionName;
@ApiModelProperty("分包主题")
private String subName;
@ApiModelProperty("分包描述")
private String subDescribe;
@ApiModelProperty("分包金额")
private BigDecimal subAmount;
@ApiModelProperty("资质要求")
private String qualification;
@ApiModelProperty("分包商用户ID")
private Long userId;
@ApiModelProperty("删除标志（0代表存在 2代表删除）")
private String delFlag;
@ApiModelProperty("创建者")
private String createBy;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("更新者")
private String updateBy;
@ApiModelProperty("更新时间")
private LocalDateTime updateTime;
@ApiModelProperty("备注")
private String remark;
}

8
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/FbsProjectSubcontractingListVO.java
View File

@ -16,6 +16,10 @@ public class FbsProjectSubcontractingListVO {
@ApiModelProperty("项目ID")
private Long projectId;
@ApiModelProperty("项目地址")
private String projectAddress;
/** 标段ID */
@ApiModelProperty("标段ID")
private Long sectionId;
@ -32,7 +36,7 @@ public class FbsProjectSubcontractingListVO {
@ApiModelProperty("资质要求")
private String qualification;
@ApiModelProperty("申请状态（0=申请中,1=已同意,2=已拒绝,3=已取消）")
private String applyStatus;
}

25
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/FbsProjectTaskListCountVO.java Normal file
View File

@ -0,0 +1,25 @@
package com.ruoyi.fbs.domain.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 分包商项目任务对象 fbs_project_task
*
* @author ruoyi
* @date 2025-02-17
*/
@Data
@NoArgsConstructor
@ApiModel("分包商任务列表数量统计视图对象")
public class FbsProjectTaskListCountVO {
@ApiModelProperty("已发布数量")
private Integer releaseCount;
@ApiModelProperty("已完成数量")
private Integer completeCount;
}

19
ruoyi-system/src/main/java/com/ruoyi/fbs/service/IFbsMessageService.java
View File

@ -72,4 +72,23 @@ public interface IFbsMessageService extends IServicePlus<FbsMessage> {
* 消息详情列表
*/
TableDataInfo<FbsMessageDetailVO> queryDetailPageList(FbsMessageDetailDTO dto);
/**
* 发送消息
*/
Boolean sendAMessage(FbsMessage bo);
/**
* 已操作
*/
void operation(String senderType,Long senderId,String recipientType,Long recipientId,Long tableId,String tableName);
/**
* 批量已操作
*/
void operationBatch(String recipientType,Long recipientId,List<Long> tableIds,String tableName);
}

5
ruoyi-system/src/main/java/com/ruoyi/fbs/service/IFbsProjectTaskApplyService.java
View File

@ -75,4 +75,9 @@ public interface IFbsProjectTaskApplyService extends IServicePlus<FbsProjectTask
* 查询任务下的包工头申请列表
*/
TableDataInfo<FbsProjectTaskApplyListVO> queryPageListByTaskId(FbsTaskApplyListDTO dto);
/**
* 分包商选择包工头
*/
Boolean choose(Long id);
}

5
ruoyi-system/src/main/java/com/ruoyi/fbs/service/IFbsProjectTaskService.java
View File

@ -116,6 +116,11 @@ public interface IFbsProjectTaskService extends IServicePlus<FbsProjectTask> {
*/
TableDataInfo<FbsProjectTaskListVO> fbsPageList(FbsTaskListDTO dto);
/**
* 分包商查询任务列表数量统计
*/
FbsProjectTaskListCountVO fbsListCount();
/**
* 分包商查询任务详情-工资结算审批
*/

2
ruoyi-system/src/main/java/com/ruoyi/fbs/service/IFbsUserService.java
View File

@ -62,7 +62,7 @@ public interface IFbsUserService extends IServicePlus<FbsUser> {
/**
* 企业认证
*/
Boolean authenticate(CompanyAuthenticateDTO dto);
Long authenticate(CompanyAuthenticateDTO dto);
/**
* 企业认证

30
ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsMessageServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.fbs.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
@ -28,6 +29,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.OPERATION_ALREADY;
import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.OPERATION_NEED;
/**
@ -204,4 +206,32 @@ public class FbsMessageServiceImpl extends ServicePlusImpl<FbsMessageMapper, Fbs
}
@Override
public Boolean sendAMessage(FbsMessage bo) {
return save(bo);
}
@Override
public void operation(String senderType, Long senderId, String recipientType, Long recipientId, Long tableId, String tableName) {
LambdaUpdateWrapper<FbsMessage> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(FbsMessage::getRecipientId, recipientId);
wrapper.eq(FbsMessage::getRecipientType, recipientType);
wrapper.eq(FbsMessage::getSenderId, senderId);
wrapper.eq(FbsMessage::getSenderType, senderType);
wrapper.eq(FbsMessage::getTableId, tableId);
wrapper.eq(FbsMessage::getTableName, tableName);
wrapper.set(FbsMessage::getIsOperation, OPERATION_ALREADY);
update(wrapper);
}
@Override
public void operationBatch(String recipientType, Long recipientId, List<Long> tableIds, String tableName) {
LambdaUpdateWrapper<FbsMessage> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(FbsMessage::getRecipientId, recipientId);
wrapper.eq(FbsMessage::getRecipientType, recipientType);
wrapper.in(FbsMessage::getTableId, tableIds);
wrapper.eq(FbsMessage::getTableName, tableName);
wrapper.set(FbsMessage::getIsOperation, OPERATION_ALREADY);
update(wrapper);
}
}

176
ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskApplyServiceImpl.java
View File

@ -11,30 +11,30 @@ import com.ruoyi.bgt.domain.dto.BgtTaskApplyDTO;
import com.ruoyi.bgt.service.IBgtMessageService;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.TaskApplyStatus;
import com.ruoyi.common.exception.BaseException;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.fbs.bo.FbsProjectTaskApplyQueryBo;
import com.ruoyi.fbs.domain.FbsMessage;
import com.ruoyi.fbs.domain.FbsProjectTask;
import com.ruoyi.fbs.domain.FbsProjectTaskApply;
import com.ruoyi.fbs.domain.dto.FbsTaskApplyListDTO;
import com.ruoyi.fbs.domain.vo.FbsProjectTaskApplyListVO;
import com.ruoyi.fbs.mapper.FbsProjectTaskApplyMapper;
import com.ruoyi.fbs.service.IFbsMessageService;
import com.ruoyi.fbs.service.IFbsProjectTaskApplyService;
import com.ruoyi.fbs.service.IFbsProjectTaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import static com.ruoyi.common.constants.BgtMessageConstant.*;
import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.USERTYPE_BGT;
import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.USERTYPE_SYSTEM;
import static com.ruoyi.common.constants.FbsMessageConstant.*;
import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.*;
/**
* 分包商项目任务申请Service业务层处理
@ -49,7 +49,8 @@ public class FbsProjectTaskApplyServiceImpl extends ServicePlusImpl<FbsProjectTa
private IBgtMessageService bgtMessageService;
@Autowired
private IFbsProjectTaskService taskService;
@Autowired
private IFbsMessageService fbsMessageService;
@Override
public FbsProjectTaskApply queryById(Long id){
return getById(id);
@ -84,7 +85,7 @@ public class FbsProjectTaskApplyServiceImpl extends ServicePlusImpl<FbsProjectTa
@Override
public Boolean update(FbsProjectTaskApply bo) {
FbsProjectTaskApply update = BeanUtil.toBean(bo, FbsProjectTaskApply.class);
validEntityBeforeSave(update);
// validEntityBeforeSave(update);
return updateById(update);
}
@ -97,6 +98,7 @@ public class FbsProjectTaskApplyServiceImpl extends ServicePlusImpl<FbsProjectTa
LambdaQueryWrapper<FbsProjectTaskApply> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(FbsProjectTaskApply::getTaskId, entity.getTaskId());
wrapper.eq(FbsProjectTaskApply::getUserId, entity.getUserId());
wrapper.eq(FbsProjectTaskApply::getApplyStatus, TaskApplyStatus.APPLY.getCode());
List<FbsProjectTaskApply> list = baseMapper.selectList(wrapper);
if (CollUtil.isNotEmpty(list)) {
throw new BaseException("该任务已申请");
@ -115,24 +117,46 @@ public class FbsProjectTaskApplyServiceImpl extends ServicePlusImpl<FbsProjectTa
@Transactional(rollbackFor = Exception.class)
public Boolean appTaskApply(BgtTaskApplyDTO dto) {
FbsProjectTaskApply fbsProjectTaskApply = BeanUtil.copyProperties(dto, FbsProjectTaskApply.class);
fbsProjectTaskApply.setUserId(SecurityUtils.getAppUserId());
validEntityBeforeSave(fbsProjectTaskApply);
//发消息
//系统发消息到包工头
FbsProjectTask task = taskService.getById(dto.getTaskId());
HashMap<String, String> mp = new HashMap<>();
mp.put("projectName", task.getTaskName());
mp.put("auditor", SecurityUtils.getUsername());
Map<String, String> map = bgtMessage(mp, BGT_TYPE_TASK, true);
BgtMessage bgtMessage = new BgtMessage()
.setSenderType(USERTYPE_SYSTEM)
.setRecipientType(USERTYPE_BGT)
.setRecipientId(dto.getUserId())
.setHeadline(map.get(HEADLINE))
.setSubheading(map.get(SUBHEADING))
.setTableId(task.getId())
.setTableName(SqlHelper.table(FbsProjectTask.class).getTableName())
.setMessageLargeType(BGT_LARGE_TASK);
bgtMessageService.sendAMessage(bgtMessage);
// HashMap<String, String> mp = new HashMap<>();
// mp.put("projectName", task.getTaskName());
// mp.put("auditor", SecurityUtils.getUsername());
// Map<String, String> map = bgtMessage(mp, BGT_TYPE_TASK, true);
// BgtMessage bgtMessage = new BgtMessage()
// .setSenderType(USERTYPE_SYSTEM)
// .setSenderId(SYSTEM_ID)
// .setRecipientType(USERTYPE_BGT)
// .setRecipientId(dto.getUserId())
// .setHeadline(map.get(HEADLINE))
// .setSubheading(map.get(SUBHEADING))
// .setTableId(fbsProjectTaskApply.getId())
// .setTableName(SqlHelper.table(FbsProjectTaskApply.class).getTableName())
// .setMessageLargeType(BGT_LARGE_TASK);
// bgtMessageService.sendAMessage(bgtMessage);
//包工头发消息到分包商
HashMap<String, String> fmp = new HashMap<>();
fmp.put("projectName", task.getTaskName());
fmp.put("auditor", SecurityUtils.getUsername());
Map<String, String> fmap = bgtMessage(fmp, BGT_TYPE_TASK_TO_FBS, true);
FbsMessage fbsMessage = new FbsMessage()
.setSenderType(USERTYPE_BGT)
.setSenderId(SecurityUtils.getAppUserId())
.setRecipientType(USERTYPE_FBS)
.setRecipientId(task.getCreateId())
.setHeadline(fmap.get(HEADLINE))
.setSubheading(fmap.get(SUBHEADING))
.setTableId(fbsProjectTaskApply.getId())
.setTableName(SqlHelper.table(FbsProjectTaskApply.class).getTableName())
.setMessageLargeType(FBS_LARGE_OTHER)
.setMessageSmallType(FBS_SMALL_SIGN_UP)
.setIsOperation(OPERATION_NEED);
fbsMessageService.sendAMessage(fbsMessage);
return save(fbsProjectTaskApply);
}
@ -144,25 +168,42 @@ public class FbsProjectTaskApplyServiceImpl extends ServicePlusImpl<FbsProjectTa
@Override
public Boolean cancelApply(BgtTaskApplyDTO dto) {
int delete = baseMapper.delete(Wrappers.<FbsProjectTaskApply>lambdaQuery().eq(FbsProjectTaskApply::getTaskId, dto.getTaskId())
.eq(FbsProjectTaskApply::getUserId, dto.getUserId()));
//发消息
LambdaQueryWrapper<FbsProjectTaskApply> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(FbsProjectTaskApply::getTaskId, dto.getTaskId());
wrapper.eq(FbsProjectTaskApply::getUserId, SecurityUtils.getAppUserId());
wrapper.eq(FbsProjectTaskApply::getApplyStatus, TaskApplyStatus.APPLY.getCode());
List<FbsProjectTaskApply> list = baseMapper.selectList(wrapper);
if (CollUtil.isEmpty(list)) {
throw new BaseException("该任务尚未申请");
}
FbsProjectTaskApply fbsProjectTaskApply = list.get(0);
fbsProjectTaskApply.setApplyStatus(TaskApplyStatus.CANCEL.getCode());
boolean update = updateById(fbsProjectTaskApply);
FbsProjectTask task = taskService.getById(dto.getTaskId());
HashMap<String, String> mp = new HashMap<>();
mp.put("projectName", task.getTaskName());
mp.put("auditor", SecurityUtils.getUsername());
Map<String, String> map = bgtMessage(mp, BGT_TYPE_TASK_CANCEL, true);
BgtMessage bgtMessage = new BgtMessage()
.setSenderType(USERTYPE_SYSTEM)
.setRecipientType(USERTYPE_BGT)
.setRecipientId(dto.getUserId())
.setHeadline(map.get(HEADLINE))
.setSubheading(map.get(SUBHEADING))
.setTableId(task.getId())
.setTableName(SqlHelper.table(FbsProjectTask.class).getTableName())
.setMessageLargeType(BGT_LARGE_TASK);
bgtMessageService.sendAMessage(bgtMessage);
return delete>0;
//修改消息操作
fbsMessageService.operation(USERTYPE_BGT,SecurityUtils.getAppUserId(),USERTYPE_FBS,task.getCreateId()
,fbsProjectTaskApply.getId(),SqlHelper.table(FbsProjectTaskApply.class).getTableName());
//发消息
// FbsProjectTask task = taskService.getById(dto.getTaskId());
// HashMap<String, String> mp = new HashMap<>();
// mp.put("projectName", task.getTaskName());
// mp.put("auditor", SecurityUtils.getUsername());
// Map<String, String> map = bgtMessage(mp, BGT_TYPE_TASK_CANCEL, true);
// BgtMessage bgtMessage = new BgtMessage()
// .setSenderType(USERTYPE_SYSTEM)
// .setRecipientType(USERTYPE_BGT)
// .setRecipientId(dto.getUserId())
// .setHeadline(map.get(HEADLINE))
// .setSubheading(map.get(SUBHEADING))
// .setTableId(task.getId())
// .setTableName(SqlHelper.table(FbsProjectTask.class).getTableName())
// .setMessageLargeType(BGT_LARGE_TASK);
// bgtMessageService.sendAMessage(bgtMessage);
return update;
}
@Override
@ -173,4 +214,57 @@ public class FbsProjectTaskApplyServiceImpl extends ServicePlusImpl<FbsProjectTa
Page<FbsProjectTaskApplyListVO> voPage = baseMapper.queryPageListByTaskId(page, dto);
return PageUtils.buildDataInfo(voPage);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean choose(Long id) {
FbsProjectTaskApply taskApply = getById(id);
if(taskApply == null || TaskApplyStatus.CANCEL.getCode().equals(taskApply.getApplyStatus())){
throw new BaseException("该申请已取消");
}
FbsProjectTask task = taskService.getById(taskApply.getTaskId());
if(task!=null && task.getUserId()!=null){
throw new BaseException("该任务已被承接");
}
//拒绝其余包工头
LambdaQueryWrapper<FbsProjectTaskApply> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(FbsProjectTaskApply::getTaskId, taskApply.getTaskId());
wrapper.eq(FbsProjectTaskApply::getApplyStatus, TaskApplyStatus.APPLY.getCode());
List<FbsProjectTaskApply> list = baseMapper.selectList(wrapper);
ArrayList<BgtMessage> bgtMessages = new ArrayList<>();
for (FbsProjectTaskApply fbsProjectTaskApply : list){
boolean equals = fbsProjectTaskApply.getId().equals(id);
if (equals){
fbsProjectTaskApply.setApplyStatus(TaskApplyStatus.PASS.getCode());
}else{
fbsProjectTaskApply.setApplyStatus(TaskApplyStatus.REFUSE.getCode());
}
//分包商发消息到包工头
HashMap<String, String> mp = new HashMap<>();
mp.put("projectName", task.getTaskName());
mp.put("auditor", SecurityUtils.getUsername());
Map<String, String> map = fbsMessage(mp, FBS_TYPE_SIGN_UP, equals);
BgtMessage bgtMessage = new BgtMessage()
.setSenderType(USERTYPE_FBS)
.setSenderId(SecurityUtils.getAppUserId())
.setRecipientType(USERTYPE_BGT)
.setRecipientId(fbsProjectTaskApply.getUserId())
.setHeadline(map.get(HEADLINE))
.setSubheading(map.get(SUBHEADING))
.setTableId(fbsProjectTaskApply.getId())
.setTableName(SqlHelper.table(FbsProjectTaskApply.class).getTableName())
.setMessageLargeType(BGT_LARGE_TASK)
.setIsOperation(OPERATION_NO);
bgtMessages.add(bgtMessage);
}
bgtMessageService.saveBatch(bgtMessages);
fbsMessageService.operationBatch(USERTYPE_FBS,SecurityUtils.getAppUserId(),list.stream().map(FbsProjectTaskApply::getId).collect(Collectors.toList()),SqlHelper.table(FbsProjectTaskApply.class).getTableName());
return super.updateBatchById(list);
}
}

53
ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskServiceImpl.java
View File

@ -37,6 +37,8 @@ import com.ruoyi.fbs.service.IFbsProjectTaskService;
import com.ruoyi.wgz.service.IWgzAttendanceService;
import com.ruoyi.wgz.service.IWgzPayCalculationService;
import com.ruoyi.zbf.domain.ZbfProject;
import com.ruoyi.zbf.domain.ZbfProjectSection;
import com.ruoyi.zbf.service.IZbfProjectSectionService;
import com.ruoyi.zbf.service.IZbfProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -72,6 +74,8 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl<FbsProjectTaskMap
private IWgzPayCalculationService payCalculationService;
@Autowired
private IFbsProjectTaskApplyService fbsProjectTaskApplyService;
@Autowired
private IZbfProjectSectionService zbfProjectSectionService;
@Override
public FbsProjectTask queryById(Long id){
@ -163,34 +167,22 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl<FbsProjectTaskMap
@Override
public AppTaskDetailVO appQueryById(Long id) {
FbsProjectTask byId = getById(id);
AppTaskDetailVO appTaskDetailVO = BeanUtil.copyProperties(byId, AppTaskDetailVO.class);
FbsProjectTask projectTask = getById(id);
AppTaskDetailVO appTaskDetailVO = BeanUtil.copyProperties(projectTask, AppTaskDetailVO.class);
//项目信息
ZbfProject project = zbfProjectService.getById(byId.getProjectId());
ZbfProject project = zbfProjectService.getById(projectTask.getProjectId());
appTaskDetailVO.setProjectName(project.getProjectName());
//标段信息
ZbfProjectSection projectSection = zbfProjectSectionService.getById(projectTask.getSectionId());
appTaskDetailVO.setSectionName(projectSection.getSectionName());
if(ProjectTaskStatus.PROGRESS.getCode().equals(byId.getStatus())
|| ProjectTaskStatus.COMPLETE.getCode().equals(byId.getStatus())){
if(ProjectTaskStatus.PROGRESS.getCode().equals(projectTask.getStatus())
|| ProjectTaskStatus.COMPLETE.getCode().equals(projectTask.getStatus())){
//任务进度
Integer lastProgress = progressService.getLastProgress(id);
appTaskDetailVO.setProgress(lastProgress);
BigDecimal bd = new BigDecimal(lastProgress).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
appTaskDetailVO.setProgressDouble(bd.doubleValue());
// //结算情况
// //收款申请列表
// BgtWageApplicationQueryDTO wageDTO = new BgtWageApplicationQueryDTO();
// wageDTO.setTaskId(id);
// List<BgtWageApplicationListVO> wageList = wageApplicationService.appQueryList(wageDTO);
// appTaskDetailVO.setWageApplication(CollectionUtil.isEmpty(wageList)?null:wageList.get(0));
// //收款金额
// Integer taskReceiveAmount = wageList.stream().filter(wage -> AuditStatus.PASS.getCode().equals(wage.getAuditStatus()))
// .map(BgtWageApplicationListVO::getApplicantAmount)
// .reduce(BigDecimal.ZERO, BigDecimal::add).intValue();
// appTaskDetailVO.setTaskReceiveAmount(taskReceiveAmount);
// //付款金额
// BigDecimal payByTaskAndBgt = payCalculationService.getPayByTaskAndBgt(byId.getId(), byId.getUserId());
// appTaskDetailVO.setTaskPaymentAmount(payByTaskAndBgt);
}
return appTaskDetailVO;
}
@ -198,7 +190,7 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl<FbsProjectTaskMap
@Override
public AppTaskDetailAttendanceVO attendance(Long id) {
FbsProjectTask task = getById(id);
LocalDate taskBeginTime = DateUtils.str2Localdate(task.getTaskBeginTime(), DateUtils.YYYY_MM_DD);
// LocalDate taskBeginTime = DateUtils.str2Localdate(task.getTaskBeginTime(), DateUtils.YYYY_MM_DD);
LocalDate taskEndTime = DateUtils.str2Localdate(task.getTaskEndTime(), DateUtils.YYYY_MM_DD);
//考勤情况
AppTaskDetailAttendanceVO appTaskDetailVO = new AppTaskDetailAttendanceVO();
@ -310,6 +302,7 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl<FbsProjectTaskMap
public TableDataInfo<FbsProjectTaskListVO> fbsPageList(FbsTaskListDTO dto) {
LambdaQueryWrapper<FbsProjectTask> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(FbsProjectTask::getCreateId,SecurityUtils.getAppUserId());
wrapper.in(dto.getType()==0,FbsProjectTask::getStatus,ProjectTaskStatus.getRelease());
wrapper.eq(dto.getType()==1,FbsProjectTask::getStatus,ProjectTaskStatus.COMPLETE.getCode());
wrapper.orderByDesc(FbsProjectTask::getId);
@ -339,6 +332,24 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl<FbsProjectTaskMap
return PageUtils.buildDataInfo(fbsProjectTaskListVOPage);
}
@Override
public FbsProjectTaskListCountVO fbsListCount() {
LambdaQueryWrapper<FbsProjectTask> releaseWrapper = new LambdaQueryWrapper<>();
releaseWrapper.eq(FbsProjectTask::getCreateId,SecurityUtils.getAppUserId());
releaseWrapper.in(FbsProjectTask::getStatus,ProjectTaskStatus.getRelease());
Integer releaseCount = baseMapper.selectCount(releaseWrapper);
LambdaQueryWrapper<FbsProjectTask> completeWrapper = new LambdaQueryWrapper<>();
completeWrapper.eq(FbsProjectTask::getCreateId,SecurityUtils.getAppUserId());
completeWrapper.eq(FbsProjectTask::getStatus,ProjectTaskStatus.COMPLETE.getCode());
Integer completeCount = baseMapper.selectCount(completeWrapper);
FbsProjectTaskListCountVO fbsProjectTaskListCountVO = new FbsProjectTaskListCountVO();
fbsProjectTaskListCountVO.setReleaseCount(releaseCount);
fbsProjectTaskListCountVO.setCompleteCount(completeCount);
return fbsProjectTaskListCountVO;
}
@Override
public FbsTaskDetailWageVO fbsWage(Long id) {
FbsTaskDetailWageVO fbsTaskDetailWageVO = new FbsTaskDetailWageVO();

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

@ -18,6 +18,7 @@ import com.ruoyi.fbs.mapper.FbsUserMapper;
import com.ruoyi.fbs.service.IFbsUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
import java.util.List;
@ -113,12 +114,14 @@ public class FbsUserServiceImpl extends ServicePlusImpl<FbsUserMapper, FbsUser>
}
@Override
public Boolean authenticate(CompanyAuthenticateDTO dto) {
@Transactional(rollbackFor = Exception.class)
public Long authenticate(CompanyAuthenticateDTO dto) {
Company company = BeanUtil.copyProperties(dto, Company.class);
companyService.insert(company);
companyService.save(company);
FbsUser fbsUser = selectUserByUserId(SecurityUtils.getAppUserId());
fbsUser.setCompanyId(company.getId());
return updateById(fbsUser);
updateById(fbsUser);
return company.getId();
}
@Override

44
ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsWageApplicationServiceImpl.java
View File

@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.AuditStatus;
@ -15,12 +16,26 @@ import com.ruoyi.fbs.domain.FbsWageApplication;
import com.ruoyi.fbs.domain.dto.FbsWageApplicationListDTO;
import com.ruoyi.fbs.mapper.FbsWageApplicationMapper;
import com.ruoyi.fbs.service.IFbsWageApplicationService;
import com.ruoyi.zbf.domain.ZbfMessage;
import com.ruoyi.zbf.service.IZbfMessageService;
import com.ruoyi.zbf.service.IZbfProjectService;
import com.ruoyi.zbf.service.IZbfProjectSubcontractingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.ruoyi.common.constants.BgtMessageConstant.HEADLINE;
import static com.ruoyi.common.constants.BgtMessageConstant.SUBHEADING;
import static com.ruoyi.common.constants.FbsMessageConstant.FBS_TYPE_SETTLEMENT_TO_ZBF;
import static com.ruoyi.common.constants.FbsMessageConstant.fbsMessage;
import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.*;
import static com.ruoyi.common.constants.ZbfMessageConstant.ZBF_LARGE_SETTLEMENT;
/**
* 分包商工资申请Service业务层处理
*
@ -30,6 +45,13 @@ import java.util.Map;
@Service
public class FbsWageApplicationServiceImpl extends ServicePlusImpl<FbsWageApplicationMapper, FbsWageApplication> implements IFbsWageApplicationService {
@Autowired
private IZbfMessageService zbfMessageService;
@Autowired
private IZbfProjectService projectService;
@Autowired
private IZbfProjectSubcontractingService projectSubcontractingService;
@Override
public FbsWageApplication queryById(Long id){
return getById(id);
@ -72,10 +94,30 @@ public class FbsWageApplicationServiceImpl extends ServicePlusImpl<FbsWageApplic
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insert(FbsWageApplication bo) {
FbsWageApplication add = BeanUtil.toBean(bo, FbsWageApplication.class);
validEntityBeforeSave(add);
return save(add);
boolean save = save(add);
//分包商发消息到总包方
HashMap<String, String> fmp = new HashMap<>();
fmp.put("auditor", SecurityUtils.getUsername());
fmp.put("amount", bo.getApplicantAmount().toString());
Map<String, String> fmap = fbsMessage(fmp, FBS_TYPE_SETTLEMENT_TO_ZBF, true);
ZbfMessage zbfMessage = new ZbfMessage()
.setSenderType(USERTYPE_FBS)
.setSenderId(SecurityUtils.getAppUserId())
.setRecipientType(USERTYPE_ZBF)
.setRecipientId(add.getReviewerId())
.setHeadline(fmap.get(HEADLINE))
.setSubheading(fmap.get(SUBHEADING))
.setTableId(add.getId())
.setTableName(SqlHelper.table(FbsWageApplication.class).getTableName())
.setMessageLargeType(ZBF_LARGE_SETTLEMENT)
.setIsOperation(OPERATION_NEED);
zbfMessageService.sendAMessage(zbfMessage);
return save;
}
@Override