bonus
/
bns-zhgd-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目管理

This commit is contained in:
cwchen 2025-04-18 14:35:43 +08:00
parent 154fb45658
commit 4cf272fbe3
3 changed files with 44 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/BmProjectController.java
View File

@ -38,9 +38,10 @@ public class BmProjectController extends BaseController {
/**
* 查询工程项目管理列表
*/
@ApiOperation(value = "查询工程项目管理列表")
@ApiOperation(value = "查询项目列表")
// @RequiresPermissions("basic:project:list")
@GetMapping("/list")
@SysLog(title = "项目管理", businessType = OperaType.EXPORT, logType = 1,module = "项目管理->查询项目列表")
public TableDataInfo list(BmProject bmProject) {
startPage();
List<BmProject> list = bmProjectService.selectBmProjectList(bmProject);
@ -50,11 +51,11 @@ public class BmProjectController extends BaseController {
/**
* 导出工程项目管理列表
*/
@ApiOperation(value = "导出工程项目管理列表")
@ApiOperation(value = "导出项目列表")
@PreventRepeatSubmit
@RequiresPermissions("basic:project:export")
@SysLog(title = "工程项目管理", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出工程项目管理")
@PostMapping("/export")
// @RequiresPermissions("basic:project:export")
@SysLog(title = "项目管理", businessType = OperaType.EXPORT, logType = 1,module = "项目管理->导出项目列表")
@GetMapping("/export")
public void export(HttpServletResponse response, BmProject bmProject) {
List<BmProject> list = bmProjectService.selectBmProjectList(bmProject);
ExcelUtil<BmProject> util = new ExcelUtil<BmProject>(BmProject.class);

68
bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/BmProject.java
View File

@ -2,9 +2,6 @@ package com.bonus.base.basic.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.bonus.base.basic.domain.vo.ProDepartVo;
import com.bonus.base.basic.domain.vo.UnitVo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.bonus.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
@ -40,6 +37,9 @@ public class BmProject extends BaseEntity {
@NotNull(message = "id不能为空", groups = {Edit.class, Del.class})
private Long projectId;
@ApiModelProperty(value = "分公司名称")
private String companyName;
/**
* 项目名称
*/
@ -49,11 +49,19 @@ public class BmProject extends BaseEntity {
@Length(max = 255, message = "项目名称字符长度不能超过255", groups = {Add.class, Edit.class})
private String projectName;
/**
* 地址
*/
@Excel(name = "项目地址")
@ApiModelProperty(value = "项目地址")
@Length(max = 255, message = "项目地址字符长度不能超过100", groups = {Add.class, Edit.class})
private String address;
/**
* 计划开工日期
*/
@ApiModelProperty(value = "计划开工日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "计划开工日期", width = 30, dateFormat = "yyyy-MM-dd")
@NotNull(message = "计划开工日期", groups = {Add.class, Edit.class})
private Date planStartTime;
@ -62,25 +70,12 @@ public class BmProject extends BaseEntity {
* 计划竣工日期
*/
@ApiModelProperty(value = "计划竣工日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "计划竣工日期", width = 30, dateFormat = "yyyy-MM-dd")
@NotNull(message = "计划竣工日期", groups = {Add.class, Edit.class})
private Date planEndTime;
/**
* 项目金额（万元）
*/
@Excel(name = "项目金额", readConverterExp = "万=元")
private BigDecimal projectAmount;
/**
* 所属公司ID
*/
@Excel(name = " 所属公司ID")
@ApiModelProperty(value = " 所属公司ID")
@NotNull(message = "所属公司ID不能为空", groups = {Add.class, Edit.class})
private Long companyId;
/**
* 业主单位
@ -91,17 +86,37 @@ public class BmProject extends BaseEntity {
@Length(max = 255, message = "业主单位字符长度不能超过255", groups = {Add.class, Edit.class})
private String ownerUnit;
/**
* 项目状态（0筹建 1在建 2部分投运 3投运 4停工）
*/
@Excel(name = "项目状态", readConverterExp = "0=筹建,1=在建,2=部分投运,3=投运,4=停工")
@Excel(name = "项目状态")
@NotBlank(message = "项目状态不能为空", groups = {Add.class, Edit.class})
private String projectStatus;
/**
* 标段数量
*/
@Excel(name = "标段工程数量")
private int bidNum;
/**
* 项目金额（万元）
*/
private BigDecimal projectAmount;
/**
* 所属公司ID
*/
@ApiModelProperty(value = " 所属公司ID")
@NotNull(message = "所属公司ID不能为空", groups = {Add.class, Edit.class})
private Long companyId;
/**
* 项目规模
*/
@Excel(name = "项目规模")
@ApiModelProperty(value = "项目规模")
@Length(max = 255, message = "项目规模字符长度不能超过255", groups = {Add.class, Edit.class})
private String projectScale;
@ -109,28 +124,15 @@ public class BmProject extends BaseEntity {
/**
* 项目负责人
*/
@Excel(name = "项目负责人")
@ApiModelProperty(value = "项目负责人")
@Length(max = 100, message = "项目负责人字符长度不能超过100", groups = {Add.class, Edit.class})
private String projectManager;
/**
* 地址
*/
@Excel(name = "地址")
@ApiModelProperty(value = "地址")
@Length(max = 255, message = "地址字符长度不能超过100", groups = {Add.class, Edit.class})
private String address;
/**
* 删除标志（0代表存在 2代表删除）
*/
private String delFlag;
/**
* 标段数量
*/
private int bidNum;
/**
* 新增条件限制

4
bonus-modules/bonus-base/src/main/resources/mapper/base/basic/BmProjectMapper.xml
View File

@ -35,9 +35,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bp.owner_unit AS ownerUnit,
bp.project_id AS projectId,
sdd.dict_label AS projectStatus,
IFNULL(A.num,0) AS bidNum
IFNULL(A.num,0) AS bidNum,
tbc.company_name AS companyName
FROM bm_project bp
LEFT JOIN sys_dict_data sdd ON bp.project_status = sdd.dict_value AND sdd.dict_type = 'pro_status'
LEFT JOIN tb_branch_company tbc ON bp.company_id = tbc.id
LEFT JOIN (
SELECT project_id,COUNT(*) AS num
FROM bm_project_lot