流程推进展示工程

xiangpei

2025-02-27 66b258f3e333b2413e3c7c28a8a6794545fc6eb8

流程推进展示工程

 business/src/main/java/com/ycl/controller/ProjectEngineeringController.java

@@ -70,7 +70,7 @@
    @GetMapping("/{id}")
    @ApiOperation(value = "详情", notes = "详情")
//    @PreAuthorize("@ss.hasPermi('projectEngineering:detail')")
    public Result detail(@PathVariable("id") Integer id) {
    public Result detail(@PathVariable("id") String id) {
        return projectEngineeringService.detail(id);
    }


 business/src/main/java/com/ycl/domain/entity/ProjectEngineering.java

@@ -5,6 +5,7 @@
import java.io.Serializable;

import com.ycl.system.domain.base.AbsEntity;
import com.ycl.system.domain.base.AbsUUIDEntity;
import lombok.Data;

/**
@@ -15,7 +16,7 @@
 */
@Data
@TableName("t_project_engineering")
public class ProjectEngineering extends AbsEntity {
public class ProjectEngineering extends AbsUUIDEntity {

    private static final long serialVersionUID = 1L;


 business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java

@@ -4,6 +4,7 @@
import com.ycl.common.group.Add;
import com.ycl.system.domain.base.AbsForm;
import com.ycl.domain.entity.ProjectEngineering;
import com.ycl.system.domain.base.AbsUUIDForm;
import org.springframework.beans.BeanUtils;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@@ -21,7 +22,7 @@
 */
@Data
@ApiModel(value = "ProjectEngineering表单", description = "项目工程表单")
public class ProjectEngineeringForm extends AbsForm {
public class ProjectEngineeringForm extends AbsUUIDForm {

    @NotNull(message = "项目id不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("项目id")

 business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java

@@ -1,5 +1,6 @@
package com.ycl.domain.vo;

import com.ycl.system.domain.base.AbsUUIDVo;
import com.ycl.system.domain.base.AbsVo;
import com.ycl.domain.entity.ProjectEngineering;
import java.util.List;
@@ -18,7 +19,7 @@
 */
@Data
@ApiModel(value = "项目工程响应数据", description = "项目工程响应数据")
public class ProjectEngineeringVO extends AbsVo {
public class ProjectEngineeringVO extends AbsUUIDVo {

    /** 项目id */
    @ApiModelProperty("项目id")

 business/src/main/java/com/ycl/domain/vo/ProjectProcessVO.java

@@ -9,7 +9,9 @@
import org.springframework.lang.NonNull;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
 * 流程推进列表信息表展示
@@ -36,4 +38,13 @@

    @ApiModelProperty("流程是否挂起/暂停")
    private boolean suspended;

    @ApiModelProperty("投资额")
    private String investmentAmount;

    @ApiModelProperty("开工状态")
    private String status;

    @ApiModelProperty("工程列表")
    private List<ProjectEngineeringVO> children = new ArrayList<>();
}

 business/src/main/java/com/ycl/mapper/ProjectEngineeringMapper.java

@@ -24,7 +24,7 @@
     * @param id
     * @return
     */
    ProjectEngineeringVO getById(Integer id);
    ProjectEngineeringVO getById(String id);

    /**
    *  分页

 business/src/main/java/com/ycl/service/ProjectEngineeringService.java

@@ -55,7 +55,7 @@
     * @param id
     * @return
     */
    Result detail(Integer id);
    Result detail(String id);

    /**
     * 列表

 business/src/main/java/com/ycl/service/impl/ProjectEngineeringServiceImpl.java

@@ -98,7 +98,7 @@
     * @return
     */
    @Override
    public Result detail(Integer id) {
    public Result detail(String id) {
        ProjectEngineeringVO vo = baseMapper.getById(id);
        Assert.notNull(vo, "记录不存在");
        return Result.ok().data(vo);

 business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java

@@ -102,6 +102,7 @@
        IPage<ProjectProcessVO> page = PageUtil.getPage(query, ProjectProcessVO.class);
        baseMapper.getPage(query, page);
        for (ProjectProcessVO vo : page.getRecords()) {
            vo.setStatus(vo.getProjectStatus());
            if (Objects.nonNull(vo.getProcessDefId())) {
                ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(vo.getProcessDefId()).singleResult();
                if (Objects.nonNull(processDefinition)) {

 business/src/main/resources/mapper/ProjectProcessMapper.xml

@@ -9,17 +9,14 @@
        <result column="project_code" property="projectCode" />
        <result column="content" property="content" />
        <result column="project_type" property="projectType" />
        <result column="investmentAmount" property="investmentAmount" />
        <result column="project_status" property="projectStatus" />
        <result column="fund_type" property="fundType" />
        <result column="invest_type" property="investType" />
        <result column="project_phase" property="projectPhase" />
        <result column="tag" property="tag" />
<!--        <result column="competent_department" property="competentDepartment" />-->
<!--        <result column="management_centralization" property="managementCentralization" />-->
        <result column="project_approval_type" property="projectApprovalType" />
        <result column="importance_type" property="importanceType" />
<!--        <result column="year" property="year" />-->
<!--        <result column="year_invest_amount" property="yearInvestAmount" />-->
        <result column="create_project_time" property="createProjectTime" />
        <result column="plan_start_time" property="planStartTime" />
        <result column="plan_complete_time" property="planCompleteTime" />
@@ -34,10 +31,42 @@
        <result column="create_by" property="createBy" />
        <result column="process_def_id" property="processDefId" />
        <result column="process_ins_id" property="processInsId" />
<!--        <association property="id" column=""-->
    </resultMap>

    <resultMap id="PageResultMap" type="com.ycl.domain.vo.ProjectProcessVO">
        <id column="id" property="id"/>
        <result column="project_name" property="projectName" />
        <result column="project_code" property="projectCode" />
        <result column="content" property="content" />
        <result column="project_type" property="projectType" />
        <result column="investmentAmount" property="investmentAmount" />
        <result column="project_status" property="projectStatus" />
        <result column="fund_type" property="fundType" />
        <result column="invest_type" property="investType" />
        <result column="project_phase" property="projectPhase" />
        <result column="tag" property="tag" />
        <result column="project_approval_type" property="projectApprovalType" />
        <result column="importance_type" property="importanceType" />
        <result column="create_project_time" property="createProjectTime" />
        <result column="plan_start_time" property="planStartTime" />
        <result column="plan_complete_time" property="planCompleteTime" />
        <result column="project_address" property="projectAddress" />
        <result column="longitude" property="longitude" />
        <result column="latitude" property="latitude" />
        <result column="project_owner_unit" property="projectOwnerUnit" />
        <result column="project_owner_unit_name" property="projectOwnerUnitName" />
        <result column="project_contact_person" property="projectContactPerson" />
        <result column="contact" property="contact" />
        <result column="update_by" property="updateBy" />
        <result column="create_by" property="createBy" />
        <result column="process_def_id" property="processDefId" />
        <result column="process_ins_id" property="processInsId" />
        <collection property="children" ofType="com.ycl.domain.vo.ProjectEngineeringVO" select="getProjectEngineering" column="id"></collection>
    </resultMap>

    <select id="getProjectEngineering" parameterType="long" resultMap="com.ycl.mapper.ProjectEngineeringMapper.BaseResultMap">
        SELECT * FROM t_project_engineering WHERE project_info_id = #{id} and deleted = 0 ORDER BY gmt_create
    </select>


    <select id="getById" resultMap="BaseResultMap">
@@ -52,14 +81,16 @@
    </select>


    <select id="getPage" resultMap="BaseResultMap">
    <select id="getPage" resultMap="PageResultMap">
        SELECT
            PI.*,
            TPP.process_def_id,
            TPP.process_ins_id,
            TPIF.total_investment as investmentAmount,
            d.dept_name as project_owner_unit_name
        FROM
            t_project_info PI
                LEFT JOIN t_project_investment_funding TPIF ON TPIF.project_id = PI.id AND TPIF.deleted = 0
                LEFT JOIN t_project_process TPP ON TPP.project_id = PI.id AND TPP.deleted = 0
                LEFT JOIN sys_dept d ON d.dept_id = PI.project_owner_unit
        <where>

 system/src/main/java/com/ycl/system/domain/base/AbsUUIDEntity.java

New file
@@ -0,0 +1,34 @@
package com.ycl.system.domain.base;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.util.Date;

/**
 * @author xp
 * @date 2022/11/29
 */
@Data
public abstract class AbsUUIDEntity {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.ASSIGN_UUID)
    private String id;

    /** 创建时间 */
    @TableField(value = "gmt_create", fill = FieldFill.INSERT)
    private Date gmtCreate;

    /** 修改时间 */
    @TableField(value = "gmt_update", fill = FieldFill.INSERT_UPDATE)
    private Date gmtUpdate;

    @TableField(value = "deleted", fill = FieldFill.INSERT)
    private Integer deleted;

}

 system/src/main/java/com/ycl/system/domain/base/AbsUUIDForm.java

New file
@@ -0,0 +1,20 @@
package com.ycl.system.domain.base;

import com.ycl.common.group.Update;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;

/**
 * @author xp
 * @date 2022/11/29
 */
@Data
public abstract class AbsUUIDForm {

    @ApiModelProperty(value = "id,修改必传", required = false)
    @NotNull(message = "请选择数据", groups = {Update.class})
    private String id;

}

 system/src/main/java/com/ycl/system/domain/base/AbsUUIDVo.java

New file
@@ -0,0 +1,24 @@
package com.ycl.system.domain.base;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @author xp
 * @date 2022/11/29
 */
@Data
public abstract class AbsUUIDVo {

    @ApiModelProperty("id")
    private String id;

    @ApiModelProperty("创建时间")
    private Date gmtCreate;

    @ApiModelProperty("修改时间")
    private Date gmtUpdate;

}