分包
This commit is contained in:
@ -0,0 +1,79 @@
|
||||
package com.ruoyi.zbf.bo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalTime;
|
||||
import java.time.LocalDate;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 消息分页查询对象 zbf_message
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-31
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ApiModel("消息分页查询对象")
|
||||
public class ZbfMessageQueryBo extends BaseEntity {
|
||||
|
||||
/** 分页大小 */
|
||||
@ApiModelProperty("分页大小")
|
||||
private Integer pageSize;
|
||||
/** 当前页数 */
|
||||
@ApiModelProperty("当前页数")
|
||||
private Integer pageNum;
|
||||
/** 排序列 */
|
||||
@ApiModelProperty("排序列")
|
||||
private String orderByColumn;
|
||||
/** 排序的方向desc或者asc */
|
||||
@ApiModelProperty(value = "排序的方向", example = "asc,desc")
|
||||
private String isAsc;
|
||||
|
||||
|
||||
/** 发送类型(0系统 1务工者 2包工头 3分包商 4总包方) */
|
||||
@ApiModelProperty("发送类型(0系统 1务工者 2包工头 3分包商 4总包方)")
|
||||
private String senderType;
|
||||
/** 发送人 */
|
||||
@ApiModelProperty("发送人")
|
||||
private Long senderId;
|
||||
/** 接收类型(1务工者 2包工头 3分包商 4总包方) */
|
||||
@ApiModelProperty("接收类型(1务工者 2包工头 3分包商 4总包方)")
|
||||
private String recipientType;
|
||||
/** 接收人 */
|
||||
@ApiModelProperty("接收人")
|
||||
private Long recipientId;
|
||||
/** 标题 */
|
||||
@ApiModelProperty("标题")
|
||||
private String headline;
|
||||
/** 副标题 */
|
||||
@ApiModelProperty("副标题")
|
||||
private String subheading;
|
||||
/** 表ID */
|
||||
@ApiModelProperty("表ID")
|
||||
private Long tableId;
|
||||
/** 表名 */
|
||||
@ApiModelProperty("表名")
|
||||
private String tableName;
|
||||
/** 大类型(字典bgt_message_large_type) */
|
||||
@ApiModelProperty("大类型(字典bgt_message_large_type)")
|
||||
private String messageLargeType;
|
||||
/** 小类型(字典bgt_message_small_type) */
|
||||
@ApiModelProperty("小类型(字典bgt_message_small_type)")
|
||||
private String messageSmallType;
|
||||
/** 读状态(0未读 1已读) */
|
||||
@ApiModelProperty("读状态(0未读 1已读)")
|
||||
private String readStatus;
|
||||
/** 是否需要操作(0不需要 1需要 2已操作) */
|
||||
@ApiModelProperty("是否需要操作(0不需要 1需要 2已操作)")
|
||||
private String isOperation;
|
||||
|
||||
}
|
@ -0,0 +1,97 @@
|
||||
package com.ruoyi.zbf.bo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalTime;
|
||||
import java.time.LocalDate;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* APP总包方用户分页查询对象 zbf_user
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-31
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ApiModel("APP总包方用户分页查询对象")
|
||||
public class ZbfUserQueryBo extends BaseEntity {
|
||||
|
||||
/** 分页大小 */
|
||||
@ApiModelProperty("分页大小")
|
||||
private Integer pageSize;
|
||||
/** 当前页数 */
|
||||
@ApiModelProperty("当前页数")
|
||||
private Integer pageNum;
|
||||
/** 排序列 */
|
||||
@ApiModelProperty("排序列")
|
||||
private String orderByColumn;
|
||||
/** 排序的方向desc或者asc */
|
||||
@ApiModelProperty(value = "排序的方向", example = "asc,desc")
|
||||
private String isAsc;
|
||||
|
||||
|
||||
/** 唯一标识 */
|
||||
@ApiModelProperty("唯一标识")
|
||||
private Long userId;
|
||||
/** 联系电话 */
|
||||
@ApiModelProperty("联系电话")
|
||||
private String phone;
|
||||
/** 姓名 */
|
||||
@ApiModelProperty("姓名")
|
||||
private String username;
|
||||
/** 性别(0男 1女 2未知) */
|
||||
@ApiModelProperty("性别(0男 1女 2未知)")
|
||||
private String gender;
|
||||
/** 民族 */
|
||||
@ApiModelProperty("民族")
|
||||
private String nation;
|
||||
/** 出生日期 */
|
||||
@ApiModelProperty("出生日期")
|
||||
private String birthdate;
|
||||
/** 身份证号码 */
|
||||
@ApiModelProperty("身份证号码")
|
||||
private String identityCard;
|
||||
/** 所在区域 */
|
||||
@ApiModelProperty("所在区域")
|
||||
private String area;
|
||||
/** 地址 */
|
||||
@ApiModelProperty("地址")
|
||||
private String site;
|
||||
/** 银行 */
|
||||
@ApiModelProperty("银行")
|
||||
private String bank;
|
||||
/** 银行卡号 */
|
||||
@ApiModelProperty("银行卡号")
|
||||
private String cardNo;
|
||||
/** 头像地址 */
|
||||
@ApiModelProperty("头像地址")
|
||||
private String avatarName;
|
||||
/** 密码 */
|
||||
@ApiModelProperty("密码")
|
||||
private String password;
|
||||
/** 身份证正面图路径 */
|
||||
@ApiModelProperty("身份证正面图路径")
|
||||
private String frontPath;
|
||||
/** 身份证反面图路径 */
|
||||
@ApiModelProperty("身份证反面图路径")
|
||||
private String reverseSidePath;
|
||||
/** 银行卡图路径 */
|
||||
@ApiModelProperty("银行卡图路径")
|
||||
private String bankCardPath;
|
||||
/** 关联公司Id */
|
||||
@ApiModelProperty("关联公司Id")
|
||||
private Long companyId;
|
||||
/** 帐号状态(0正常 1停用) */
|
||||
@ApiModelProperty("帐号状态(0正常 1停用)")
|
||||
private String status;
|
||||
|
||||
}
|
@ -0,0 +1,108 @@
|
||||
package com.ruoyi.zbf.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import com.ruoyi.zbf.domain.ZbfMessage;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.ruoyi.common.annotation.RepeatSubmit;
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.zbf.bo.ZbfMessageQueryBo;
|
||||
import com.ruoyi.zbf.service.IZbfMessageService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
|
||||
/**
|
||||
* 消息Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-31
|
||||
*/
|
||||
@Api(value = "消息控制器", tags = {"消息管理"})
|
||||
@RequiredArgsConstructor(onConstructor_ = @Autowired)
|
||||
@RestController
|
||||
@RequestMapping("/zbf/message")
|
||||
public class ZbfMessageController extends BaseController {
|
||||
|
||||
private final IZbfMessageService iZbfMessageService;
|
||||
|
||||
/**
|
||||
* 查询消息列表
|
||||
*/
|
||||
@ApiOperation("查询消息列表")
|
||||
@PreAuthorize("@ss.hasPermi('zbf:message:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<ZbfMessage> list(@Validated ZbfMessageQueryBo bo) {
|
||||
return iZbfMessageService.queryPageList(bo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出消息列表
|
||||
*/
|
||||
@ApiOperation("导出消息列表")
|
||||
@PreAuthorize("@ss.hasPermi('zbf:message:export')")
|
||||
@Log(title = "消息", businessType = BusinessType.EXPORT)
|
||||
@GetMapping("/export")
|
||||
public AjaxResult<ZbfMessage> export(@Validated ZbfMessageQueryBo bo) {
|
||||
List<ZbfMessage> list = iZbfMessageService.queryList(bo);
|
||||
ExcelUtil<ZbfMessage> util = new ExcelUtil<ZbfMessage>(ZbfMessage.class);
|
||||
return util.exportExcel(list, "消息");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取消息详细信息
|
||||
*/
|
||||
@ApiOperation("获取消息详细信息")
|
||||
@PreAuthorize("@ss.hasPermi('zbf:message:query')")
|
||||
@GetMapping("/{id}")
|
||||
public AjaxResult<ZbfMessage> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable("id") Long id) {
|
||||
return AjaxResult.success(iZbfMessageService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增消息
|
||||
*/
|
||||
@ApiOperation("新增消息")
|
||||
@PreAuthorize("@ss.hasPermi('zbf:message:add')")
|
||||
@Log(title = "消息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit
|
||||
@PostMapping()
|
||||
public AjaxResult<Void> add(@Validated @RequestBody ZbfMessage bo) {
|
||||
return toAjax(iZbfMessageService.insert(bo) ? 1 : 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改消息
|
||||
*/
|
||||
@ApiOperation("修改消息")
|
||||
@PreAuthorize("@ss.hasPermi('zbf:message:edit')")
|
||||
@Log(title = "消息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit
|
||||
@PutMapping()
|
||||
public AjaxResult<Void> edit(@Validated @RequestBody ZbfMessage bo) {
|
||||
return toAjax(iZbfMessageService.update(bo) ? 1 : 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除消息
|
||||
*/
|
||||
@ApiOperation("删除消息")
|
||||
@PreAuthorize("@ss.hasPermi('zbf:message:remove')")
|
||||
@Log(title = "消息" , businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] ids) {
|
||||
return toAjax(iZbfMessageService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
|
||||
}
|
||||
}
|
133
ruoyi-system/src/main/java/com/ruoyi/zbf/domain/ZbfMessage.java
Normal file
133
ruoyi-system/src/main/java/com/ruoyi/zbf/domain/ZbfMessage.java
Normal file
@ -0,0 +1,133 @@
|
||||
package com.ruoyi.zbf.domain;
|
||||
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.Accessors;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalTime;
|
||||
import java.time.LocalDate;
|
||||
|
||||
/**
|
||||
* 消息对象 zbf_message
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-31
|
||||
*/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@Accessors(chain = true)
|
||||
@TableName("zbf_message")
|
||||
@ApiModel("消息视图对象")
|
||||
public class ZbfMessage implements Serializable {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/** 主键自增ID */
|
||||
@ApiModelProperty("主键自增ID")
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
/** 发送类型(0系统 1务工者 2包工头 3分包商 4总包方) */
|
||||
@Excel(name = "发送类型" , readConverterExp = "0=系统,1=务工者,2=包工头,3=分包商,4=总包方")
|
||||
@ApiModelProperty("发送类型(0系统 1务工者 2包工头 3分包商 4总包方)")
|
||||
private String senderType;
|
||||
|
||||
/** 发送人 */
|
||||
@Excel(name = "发送人")
|
||||
@ApiModelProperty("发送人")
|
||||
private Long senderId;
|
||||
|
||||
/** 接收类型(1务工者 2包工头 3分包商 4总包方) */
|
||||
@Excel(name = "接收类型" , readConverterExp = "1=务工者,2=包工头,3=分包商,4=总包方")
|
||||
@ApiModelProperty("接收类型(1务工者 2包工头 3分包商 4总包方)")
|
||||
private String recipientType;
|
||||
|
||||
/** 接收人 */
|
||||
@Excel(name = "接收人")
|
||||
@ApiModelProperty("接收人")
|
||||
private Long recipientId;
|
||||
|
||||
/** 标题 */
|
||||
@Excel(name = "标题")
|
||||
@ApiModelProperty("标题")
|
||||
private String headline;
|
||||
|
||||
/** 副标题 */
|
||||
@Excel(name = "副标题")
|
||||
@ApiModelProperty("副标题")
|
||||
private String subheading;
|
||||
|
||||
/** 表ID */
|
||||
@Excel(name = "表ID")
|
||||
@ApiModelProperty("表ID")
|
||||
private Long tableId;
|
||||
|
||||
/** 表名 */
|
||||
@Excel(name = "表名")
|
||||
@ApiModelProperty("表名")
|
||||
private String tableName;
|
||||
|
||||
/** 大类型(字典bgt_message_large_type) */
|
||||
@Excel(name = "大类型" , readConverterExp = "字=典bgt_message_large_type")
|
||||
@ApiModelProperty("大类型(字典bgt_message_large_type)")
|
||||
private String messageLargeType;
|
||||
|
||||
/** 小类型(字典bgt_message_small_type) */
|
||||
@Excel(name = "小类型" , readConverterExp = "字=典bgt_message_small_type")
|
||||
@ApiModelProperty("小类型(字典bgt_message_small_type)")
|
||||
private String messageSmallType;
|
||||
|
||||
/** 读状态(0未读 1已读) */
|
||||
@Excel(name = "读状态" , readConverterExp = "0=未读,1=已读")
|
||||
@ApiModelProperty("读状态(0未读 1已读)")
|
||||
private String readStatus;
|
||||
|
||||
/** 删除标志(0代表存在 2代表删除) */
|
||||
@Excel(name = "删除标志" , readConverterExp = "0=代表存在,2=代表删除")
|
||||
@ApiModelProperty("删除标志(0代表存在 2代表删除)")
|
||||
private String delFlag;
|
||||
|
||||
/** 创建者 */
|
||||
@Excel(name = "创建者")
|
||||
@ApiModelProperty("创建者")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private String createBy;
|
||||
|
||||
/** 创建时间 */
|
||||
@Excel(name = "创建时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty("创建时间")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private LocalDateTime createTime;
|
||||
|
||||
/** 更新者 */
|
||||
@Excel(name = "更新者")
|
||||
@ApiModelProperty("更新者")
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
private String updateBy;
|
||||
|
||||
/** 更新时间 */
|
||||
@Excel(name = "更新时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty("更新时间")
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
/** 备注 */
|
||||
@Excel(name = "备注")
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
/** 是否需要操作(0不需要 1需要 2已操作) */
|
||||
@Excel(name = "是否需要操作" , readConverterExp = "0=不需要,1=需要,2=已操作")
|
||||
@ApiModelProperty("是否需要操作(0不需要 1需要 2已操作)")
|
||||
private String isOperation;
|
||||
|
||||
}
|
@ -0,0 +1,48 @@
|
||||
package com.ruoyi.zbf.domain.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 总包方项目对象 zbf_project
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-17
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
@ApiModel("总包方项目新增视图对象")
|
||||
public class ZbfProjectAddDTO {
|
||||
|
||||
@ApiModelProperty("单位名称")
|
||||
private String unitName;
|
||||
|
||||
@ApiModelProperty("统一社会信用代码")
|
||||
private String creditCode;
|
||||
|
||||
@ApiModelProperty("项目名称")
|
||||
private String projectName;
|
||||
|
||||
@ApiModelProperty("项目图片")
|
||||
private String projectImg;
|
||||
|
||||
@ApiModelProperty("项目地址")
|
||||
private String projectAddress;
|
||||
|
||||
@ApiModelProperty("联系人")
|
||||
private String contactPerson;
|
||||
|
||||
@ApiModelProperty("联系电话")
|
||||
private String contactPhone;
|
||||
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@ApiModelProperty("标段列表")
|
||||
private List<ZbfProjectSectionAddDTO> sectionList;
|
||||
|
||||
}
|
@ -0,0 +1,32 @@
|
||||
package com.ruoyi.zbf.domain.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* 总包方项目对象 zbf_project
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-17
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
@ApiModel("总包方项目列表视图对象")
|
||||
public class ZbfProjectListDTO {
|
||||
|
||||
/** 分页大小 */
|
||||
@ApiModelProperty("分页大小")
|
||||
private Integer pageSize;
|
||||
/** 当前页数 */
|
||||
@ApiModelProperty("当前页数")
|
||||
private Integer pageNum;
|
||||
|
||||
@ApiModelProperty("项目名称")
|
||||
private String projectName;
|
||||
|
||||
@ApiModelProperty("项目状态(0-未开工,1-已开工,2已竣工,3已停工)")
|
||||
private String projectStatus;
|
||||
|
||||
}
|
@ -0,0 +1,30 @@
|
||||
package com.ruoyi.zbf.domain.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 总包方项目标段对象 zbf_project_section
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-17
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
@ApiModel("总包方项目标段新增视图对象")
|
||||
public class ZbfProjectSectionAddDTO {
|
||||
|
||||
@ApiModelProperty("标段名称")
|
||||
private String sectionName;
|
||||
|
||||
@ApiModelProperty("标段描述")
|
||||
private String sectionDescribe;
|
||||
|
||||
@ApiModelProperty("分包列表")
|
||||
private List<ZbfProjectSubcontractingAddDTO> subList;
|
||||
|
||||
}
|
@ -0,0 +1,37 @@
|
||||
package com.ruoyi.zbf.domain.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 总包方项目分包对象 zbf_project_subcontracting
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-17
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
@ApiModel("总包方项目分包新增视图对象")
|
||||
public class ZbfProjectSubcontractingAddDTO {
|
||||
|
||||
|
||||
@ApiModelProperty("分包主题")
|
||||
private String subName;
|
||||
|
||||
@ApiModelProperty("分包描述")
|
||||
private String subDescribe;
|
||||
|
||||
@ApiModelProperty("分包金额")
|
||||
private BigDecimal subAmount;
|
||||
|
||||
@ApiModelProperty("资质要求")
|
||||
private String qualification;
|
||||
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
}
|
@ -0,0 +1,22 @@
|
||||
package com.ruoyi.zbf.domain.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@ApiModel("包工头项目统计")
|
||||
public class ZbfProjectCountVO {
|
||||
|
||||
@ApiModelProperty("项目总数")
|
||||
private Integer allCount;
|
||||
|
||||
@ApiModelProperty("在建总数")
|
||||
private Integer startCount;
|
||||
|
||||
@ApiModelProperty("完成总数")
|
||||
private Integer completeCount;
|
||||
|
||||
|
||||
|
||||
}
|
@ -0,0 +1,34 @@
|
||||
package com.ruoyi.zbf.domain.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@ApiModel("分包商项目列表")
|
||||
public class ZbfProjectListVO {
|
||||
|
||||
@ApiModelProperty("主键ID")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty("项目名称")
|
||||
private String projectName;
|
||||
|
||||
@ApiModelProperty("单位名称")
|
||||
private String unitName;
|
||||
|
||||
@ApiModelProperty("项目地址")
|
||||
private String projectAddress;
|
||||
|
||||
@ApiModelProperty("项目图片")
|
||||
private String projectImg;
|
||||
|
||||
@ApiModelProperty("项目状态(0-未开工,1-已开工,2已竣工,3已停工)")
|
||||
private String projectStatus;
|
||||
|
||||
@ApiModelProperty("标段列表")
|
||||
private List<ZbfProjectSectionListVO> sectionList;
|
||||
|
||||
}
|
@ -0,0 +1,29 @@
|
||||
package com.ruoyi.zbf.domain.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@ApiModel("分包商项目标段列表")
|
||||
public class ZbfProjectSectionListVO {
|
||||
|
||||
@ApiModelProperty("主键ID")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty("项目ID")
|
||||
private Long projectId;
|
||||
/** 标段名称 */
|
||||
@ApiModelProperty("标段名称")
|
||||
private String sectionName;
|
||||
|
||||
@ApiModelProperty("项目地址")
|
||||
private String projectAddress;
|
||||
|
||||
@ApiModelProperty("分包列表")
|
||||
private List<ZbfProjectSubcontractingListVO> subList;
|
||||
|
||||
|
||||
}
|
@ -0,0 +1,42 @@
|
||||
package com.ruoyi.zbf.domain.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
@ApiModel("分包商项目分包列表")
|
||||
public class ZbfProjectSubcontractingListVO {
|
||||
|
||||
|
||||
@ApiModelProperty("主键ID")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty("项目ID")
|
||||
private Long projectId;
|
||||
|
||||
@ApiModelProperty("项目地址")
|
||||
private String projectAddress;
|
||||
|
||||
/** 标段ID */
|
||||
@ApiModelProperty("标段ID")
|
||||
private Long sectionId;
|
||||
/** 分包主题 */
|
||||
@ApiModelProperty("分包主题")
|
||||
private String subName;
|
||||
/** 分包描述 */
|
||||
@ApiModelProperty("分包描述")
|
||||
private String subDescribe;
|
||||
/** 分包金额 */
|
||||
@ApiModelProperty("分包金额")
|
||||
private BigDecimal subAmount;
|
||||
/** 资质要求 */
|
||||
@ApiModelProperty("资质要求")
|
||||
private String qualification;
|
||||
|
||||
@ApiModelProperty("申请状态(0=申请中,1=已同意,2=已拒绝,3=已取消)")
|
||||
private String applyStatus;
|
||||
|
||||
}
|
@ -0,0 +1,18 @@
|
||||
package com.ruoyi.zbf.mapper;
|
||||
|
||||
import com.ruoyi.zbf.domain.ZbfMessage;
|
||||
import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
|
||||
import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
|
||||
import org.apache.ibatis.annotations.CacheNamespace;
|
||||
|
||||
/**
|
||||
* 消息Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-31
|
||||
*/
|
||||
// 如使需切换数据源 请勿使用缓存 会造成数据不一致现象
|
||||
@CacheNamespace(implementation = MybatisPlusRedisCache.class, eviction = MybatisPlusRedisCache.class)
|
||||
public interface ZbfMessageMapper extends BaseMapperPlus<ZbfMessage> {
|
||||
|
||||
}
|
@ -31,4 +31,18 @@ public interface ZbfProjectMapper extends BaseMapperPlus<ZbfProject> {
|
||||
|
||||
// 查询分包商已竣工的项目列表
|
||||
Page<FbsProjectListVO> completeList(@Param("page") Page<FbsProjectListDTO> page, @Param("dto") FbsProjectListDTO dto);
|
||||
|
||||
// 查询分包商项目切换列表
|
||||
Page<FbsProjectListVO> switchList(@Param("page") Page<FbsProjectListDTO> page, @Param("dto") FbsProjectListDTO dto);
|
||||
|
||||
// 申请中的项目列表统计
|
||||
Integer applyCount(@Param("fbsUserId") Long fbsUserId);
|
||||
|
||||
// 已加入的项目列表统计
|
||||
Integer joinCount(@Param("fbsUserId") Long fbsUserId);
|
||||
|
||||
// 已竣工的项目列表统计
|
||||
Integer completeCount(@Param("fbsUserId") Long fbsUserId);
|
||||
|
||||
|
||||
}
|
||||
|
@ -0,0 +1,18 @@
|
||||
package com.ruoyi.zbf.mapper;
|
||||
|
||||
import com.ruoyi.common.core.domain.entity.ZbfUser;
|
||||
import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
|
||||
import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
|
||||
import org.apache.ibatis.annotations.CacheNamespace;
|
||||
|
||||
/**
|
||||
* APP总包方用户Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-31
|
||||
*/
|
||||
// 如使需切换数据源 请勿使用缓存 会造成数据不一致现象
|
||||
@CacheNamespace(implementation = MybatisPlusRedisCache.class, eviction = MybatisPlusRedisCache.class)
|
||||
public interface ZbfUserMapper extends BaseMapperPlus<ZbfUser> {
|
||||
|
||||
}
|
@ -0,0 +1,60 @@
|
||||
package com.ruoyi.zbf.service;
|
||||
|
||||
import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.zbf.bo.ZbfMessageQueryBo;
|
||||
import com.ruoyi.zbf.domain.ZbfMessage;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 消息Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-31
|
||||
*/
|
||||
public interface IZbfMessageService extends IServicePlus<ZbfMessage> {
|
||||
/**
|
||||
* 查询单个
|
||||
* @return
|
||||
*/
|
||||
ZbfMessage queryById(Long id);
|
||||
|
||||
/**
|
||||
* 查询列表
|
||||
*/
|
||||
TableDataInfo<ZbfMessage> queryPageList(ZbfMessageQueryBo bo);
|
||||
|
||||
/**
|
||||
* 查询列表
|
||||
*/
|
||||
List<ZbfMessage> queryList(ZbfMessageQueryBo bo);
|
||||
|
||||
/**
|
||||
* 根据新增业务对象插入消息
|
||||
* @param bo 消息新增业务对象
|
||||
* @return
|
||||
*/
|
||||
Boolean insert(ZbfMessage bo);
|
||||
|
||||
/**
|
||||
* 根据编辑业务对象修改消息
|
||||
* @param bo 消息编辑业务对象
|
||||
* @return
|
||||
*/
|
||||
Boolean update(ZbfMessage bo);
|
||||
|
||||
/**
|
||||
* 校验并删除数据
|
||||
* @param ids 主键集合
|
||||
* @param isValid 是否校验,true-删除前校验,false-不校验
|
||||
* @return
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
|
||||
/**
|
||||
* 发送消息
|
||||
*/
|
||||
Boolean sendAMessage(ZbfMessage bo);
|
||||
}
|
@ -5,9 +5,14 @@ import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.fbs.domain.dto.FbsProjectListDTO;
|
||||
import com.ruoyi.fbs.domain.vo.FbsProjectDetailVO;
|
||||
import com.ruoyi.fbs.domain.vo.FbsProjectListCountVO;
|
||||
import com.ruoyi.fbs.domain.vo.FbsProjectListVO;
|
||||
import com.ruoyi.zbf.bo.ZbfProjectQueryBo;
|
||||
import com.ruoyi.zbf.domain.ZbfProject;
|
||||
import com.ruoyi.zbf.domain.dto.ZbfProjectAddDTO;
|
||||
import com.ruoyi.zbf.domain.dto.ZbfProjectListDTO;
|
||||
import com.ruoyi.zbf.domain.vo.ZbfProjectCountVO;
|
||||
import com.ruoyi.zbf.domain.vo.ZbfProjectListVO;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@ -77,6 +82,16 @@ public interface IZbfProjectService extends IServicePlus<ZbfProject> {
|
||||
*/
|
||||
TableDataInfo<FbsProjectListVO> completeList(FbsProjectListDTO dto);
|
||||
|
||||
/**
|
||||
* 分包商查询我的项目列表-项目切换
|
||||
*/
|
||||
TableDataInfo<FbsProjectListVO> switchList(FbsProjectListDTO dto);
|
||||
|
||||
/**
|
||||
* 分包商查询自己的项目列表数量统计
|
||||
*/
|
||||
FbsProjectListCountVO myListCount();
|
||||
|
||||
/**
|
||||
* 分包商查看可报名项目详情
|
||||
*/
|
||||
@ -92,4 +107,18 @@ public interface IZbfProjectService extends IServicePlus<ZbfProject> {
|
||||
*/
|
||||
FbsProjectDetailVO joinOrCompleteDetail(Long projectId);
|
||||
|
||||
/**
|
||||
* 总包方新增项目
|
||||
*/
|
||||
Boolean add(ZbfProjectAddDTO dto);
|
||||
|
||||
/**
|
||||
* 总包方查询我的项目列表
|
||||
*/
|
||||
TableDataInfo<ZbfProjectListVO> queryZbfList(ZbfProjectListDTO dto);
|
||||
|
||||
/**
|
||||
* 总包方查询自建项目统计
|
||||
*/
|
||||
ZbfProjectCountVO projectCount();
|
||||
}
|
||||
|
@ -52,4 +52,9 @@ public interface IZbfProjectSubcontractingApplyService extends IServicePlus<ZbfP
|
||||
* @return
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
|
||||
/**
|
||||
* 总包方选择分包商
|
||||
*/
|
||||
Boolean choose(Long id);
|
||||
}
|
||||
|
@ -0,0 +1,60 @@
|
||||
package com.ruoyi.zbf.service;
|
||||
|
||||
import com.ruoyi.common.core.domain.entity.ZbfUser;
|
||||
import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.zbf.bo.ZbfUserQueryBo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* APP总包方用户Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-31
|
||||
*/
|
||||
public interface IZbfUserService extends IServicePlus<ZbfUser> {
|
||||
/**
|
||||
* 查询单个
|
||||
* @return
|
||||
*/
|
||||
ZbfUser queryById(Long id);
|
||||
|
||||
/**
|
||||
* 查询列表
|
||||
*/
|
||||
TableDataInfo<ZbfUser> queryPageList(ZbfUserQueryBo bo);
|
||||
|
||||
/**
|
||||
* 查询列表
|
||||
*/
|
||||
List<ZbfUser> queryList(ZbfUserQueryBo bo);
|
||||
|
||||
/**
|
||||
* 根据新增业务对象插入APP总包方用户
|
||||
* @param bo APP总包方用户新增业务对象
|
||||
* @return
|
||||
*/
|
||||
Boolean insert(ZbfUser bo);
|
||||
|
||||
/**
|
||||
* 根据编辑业务对象修改APP总包方用户
|
||||
* @param bo APP总包方用户编辑业务对象
|
||||
* @return
|
||||
*/
|
||||
Boolean update(ZbfUser bo);
|
||||
|
||||
/**
|
||||
* 校验并删除数据
|
||||
* @param ids 主键集合
|
||||
* @param isValid 是否校验,true-删除前校验,false-不校验
|
||||
* @return
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
|
||||
/**
|
||||
* 通过电话查询用户
|
||||
*/
|
||||
ZbfUser selectUserByPhone(String phone);
|
||||
}
|
@ -0,0 +1,99 @@
|
||||
package com.ruoyi.zbf.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.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.utils.PageUtils;
|
||||
import com.ruoyi.zbf.bo.ZbfMessageQueryBo;
|
||||
import com.ruoyi.zbf.domain.ZbfMessage;
|
||||
import com.ruoyi.zbf.mapper.ZbfMessageMapper;
|
||||
import com.ruoyi.zbf.service.IZbfMessageService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 消息Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-31
|
||||
*/
|
||||
@Service
|
||||
public class ZbfMessageServiceImpl extends ServicePlusImpl<ZbfMessageMapper, ZbfMessage> implements IZbfMessageService {
|
||||
|
||||
@Override
|
||||
public ZbfMessage queryById(Long id){
|
||||
return getById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TableDataInfo<ZbfMessage> queryPageList(ZbfMessageQueryBo bo) {
|
||||
Page<ZbfMessage> result = page(PageUtils.buildPage(), buildQueryWrapper(bo));
|
||||
return PageUtils.buildDataInfo(result);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ZbfMessage> queryList(ZbfMessageQueryBo bo) {
|
||||
return list(buildQueryWrapper(bo));
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<ZbfMessage> buildQueryWrapper(ZbfMessageQueryBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<ZbfMessage> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getSenderType()), ZbfMessage::getSenderType, bo.getSenderType());
|
||||
lqw.eq(bo.getSenderId() != null, ZbfMessage::getSenderId, bo.getSenderId());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getRecipientType()), ZbfMessage::getRecipientType, bo.getRecipientType());
|
||||
lqw.eq(bo.getRecipientId() != null, ZbfMessage::getRecipientId, bo.getRecipientId());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getHeadline()), ZbfMessage::getHeadline, bo.getHeadline());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getSubheading()), ZbfMessage::getSubheading, bo.getSubheading());
|
||||
lqw.eq(bo.getTableId() != null, ZbfMessage::getTableId, bo.getTableId());
|
||||
lqw.like(StrUtil.isNotBlank(bo.getTableName()), ZbfMessage::getTableName, bo.getTableName());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getMessageLargeType()), ZbfMessage::getMessageLargeType, bo.getMessageLargeType());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getMessageSmallType()), ZbfMessage::getMessageSmallType, bo.getMessageSmallType());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getReadStatus()), ZbfMessage::getReadStatus, bo.getReadStatus());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getIsOperation()), ZbfMessage::getIsOperation, bo.getIsOperation());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean insert(ZbfMessage bo) {
|
||||
ZbfMessage add = BeanUtil.toBean(bo, ZbfMessage.class);
|
||||
validEntityBeforeSave(add);
|
||||
return save(add);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean update(ZbfMessage bo) {
|
||||
ZbfMessage update = BeanUtil.toBean(bo, ZbfMessage.class);
|
||||
validEntityBeforeSave(update);
|
||||
return updateById(update);
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*
|
||||
* @param entity 实体类数据
|
||||
*/
|
||||
private void validEntityBeforeSave(ZbfMessage entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return removeByIds(ids);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean sendAMessage(ZbfMessage bo) {
|
||||
return save(bo);
|
||||
}
|
||||
}
|
@ -113,6 +113,7 @@ public class ZbfProjectSectionServiceImpl extends ServicePlusImpl<ZbfProjectSect
|
||||
for (ZbfProjectSubcontracting sub : subList){
|
||||
FbsProjectSubcontractingListVO fbsProjectSubcontractingListVO = new FbsProjectSubcontractingListVO();
|
||||
BeanUtil.copyProperties(sub, fbsProjectSubcontractingListVO);
|
||||
fbsProjectSubcontractingListVO.setProjectAddress(sectionListVO.getProjectAddress());
|
||||
subListVO.add(fbsProjectSubcontractingListVO);
|
||||
}
|
||||
sectionListVO.setSubList(subListVO);
|
||||
|
@ -8,19 +8,25 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.enums.ProjectStatus;
|
||||
import com.ruoyi.common.enums.SubcontractingApplyStatus;
|
||||
import com.ruoyi.common.utils.PageUtils;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.fbs.domain.dto.FbsProjectListDTO;
|
||||
import com.ruoyi.fbs.domain.vo.FbsProjectDetailVO;
|
||||
import com.ruoyi.fbs.domain.vo.FbsProjectListVO;
|
||||
import com.ruoyi.fbs.domain.vo.FbsProjectSectionListVO;
|
||||
import com.ruoyi.fbs.domain.vo.FbsProjectSubcontractingListVO;
|
||||
import com.ruoyi.fbs.domain.vo.*;
|
||||
import com.ruoyi.zbf.bo.ZbfProjectQueryBo;
|
||||
import com.ruoyi.zbf.domain.ZbfProject;
|
||||
import com.ruoyi.zbf.domain.ZbfProjectSection;
|
||||
import com.ruoyi.zbf.domain.ZbfProjectSubcontracting;
|
||||
import com.ruoyi.zbf.domain.ZbfProjectSubcontractingApply;
|
||||
import com.ruoyi.zbf.domain.dto.ZbfProjectAddDTO;
|
||||
import com.ruoyi.zbf.domain.dto.ZbfProjectListDTO;
|
||||
import com.ruoyi.zbf.domain.dto.ZbfProjectSectionAddDTO;
|
||||
import com.ruoyi.zbf.domain.dto.ZbfProjectSubcontractingAddDTO;
|
||||
import com.ruoyi.zbf.domain.vo.ZbfProjectCountVO;
|
||||
import com.ruoyi.zbf.domain.vo.ZbfProjectListVO;
|
||||
import com.ruoyi.zbf.domain.vo.ZbfProjectSectionListVO;
|
||||
import com.ruoyi.zbf.domain.vo.ZbfProjectSubcontractingListVO;
|
||||
import com.ruoyi.zbf.mapper.ZbfProjectMapper;
|
||||
import com.ruoyi.zbf.service.IZbfProjectSectionService;
|
||||
import com.ruoyi.zbf.service.IZbfProjectService;
|
||||
@ -28,11 +34,9 @@ import com.ruoyi.zbf.service.IZbfProjectSubcontractingApplyService;
|
||||
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.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
@ -47,70 +51,70 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
|
||||
@Autowired
|
||||
private IZbfProjectSectionService zbfProjectSectionService;
|
||||
@Autowired
|
||||
private IZbfProjectSubcontractingService zbfProjectSubcontractingService;
|
||||
private IZbfProjectSubcontractingService zbfProjectSubcontractingService;
|
||||
@Autowired
|
||||
private IZbfProjectSubcontractingApplyService zbfProjectSubcontractingApplyService;
|
||||
|
||||
@Override
|
||||
public ZbfProject queryById(Long id){
|
||||
return getById(id);
|
||||
}
|
||||
@Override
|
||||
public ZbfProject queryById(Long id) {
|
||||
return getById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TableDataInfo<ZbfProject> queryPageList(ZbfProjectQueryBo bo) {
|
||||
Page<ZbfProject> result = page(PageUtils.buildPage(), buildQueryWrapper(bo));
|
||||
return PageUtils.buildDataInfo(result);
|
||||
}
|
||||
@Override
|
||||
public TableDataInfo<ZbfProject> queryPageList(ZbfProjectQueryBo bo) {
|
||||
Page<ZbfProject> result = page(PageUtils.buildPage(), buildQueryWrapper(bo));
|
||||
return PageUtils.buildDataInfo(result);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ZbfProject> queryList(ZbfProjectQueryBo bo) {
|
||||
return list(buildQueryWrapper(bo));
|
||||
}
|
||||
@Override
|
||||
public List<ZbfProject> queryList(ZbfProjectQueryBo bo) {
|
||||
return list(buildQueryWrapper(bo));
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<ZbfProject> buildQueryWrapper(ZbfProjectQueryBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<ZbfProject> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getUserId() != null, ZbfProject::getUserId, bo.getUserId());
|
||||
lqw.like(StrUtil.isNotBlank(bo.getUnitName()), ZbfProject::getUnitName, bo.getUnitName());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getCreditCode()), ZbfProject::getCreditCode, bo.getCreditCode());
|
||||
lqw.like(StrUtil.isNotBlank(bo.getProjectName()), ZbfProject::getProjectName, bo.getProjectName());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getProjectImg()), ZbfProject::getProjectImg, bo.getProjectImg());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getProjectAddress()), ZbfProject::getProjectAddress, bo.getProjectAddress());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getContactPerson()), ZbfProject::getContactPerson, bo.getContactPerson());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getContactPhone()), ZbfProject::getContactPhone, bo.getContactPhone());
|
||||
return lqw;
|
||||
}
|
||||
private LambdaQueryWrapper<ZbfProject> buildQueryWrapper(ZbfProjectQueryBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<ZbfProject> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getUserId() != null, ZbfProject::getUserId, bo.getUserId());
|
||||
lqw.like(StrUtil.isNotBlank(bo.getUnitName()), ZbfProject::getUnitName, bo.getUnitName());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getCreditCode()), ZbfProject::getCreditCode, bo.getCreditCode());
|
||||
lqw.like(StrUtil.isNotBlank(bo.getProjectName()), ZbfProject::getProjectName, bo.getProjectName());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getProjectImg()), ZbfProject::getProjectImg, bo.getProjectImg());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getProjectAddress()), ZbfProject::getProjectAddress, bo.getProjectAddress());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getContactPerson()), ZbfProject::getContactPerson, bo.getContactPerson());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getContactPhone()), ZbfProject::getContactPhone, bo.getContactPhone());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean insert(ZbfProject bo) {
|
||||
ZbfProject add = BeanUtil.toBean(bo, ZbfProject.class);
|
||||
validEntityBeforeSave(add);
|
||||
return save(add);
|
||||
}
|
||||
@Override
|
||||
public Boolean insert(ZbfProject bo) {
|
||||
ZbfProject add = BeanUtil.toBean(bo, ZbfProject.class);
|
||||
validEntityBeforeSave(add);
|
||||
return save(add);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean update(ZbfProject bo) {
|
||||
ZbfProject update = BeanUtil.toBean(bo, ZbfProject.class);
|
||||
validEntityBeforeSave(update);
|
||||
return updateById(update);
|
||||
}
|
||||
@Override
|
||||
public Boolean update(ZbfProject bo) {
|
||||
ZbfProject update = BeanUtil.toBean(bo, ZbfProject.class);
|
||||
validEntityBeforeSave(update);
|
||||
return updateById(update);
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*
|
||||
* @param entity 实体类数据
|
||||
*/
|
||||
private void validEntityBeforeSave(ZbfProject entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*
|
||||
* @param entity 实体类数据
|
||||
*/
|
||||
private void validEntityBeforeSave(ZbfProject entity) {
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return removeByIds(ids);
|
||||
}
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if (isValid) {
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return removeByIds(ids);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TableDataInfo<FbsProjectListVO> signUpList(FbsProjectListDTO dto) {
|
||||
@ -121,34 +125,44 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
|
||||
Page<FbsProjectListVO> queryVOPage = baseMapper.signUpList(queryDTOPage, dto);
|
||||
//处理标段和分包
|
||||
for (FbsProjectListVO fbsProjectListVO : queryVOPage.getRecords()) {
|
||||
Long projectId = fbsProjectListVO.getId();
|
||||
Long projectId = fbsProjectListVO.getId();
|
||||
//查询项目下的所有申请
|
||||
List<ZbfProjectSubcontractingApply> applyList = zbfProjectSubcontractingApplyService.list(Wrappers.<ZbfProjectSubcontractingApply>lambdaQuery()
|
||||
.eq(ZbfProjectSubcontractingApply::getProjectId, projectId).eq(ZbfProjectSubcontractingApply::getFbsUserId, SecurityUtils.getAppUserId()));
|
||||
List<Long> applyIds = applyList.stream().map(ZbfProjectSubcontractingApply::getSubId).collect(Collectors.toList());
|
||||
.eq(ZbfProjectSubcontractingApply::getProjectId, projectId)
|
||||
.eq(ZbfProjectSubcontractingApply::getFbsUserId, SecurityUtils.getAppUserId()));
|
||||
HashMap<Long, String> map = applyList.stream()
|
||||
.collect(Collectors.toMap(
|
||||
ZbfProjectSubcontractingApply::getSubId,
|
||||
ZbfProjectSubcontractingApply::getApplyStatus,
|
||||
(existing, replacement) -> replacement,
|
||||
HashMap::new
|
||||
));
|
||||
|
||||
//标段处理
|
||||
List<FbsProjectSectionListVO> sectionListVO = new ArrayList<>();
|
||||
//查询项目下的所有标段
|
||||
List<ZbfProjectSection> sectionList = zbfProjectSectionService.list(Wrappers.<ZbfProjectSection>lambdaQuery()
|
||||
.eq(ZbfProjectSection::getProjectId, projectId));
|
||||
for (ZbfProjectSection zbfProjectSection : sectionList){
|
||||
for (ZbfProjectSection zbfProjectSection : sectionList) {
|
||||
//分包处理
|
||||
List<FbsProjectSubcontractingListVO> subListVO = new ArrayList<>();
|
||||
//查询标段下的所有未承接的分包
|
||||
//查询标段下的所有的分包
|
||||
List<ZbfProjectSubcontracting> subList = zbfProjectSubcontractingService.list(Wrappers.<ZbfProjectSubcontracting>lambdaQuery()
|
||||
.eq(ZbfProjectSubcontracting::getSectionId, zbfProjectSection.getId())
|
||||
.isNull(ZbfProjectSubcontracting::getUserId));
|
||||
.eq(ZbfProjectSubcontracting::getSectionId, zbfProjectSection.getId())
|
||||
//.isNull(ZbfProjectSubcontracting::getUserId)
|
||||
);
|
||||
//排除掉已申请的分包
|
||||
for (ZbfProjectSubcontracting sub : subList){
|
||||
if(applyIds.contains(sub.getId())){
|
||||
continue;
|
||||
}
|
||||
for (ZbfProjectSubcontracting sub : subList) {
|
||||
FbsProjectSubcontractingListVO fbsProjectSubcontractingListVO = new FbsProjectSubcontractingListVO();
|
||||
BeanUtil.copyProperties(sub, fbsProjectSubcontractingListVO);
|
||||
String applyStatus = map.get(sub.getId());
|
||||
fbsProjectSubcontractingListVO.setApplyStatus(applyStatus);
|
||||
if (sub.getUserId() != null && !sub.getUserId().equals(SecurityUtils.getAppUserId())) {
|
||||
fbsProjectSubcontractingListVO.setApplyStatus(SubcontractingApplyStatus.CHOOSE.getCode());
|
||||
}
|
||||
subListVO.add(fbsProjectSubcontractingListVO);
|
||||
}
|
||||
if(CollectionUtil.isEmpty(subListVO)){
|
||||
if (CollectionUtil.isEmpty(subListVO)) {
|
||||
continue;
|
||||
}
|
||||
FbsProjectSectionListVO fbsProjectSectionListVO = new FbsProjectSectionListVO();
|
||||
@ -158,7 +172,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
|
||||
sectionListVO.add(fbsProjectSectionListVO);
|
||||
}
|
||||
fbsProjectListVO.setSectionList(sectionListVO);
|
||||
}
|
||||
}
|
||||
return PageUtils.buildDataInfo(queryVOPage);
|
||||
}
|
||||
|
||||
@ -172,7 +186,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
|
||||
Page<FbsProjectListVO> queryVOPage = baseMapper.applyList(queryDTOPage, dto);
|
||||
//处理标段和分包
|
||||
for (FbsProjectListVO fbsProjectListVO : queryVOPage.getRecords()) {
|
||||
Long projectId = fbsProjectListVO.getId();
|
||||
Long projectId = fbsProjectListVO.getId();
|
||||
//查询项目下的所有已申请和已拒绝申请
|
||||
List<ZbfProjectSubcontractingApply> applyList = zbfProjectSubcontractingApplyService.list(Wrappers.<ZbfProjectSubcontractingApply>lambdaQuery()
|
||||
.eq(ZbfProjectSubcontractingApply::getProjectId, projectId)
|
||||
@ -185,22 +199,22 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
|
||||
//查询项目下的所有标段
|
||||
List<ZbfProjectSection> sectionList = zbfProjectSectionService.list(Wrappers.<ZbfProjectSection>lambdaQuery()
|
||||
.eq(ZbfProjectSection::getProjectId, projectId));
|
||||
for (ZbfProjectSection zbfProjectSection : sectionList){
|
||||
for (ZbfProjectSection zbfProjectSection : sectionList) {
|
||||
//分包处理
|
||||
List<FbsProjectSubcontractingListVO> subListVO = new ArrayList<>();
|
||||
//查询标段下的所有的分包
|
||||
List<ZbfProjectSubcontracting> subList = zbfProjectSubcontractingService.list(Wrappers.<ZbfProjectSubcontracting>lambdaQuery()
|
||||
.eq(ZbfProjectSubcontracting::getSectionId, zbfProjectSection.getId()));
|
||||
//排除掉未申请和已同意的分包
|
||||
for (ZbfProjectSubcontracting sub : subList){
|
||||
if(!applyIds.contains(sub.getId())){
|
||||
for (ZbfProjectSubcontracting sub : subList) {
|
||||
if (!applyIds.contains(sub.getId())) {
|
||||
continue;
|
||||
}
|
||||
FbsProjectSubcontractingListVO fbsProjectSubcontractingListVO = new FbsProjectSubcontractingListVO();
|
||||
BeanUtil.copyProperties(sub, fbsProjectSubcontractingListVO);
|
||||
subListVO.add(fbsProjectSubcontractingListVO);
|
||||
}
|
||||
if(CollectionUtil.isEmpty(subListVO)){
|
||||
if (CollectionUtil.isEmpty(subListVO)) {
|
||||
continue;
|
||||
}
|
||||
FbsProjectSectionListVO fbsProjectSectionListVO = new FbsProjectSectionListVO();
|
||||
@ -223,7 +237,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
|
||||
Page<FbsProjectListVO> queryVOPage = baseMapper.joinList(queryDTOPage, dto);
|
||||
//处理标段和分包
|
||||
for (FbsProjectListVO fbsProjectListVO : queryVOPage.getRecords()) {
|
||||
Long projectId = fbsProjectListVO.getId();
|
||||
Long projectId = fbsProjectListVO.getId();
|
||||
fbsProjectListVO.setSectionList(handleSection(projectId));
|
||||
}
|
||||
return PageUtils.buildDataInfo(queryVOPage);
|
||||
@ -238,12 +252,32 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
|
||||
Page<FbsProjectListVO> queryVOPage = baseMapper.completeList(queryDTOPage, dto);
|
||||
//处理标段和分包
|
||||
for (FbsProjectListVO fbsProjectListVO : queryVOPage.getRecords()) {
|
||||
Long projectId = fbsProjectListVO.getId();
|
||||
Long projectId = fbsProjectListVO.getId();
|
||||
fbsProjectListVO.setSectionList(handleSection(projectId));
|
||||
}
|
||||
return PageUtils.buildDataInfo(queryVOPage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TableDataInfo<FbsProjectListVO> switchList(FbsProjectListDTO dto) {
|
||||
Page<FbsProjectListDTO> queryDTOPage = new Page<>();
|
||||
queryDTOPage.setCurrent(dto.getPageNum());
|
||||
queryDTOPage.setSize(dto.getPageSize());
|
||||
dto.setFbsUserId(SecurityUtils.getAppUserId());
|
||||
Page<FbsProjectListVO> queryVOPage = baseMapper.switchList(queryDTOPage, dto);
|
||||
return PageUtils.buildDataInfo(queryVOPage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FbsProjectListCountVO myListCount() {
|
||||
FbsProjectListCountVO fbsProjectListCountVO = new FbsProjectListCountVO();
|
||||
Long appUserId = SecurityUtils.getAppUserId();
|
||||
fbsProjectListCountVO.setApplyCount(baseMapper.applyCount(appUserId));
|
||||
fbsProjectListCountVO.setJoinCount(baseMapper.joinCount(appUserId));
|
||||
fbsProjectListCountVO.setCompleteCount(baseMapper.completeCount(appUserId));
|
||||
return fbsProjectListCountVO;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FbsProjectDetailVO signUpDetail(Long projectId) {
|
||||
ZbfProject byId = getById(projectId);
|
||||
@ -251,31 +285,41 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
|
||||
|
||||
//查询项目下的所有申请
|
||||
List<ZbfProjectSubcontractingApply> applyList = zbfProjectSubcontractingApplyService.list(Wrappers.<ZbfProjectSubcontractingApply>lambdaQuery()
|
||||
.eq(ZbfProjectSubcontractingApply::getProjectId, projectId).eq(ZbfProjectSubcontractingApply::getFbsUserId, SecurityUtils.getAppUserId()));
|
||||
List<Long> applyIds = applyList.stream().map(ZbfProjectSubcontractingApply::getSubId).collect(Collectors.toList());
|
||||
|
||||
.eq(ZbfProjectSubcontractingApply::getProjectId, projectId)
|
||||
.eq(ZbfProjectSubcontractingApply::getFbsUserId, SecurityUtils.getAppUserId()));
|
||||
HashMap<Long, String> map = applyList.stream()
|
||||
.collect(Collectors.toMap(
|
||||
ZbfProjectSubcontractingApply::getSubId,
|
||||
ZbfProjectSubcontractingApply::getApplyStatus,
|
||||
(existing, replacement) -> replacement,
|
||||
HashMap::new
|
||||
));
|
||||
//标段处理
|
||||
List<FbsProjectSectionListVO> sectionListVO = new ArrayList<>();
|
||||
//查询项目下的所有标段
|
||||
List<ZbfProjectSection> sectionList = zbfProjectSectionService.list(Wrappers.<ZbfProjectSection>lambdaQuery()
|
||||
.eq(ZbfProjectSection::getProjectId, projectId));
|
||||
for (ZbfProjectSection zbfProjectSection : sectionList){
|
||||
for (ZbfProjectSection zbfProjectSection : sectionList) {
|
||||
//分包处理
|
||||
List<FbsProjectSubcontractingListVO> subListVO = new ArrayList<>();
|
||||
//查询标段下的所有未承接的分包
|
||||
//查询标段下的所有的分包
|
||||
List<ZbfProjectSubcontracting> subList = zbfProjectSubcontractingService.list(Wrappers.<ZbfProjectSubcontracting>lambdaQuery()
|
||||
.eq(ZbfProjectSubcontracting::getSectionId, zbfProjectSection.getId())
|
||||
.isNull(ZbfProjectSubcontracting::getUserId));
|
||||
.eq(ZbfProjectSubcontracting::getSectionId, zbfProjectSection.getId())
|
||||
//.isNull(ZbfProjectSubcontracting::getUserId)
|
||||
);
|
||||
//排除掉已申请的分包
|
||||
for (ZbfProjectSubcontracting sub : subList){
|
||||
if(applyIds.contains(sub.getId())){
|
||||
continue;
|
||||
}
|
||||
for (ZbfProjectSubcontracting sub : subList) {
|
||||
|
||||
FbsProjectSubcontractingListVO fbsProjectSubcontractingListVO = new FbsProjectSubcontractingListVO();
|
||||
BeanUtil.copyProperties(sub, fbsProjectSubcontractingListVO);
|
||||
String applyStatus = map.get(sub.getId());
|
||||
fbsProjectSubcontractingListVO.setApplyStatus(applyStatus);
|
||||
if (sub.getUserId() != null && !sub.getUserId().equals(SecurityUtils.getAppUserId())) {
|
||||
fbsProjectSubcontractingListVO.setApplyStatus(SubcontractingApplyStatus.CHOOSE.getCode());
|
||||
}
|
||||
subListVO.add(fbsProjectSubcontractingListVO);
|
||||
}
|
||||
if(CollectionUtil.isEmpty(subListVO)){
|
||||
if (CollectionUtil.isEmpty(subListVO)) {
|
||||
continue;
|
||||
}
|
||||
FbsProjectSectionListVO fbsProjectSectionListVO = new FbsProjectSectionListVO();
|
||||
@ -304,22 +348,22 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
|
||||
//查询项目下的所有标段
|
||||
List<ZbfProjectSection> sectionList = zbfProjectSectionService.list(Wrappers.<ZbfProjectSection>lambdaQuery()
|
||||
.eq(ZbfProjectSection::getProjectId, projectId));
|
||||
for (ZbfProjectSection zbfProjectSection : sectionList){
|
||||
for (ZbfProjectSection zbfProjectSection : sectionList) {
|
||||
//分包处理
|
||||
List<FbsProjectSubcontractingListVO> subListVO = new ArrayList<>();
|
||||
//查询标段下的所有的分包
|
||||
List<ZbfProjectSubcontracting> subList = zbfProjectSubcontractingService.list(Wrappers.<ZbfProjectSubcontracting>lambdaQuery()
|
||||
.eq(ZbfProjectSubcontracting::getSectionId, zbfProjectSection.getId()));
|
||||
//排除掉未申请和已同意的分包
|
||||
for (ZbfProjectSubcontracting sub : subList){
|
||||
if(!applyIds.contains(sub.getId())){
|
||||
for (ZbfProjectSubcontracting sub : subList) {
|
||||
if (!applyIds.contains(sub.getId())) {
|
||||
continue;
|
||||
}
|
||||
FbsProjectSubcontractingListVO fbsProjectSubcontractingListVO = new FbsProjectSubcontractingListVO();
|
||||
BeanUtil.copyProperties(sub, fbsProjectSubcontractingListVO);
|
||||
subListVO.add(fbsProjectSubcontractingListVO);
|
||||
}
|
||||
if(CollectionUtil.isEmpty(subListVO)){
|
||||
if (CollectionUtil.isEmpty(subListVO)) {
|
||||
continue;
|
||||
}
|
||||
FbsProjectSectionListVO fbsProjectSectionListVO = new FbsProjectSectionListVO();
|
||||
@ -350,7 +394,7 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
|
||||
//查询项目下的所有标段
|
||||
List<ZbfProjectSection> sectionList = zbfProjectSectionService.list(Wrappers.<ZbfProjectSection>lambdaQuery()
|
||||
.eq(ZbfProjectSection::getProjectId, projectId));
|
||||
for (ZbfProjectSection zbfProjectSection : sectionList){
|
||||
for (ZbfProjectSection zbfProjectSection : sectionList) {
|
||||
//分包处理
|
||||
List<FbsProjectSubcontractingListVO> subListVO = new ArrayList<>();
|
||||
//查询标段下的所有已承接的分包
|
||||
@ -358,12 +402,12 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
|
||||
.eq(ZbfProjectSubcontracting::getSectionId, zbfProjectSection.getId())
|
||||
.eq(ZbfProjectSubcontracting::getUserId, SecurityUtils.getAppUserId()));
|
||||
|
||||
for (ZbfProjectSubcontracting sub : subList){
|
||||
for (ZbfProjectSubcontracting sub : subList) {
|
||||
FbsProjectSubcontractingListVO fbsProjectSubcontractingListVO = new FbsProjectSubcontractingListVO();
|
||||
BeanUtil.copyProperties(sub, fbsProjectSubcontractingListVO);
|
||||
subListVO.add(fbsProjectSubcontractingListVO);
|
||||
}
|
||||
if(CollectionUtil.isEmpty(subListVO)){
|
||||
if (CollectionUtil.isEmpty(subListVO)) {
|
||||
continue;
|
||||
}
|
||||
FbsProjectSectionListVO fbsProjectSectionListVO = new FbsProjectSectionListVO();
|
||||
@ -374,4 +418,79 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
|
||||
}
|
||||
return sectionListVO;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean add(ZbfProjectAddDTO dto) {
|
||||
ZbfProject project = BeanUtil.copyProperties(dto, ZbfProject.class);
|
||||
project.setUserId(SecurityUtils.getAppUserId());
|
||||
boolean save = save(project);
|
||||
|
||||
for (ZbfProjectSectionAddDTO section : dto.getSectionList()) {
|
||||
ZbfProjectSection projectSection = BeanUtil.copyProperties(section, ZbfProjectSection.class);
|
||||
projectSection.setProjectId(project.getId());
|
||||
zbfProjectSectionService.save(projectSection);
|
||||
List<ZbfProjectSubcontracting> addList = new ArrayList<>();
|
||||
for (ZbfProjectSubcontractingAddDTO sub : section.getSubList()) {
|
||||
ZbfProjectSubcontracting projectSubcontracting = BeanUtil.copyProperties(sub, ZbfProjectSubcontracting.class);
|
||||
projectSubcontracting.setProjectId(project.getId());
|
||||
projectSubcontracting.setSectionId(projectSection.getId());
|
||||
addList.add(projectSubcontracting);
|
||||
}
|
||||
zbfProjectSubcontractingService.saveBatch(addList);
|
||||
}
|
||||
return save;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TableDataInfo<ZbfProjectListVO> queryZbfList(ZbfProjectListDTO dto) {
|
||||
LambdaQueryWrapper<ZbfProject> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.eq(ZbfProject::getUserId, SecurityUtils.getAppUserId());
|
||||
wrapper.like(StrUtil.isNotBlank(dto.getProjectName()), ZbfProject::getProjectName, dto.getProjectName());
|
||||
|
||||
Page<ZbfProject> result = page(PageUtils.buildPage(), wrapper);
|
||||
List<ZbfProjectListVO> zbfProjectListVOS = BeanUtil.copyToList(result.getRecords(), ZbfProjectListVO.class);
|
||||
|
||||
for (ZbfProjectListVO zbfProjectListVO : zbfProjectListVOS){
|
||||
//标段处理
|
||||
List<ZbfProjectSectionListVO> sectionListVO = new ArrayList<>();
|
||||
//查询项目下的所有标段
|
||||
List<ZbfProjectSection> sectionList = zbfProjectSectionService.list(Wrappers.<ZbfProjectSection>lambdaQuery()
|
||||
.eq(ZbfProjectSection::getProjectId, zbfProjectListVO.getId()));
|
||||
for (ZbfProjectSection zbfProjectSection : sectionList) {
|
||||
//分包处理
|
||||
List<ZbfProjectSubcontractingListVO> subListVO = new ArrayList<>();
|
||||
//查询标段下的所有的分包
|
||||
List<ZbfProjectSubcontracting> subList = zbfProjectSubcontractingService.list(Wrappers.<ZbfProjectSubcontracting>lambdaQuery()
|
||||
.eq(ZbfProjectSubcontracting::getSectionId, zbfProjectSection.getId()));
|
||||
|
||||
ZbfProjectSectionListVO zbfProjectSectionListVO = new ZbfProjectSectionListVO();
|
||||
BeanUtil.copyProperties(zbfProjectSection, zbfProjectSectionListVO);
|
||||
zbfProjectSectionListVO.setSubList(subListVO);
|
||||
sectionListVO.add(zbfProjectSectionListVO);
|
||||
}
|
||||
zbfProjectListVO.setSectionList(sectionListVO);
|
||||
}
|
||||
|
||||
Page<ZbfProjectListVO> zbfProjectListVOPage = new Page<>();
|
||||
zbfProjectListVOPage.setTotal(result.getTotal());
|
||||
zbfProjectListVOPage.setRecords(zbfProjectListVOS);
|
||||
|
||||
return PageUtils.buildDataInfo(zbfProjectListVOPage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ZbfProjectCountVO projectCount() {
|
||||
ZbfProjectCountVO zbfProjectCountVO = new ZbfProjectCountVO();
|
||||
|
||||
LambdaQueryWrapper<ZbfProject> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.eq(ZbfProject::getUserId, SecurityUtils.getAppUserId());
|
||||
List<ZbfProject> list = list(wrapper);
|
||||
zbfProjectCountVO.setAllCount(list.size());
|
||||
long startCount = list.stream().filter(zbfProject -> StrUtil.equals(zbfProject.getProjectStatus(), ProjectStatus.START.getCode())).count();
|
||||
long completeCcount = list.stream().filter(zbfProject -> StrUtil.equals(zbfProject.getProjectStatus(), ProjectStatus.COMPLETE.getCode())).count();
|
||||
zbfProjectCountVO.setStartCount((int) startCount);
|
||||
zbfProjectCountVO.setCompleteCount((int) completeCcount);
|
||||
return zbfProjectCountVO;
|
||||
}
|
||||
}
|
||||
|
@ -1,23 +1,43 @@
|
||||
package com.ruoyi.zbf.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.ruoyi.common.utils.PageUtils;
|
||||
import com.ruoyi.common.core.page.PagePlus;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
|
||||
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.ProjectStatus;
|
||||
import com.ruoyi.common.enums.SubcontractingApplyStatus;
|
||||
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.domain.FbsMessage;
|
||||
import com.ruoyi.fbs.service.IFbsMessageService;
|
||||
import com.ruoyi.zbf.bo.ZbfProjectSubcontractingApplyQueryBo;
|
||||
import com.ruoyi.zbf.domain.ZbfMessage;
|
||||
import com.ruoyi.zbf.domain.ZbfProject;
|
||||
import com.ruoyi.zbf.domain.ZbfProjectSubcontracting;
|
||||
import com.ruoyi.zbf.domain.ZbfProjectSubcontractingApply;
|
||||
import com.ruoyi.zbf.mapper.ZbfProjectSubcontractingApplyMapper;
|
||||
import com.ruoyi.zbf.service.IZbfMessageService;
|
||||
import com.ruoyi.zbf.service.IZbfProjectService;
|
||||
import com.ruoyi.zbf.service.IZbfProjectSubcontractingApplyService;
|
||||
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.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
import java.util.*;
|
||||
|
||||
import static com.ruoyi.common.constants.BgtMessageConstant.HEADLINE;
|
||||
import static com.ruoyi.common.constants.BgtMessageConstant.SUBHEADING;
|
||||
import static com.ruoyi.common.constants.FbsMessageConstant.*;
|
||||
import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.*;
|
||||
import static com.ruoyi.common.constants.ZbfMessageConstant.*;
|
||||
|
||||
/**
|
||||
* 总包方项目分包申请Service业务层处理
|
||||
@ -28,6 +48,16 @@ import java.util.Collection;
|
||||
@Service
|
||||
public class ZbfProjectSubcontractingApplyServiceImpl extends ServicePlusImpl<ZbfProjectSubcontractingApplyMapper, ZbfProjectSubcontractingApply> implements IZbfProjectSubcontractingApplyService {
|
||||
|
||||
@Autowired
|
||||
private IZbfProjectService projectService;
|
||||
@Autowired
|
||||
private IZbfProjectSubcontractingService projectSubcontractingService;
|
||||
@Autowired
|
||||
private IFbsMessageService fbsMessageService;
|
||||
@Autowired
|
||||
private IZbfMessageService zbfMessageService;
|
||||
|
||||
|
||||
@Override
|
||||
public ZbfProjectSubcontractingApply queryById(Long id){
|
||||
return getById(id);
|
||||
@ -56,10 +86,65 @@ public class ZbfProjectSubcontractingApplyServiceImpl extends ServicePlusImpl<Zb
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean insert(ZbfProjectSubcontractingApply bo) {
|
||||
ZbfProjectSubcontractingApply add = BeanUtil.toBean(bo, ZbfProjectSubcontractingApply.class);
|
||||
Long appUserId = SecurityUtils.getAppUserId();
|
||||
add.setFbsUserId(appUserId);
|
||||
validEntityBeforeSave(add);
|
||||
return save(add);
|
||||
ZbfProjectSubcontracting sub = projectSubcontractingService.getById(bo.getSubId());
|
||||
if(sub!=null && sub.getUserId()!=null){
|
||||
throw new BaseException("该分包已被承接");
|
||||
}
|
||||
|
||||
List<ZbfProjectSubcontractingApply> list = list(Wrappers.<ZbfProjectSubcontractingApply>lambdaQuery()
|
||||
.eq(ZbfProjectSubcontractingApply::getSubId, bo.getSubId())
|
||||
.eq(ZbfProjectSubcontractingApply::getApplyStatus, SubcontractingApplyStatus.APPLY.getCode())
|
||||
.eq(ZbfProjectSubcontractingApply::getFbsUserId, appUserId)
|
||||
);
|
||||
if(CollectionUtil.isNotEmpty(list)){
|
||||
throw new BaseException("您已经申请过该分包");
|
||||
}
|
||||
boolean save = save(add);
|
||||
//给分包商自己发消息
|
||||
// HashMap<String, String> mp = new HashMap<>();
|
||||
// mp.put("projectName", projectService.getById(bo.getProjectId()).getProjectName());
|
||||
// mp.put("subName", projectSubcontractingService.getById(bo.getSubId()).getSubName());
|
||||
// mp.put("auditor", SecurityUtils.getUsername());
|
||||
// Map<String, String> map = fbsMessage(mp, FBS_TYPE_TASK, true);
|
||||
// FbsMessage fbsMessage = new FbsMessage()
|
||||
// .setSenderType(USERTYPE_SYSTEM)
|
||||
// .setSenderId(SYSTEM_ID)
|
||||
// .setRecipientType(USERTYPE_FBS)
|
||||
// .setRecipientId(SecurityUtils.getAppUserId())
|
||||
// .setHeadline(map.get(HEADLINE))
|
||||
// .setSubheading(map.get(SUBHEADING))
|
||||
// .setTableId(add.getId())
|
||||
// .setTableName(SqlHelper.table(ZbfProjectSubcontractingApply.class).getTableName())
|
||||
// .setMessageLargeType(FBS_LARGE_TASK)
|
||||
// .setIsOperation(OPERATION_NO);
|
||||
// fbsMessageService.sendAMessage(fbsMessage);
|
||||
|
||||
ZbfProject project = projectService.getById(sub.getProjectId());
|
||||
//分包商发消息到总包方
|
||||
HashMap<String, String> fmp = new HashMap<>();
|
||||
fmp.put("projectName", project.getProjectName());
|
||||
fmp.put("subName", sub.getSubName());
|
||||
fmp.put("auditor", SecurityUtils.getUsername());
|
||||
Map<String, String> fmap = fbsMessage(fmp, FBS_TYPE_SUB_TO_ZBF, true);
|
||||
ZbfMessage zbfMessage = new ZbfMessage()
|
||||
.setSenderType(USERTYPE_FBS)
|
||||
.setSenderId(SecurityUtils.getAppUserId())
|
||||
.setRecipientType(USERTYPE_ZBF)
|
||||
.setRecipientId(project.getUserId())
|
||||
.setHeadline(fmap.get(HEADLINE))
|
||||
.setSubheading(fmap.get(SUBHEADING))
|
||||
.setTableId(add.getId())
|
||||
.setTableName(SqlHelper.table(ZbfProjectSubcontractingApply.class).getTableName())
|
||||
.setMessageLargeType(ZBF_LARGE_TASK)
|
||||
.setIsOperation(OPERATION_NEED);
|
||||
zbfMessageService.sendAMessage(zbfMessage);
|
||||
return save;
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -85,4 +170,65 @@ public class ZbfProjectSubcontractingApplyServiceImpl extends ServicePlusImpl<Zb
|
||||
}
|
||||
return removeByIds(ids);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean choose(Long id) {
|
||||
ZbfProjectSubcontractingApply subApply = getById(id);
|
||||
if(subApply == null || TaskApplyStatus.CANCEL.getCode().equals(subApply.getApplyStatus())){
|
||||
throw new BaseException("该申请已取消");
|
||||
}
|
||||
ZbfProjectSubcontracting sub = projectSubcontractingService.getById(subApply.getSubId());
|
||||
if(sub!=null && sub.getUserId()!=null){
|
||||
throw new BaseException("该分包已被承接");
|
||||
}
|
||||
|
||||
ZbfProject project = projectService.getById(sub.getProjectId());
|
||||
|
||||
//修改分包
|
||||
sub.setUserId(subApply.getFbsUserId());
|
||||
projectSubcontractingService.updateById(sub);
|
||||
//修改项目状态
|
||||
if(ProjectStatus.NOT_START.getCode().equals(project.getProjectStatus())){
|
||||
project.setProjectStatus(ProjectStatus.START.getCode());
|
||||
projectService.updateById(project);
|
||||
}
|
||||
//拒绝其余分包商
|
||||
LambdaQueryWrapper<ZbfProjectSubcontractingApply> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.eq(ZbfProjectSubcontractingApply::getSubId, subApply.getSubId());
|
||||
wrapper.eq(ZbfProjectSubcontractingApply::getApplyStatus, TaskApplyStatus.APPLY.getCode());
|
||||
List<ZbfProjectSubcontractingApply> list = baseMapper.selectList(wrapper);
|
||||
|
||||
ArrayList<FbsMessage> fbsMessages = new ArrayList<>();
|
||||
for (ZbfProjectSubcontractingApply subcontractApply : list){
|
||||
boolean equals = subcontractApply.getId().equals(id);
|
||||
if (equals){
|
||||
subcontractApply.setApplyStatus(TaskApplyStatus.PASS.getCode());
|
||||
}else{
|
||||
subcontractApply.setApplyStatus(TaskApplyStatus.REFUSE.getCode());
|
||||
}
|
||||
|
||||
//总包方发消息到分包商
|
||||
HashMap<String, String> zmp = new HashMap<>();
|
||||
zmp.put("projectName", project.getProjectName());
|
||||
zmp.put("subName", sub.getSubName());
|
||||
zmp.put("auditor", SecurityUtils.getUsername());
|
||||
Map<String, String> zmap = zbfMessage(zmp, ZBF_TYPE_SIGN_UP, equals);
|
||||
FbsMessage fbsMessage = new FbsMessage()
|
||||
.setSenderType(USERTYPE_ZBF)
|
||||
.setSenderId(SecurityUtils.getAppUserId())
|
||||
.setRecipientType(USERTYPE_FBS)
|
||||
.setRecipientId(subcontractApply.getFbsUserId())
|
||||
.setHeadline(zmap.get(HEADLINE))
|
||||
.setSubheading(zmap.get(SUBHEADING))
|
||||
.setTableId(subcontractApply.getId())
|
||||
.setTableName(SqlHelper.table(ZbfProjectSubcontractingApply.class).getTableName())
|
||||
.setMessageLargeType(FBS_LARGE_TASK)
|
||||
.setIsOperation(OPERATION_NO);
|
||||
fbsMessages.add(fbsMessage);
|
||||
}
|
||||
fbsMessageService.saveBatch(fbsMessages);
|
||||
// fbsMessageService.operationBatch(USERTYPE_FBS,SecurityUtils.getAppUserId(),list.stream().map(FbsProjectTaskApply::getId).collect(Collectors.toList()),SqlHelper.table(FbsProjectTaskApply.class).getTableName());
|
||||
return super.updateBatchById(list);
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,105 @@
|
||||
package com.ruoyi.zbf.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.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.ruoyi.common.core.domain.entity.ZbfUser;
|
||||
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.utils.PageUtils;
|
||||
import com.ruoyi.zbf.bo.ZbfUserQueryBo;
|
||||
import com.ruoyi.zbf.mapper.ZbfUserMapper;
|
||||
import com.ruoyi.zbf.service.IZbfUserService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* APP总包方用户Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-31
|
||||
*/
|
||||
@Service
|
||||
public class ZbfUserServiceImpl extends ServicePlusImpl<ZbfUserMapper, ZbfUser> implements IZbfUserService {
|
||||
|
||||
@Override
|
||||
public ZbfUser queryById(Long id){
|
||||
return getById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TableDataInfo<ZbfUser> queryPageList(ZbfUserQueryBo bo) {
|
||||
Page<ZbfUser> result = page(PageUtils.buildPage(), buildQueryWrapper(bo));
|
||||
return PageUtils.buildDataInfo(result);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ZbfUser> queryList(ZbfUserQueryBo bo) {
|
||||
return list(buildQueryWrapper(bo));
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<ZbfUser> buildQueryWrapper(ZbfUserQueryBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<ZbfUser> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getUserId() != null, ZbfUser::getUserId, bo.getUserId());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getPhone()), ZbfUser::getPhone, bo.getPhone());
|
||||
lqw.like(StrUtil.isNotBlank(bo.getUsername()), ZbfUser::getUsername, bo.getUsername());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getGender()), ZbfUser::getGender, bo.getGender());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getNation()), ZbfUser::getNation, bo.getNation());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getBirthdate()), ZbfUser::getBirthdate, bo.getBirthdate());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getIdentityCard()), ZbfUser::getIdentityCard, bo.getIdentityCard());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getArea()), ZbfUser::getArea, bo.getArea());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getSite()), ZbfUser::getSite, bo.getSite());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getBank()), ZbfUser::getBank, bo.getBank());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getCardNo()), ZbfUser::getCardNo, bo.getCardNo());
|
||||
lqw.like(StrUtil.isNotBlank(bo.getAvatarName()), ZbfUser::getAvatarName, bo.getAvatarName());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getPassword()), ZbfUser::getPassword, bo.getPassword());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getFrontPath()), ZbfUser::getFrontPath, bo.getFrontPath());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getReverseSidePath()), ZbfUser::getReverseSidePath, bo.getReverseSidePath());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getBankCardPath()), ZbfUser::getBankCardPath, bo.getBankCardPath());
|
||||
lqw.eq(bo.getCompanyId() != null, ZbfUser::getCompanyId, bo.getCompanyId());
|
||||
lqw.eq(StrUtil.isNotBlank(bo.getStatus()), ZbfUser::getStatus, bo.getStatus());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean insert(ZbfUser bo) {
|
||||
ZbfUser add = BeanUtil.toBean(bo, ZbfUser.class);
|
||||
validEntityBeforeSave(add);
|
||||
return save(add);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean update(ZbfUser bo) {
|
||||
ZbfUser update = BeanUtil.toBean(bo, ZbfUser.class);
|
||||
validEntityBeforeSave(update);
|
||||
return updateById(update);
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*
|
||||
* @param entity 实体类数据
|
||||
*/
|
||||
private void validEntityBeforeSave(ZbfUser entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return removeByIds(ids);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ZbfUser selectUserByPhone(String phone) {
|
||||
return baseMapper.selectOne(new LambdaQueryWrapper<ZbfUser>().eq(ZbfUser::getPhone, phone));
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user