diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java index cc95bca5..a6f8b343 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java @@ -113,6 +113,19 @@ public class ProcessProjectNotMetLink { @ApiModelProperty(value = "设计工程师名字") private String engineerName; + /** + * 依据描述 + */ + @ApiModelProperty(value = "依据描述") + private String description; + + /** + * 佐证材料 + */ + @ApiModelProperty(value = "佐证材料") + private String fileId; + + /** * 预计整改完成日期 */ @@ -120,6 +133,12 @@ public class ProcessProjectNotMetLink { @ApiModelProperty(value = "预计整改完成日期") private Date expectedTime; + /** + * 实际整改完成日期 + */ + @ApiModelProperty(value = "实际整改完成日期") + private Date realityTime; + /** * 整改状态(1-待整改、2-整改中、3-审批中、4-已完成) */ @@ -169,38 +188,5 @@ public class ProcessProjectNotMetLink { @ApiModelProperty(value = "删除标识") private Boolean delFlag; - /** - * 设计工程师ID - */ - @TableField(exist = false) - @ApiModelProperty(value = "设计工程师ID") - private String nowEngineerId; - /** - * 设计工程师名字 - */ - @TableField(exist = false) - @ApiModelProperty(value = "设计工程师名字") - private String nowEngineerName; - - /** - * 依据描述 - */ - @TableField(exist = false) - @ApiModelProperty(value = "依据描述") - private String description; - - /** - * 佐证材料 - */ - @TableField(exist = false) - @ApiModelProperty(value = "佐证材料") - private String fileId; - - /** - * 实际整改完成日期 - */ - @TableField(exist = false) - @ApiModelProperty(value = "实际整改完成日期") - private Date realityTime; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetUser.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetUser.java deleted file mode 100644 index 8d7d1324..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetUser.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.jero.modules.activiti.process.projectnotmet.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @author liJiaRao - * @date 2023-12-23 19:58 - */ - -/** - * 未符合项跟踪流程关联设计工程师 - */ -@ApiModel(description = "未符合项跟踪流程关联设计工程师") -@Data -@TableName(value = "process_project_not_met_user") -public class ProcessProjectNotMetUser { - /** - * 主键ID - */ - @TableId(value = "id", type = IdType.INPUT) - @ApiModelProperty(value = "主键ID") - private String id; - - /** - * 流程主表id - */ - @TableField(value = "process_id") - @ApiModelProperty(value = "流程主表id") - private String processId; - - /** - * 关联标准id - */ - @TableField(value = "link_id") - @ApiModelProperty(value = "关联标准id") - private String linkId; - - /** - * 设计工程师ID - */ - @TableField(value = "engineer_id") - @ApiModelProperty(value = "设计工程师ID") - private String engineerId; - - /** - * 设计工程师名字 - */ - @TableField(value = "engineer_name") - @ApiModelProperty(value = "设计工程师名字") - private String engineerName; - - /** - * 依据描述 - */ - @TableField(value = "description") - @ApiModelProperty(value = "依据描述") - private String description; - - /** - * 佐证材料 - */ - @TableField(value = "file_id") - @ApiModelProperty(value = "佐证材料") - private String fileId; - - /** - * 实际整改完成日期 - */ - @TableField(value = "reality_time") - @ApiModelProperty(value = "实际整改完成日期") - private Date realityTime; - - /** - * 整改状态(1-待整改、2-整改中、3-审批中、4-已完成) - */ - @TableField(value = "`state`") - @ApiModelProperty(value = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成)") - private String state; - - /** - * 创建人ID - */ - @TableField(value = "create_by") - @ApiModelProperty(value = "创建人ID") - private String createBy; - - /** - * 创建时间 - */ - @TableField(value = "create_time") - @ApiModelProperty(value = "创建时间") - private Date createTime; - - /** - * 修改人ID - */ - @TableField(value = "update_by") - @ApiModelProperty(value = "修改人ID") - private String updateBy; - - /** - * 修改时间 - */ - @TableField(value = "update_time") - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - /** - * 部门code - */ - @TableField(value = "org_code") - @ApiModelProperty(value = "部门code") - private String orgCode; - - /** - * 删除标识 - */ - @TableField(value = "del_flag") - @ApiModelProperty(value = "删除标识") - private Boolean delFlag; -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/ProcessProjectNotMetUserMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/ProcessProjectNotMetUserMapper.java deleted file mode 100644 index ed119907..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/ProcessProjectNotMetUserMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.jero.modules.activiti.process.projectnotmet.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMetUser; - -/** - * @author liJiaRao - * @date 2023-12-23 19:58 - */ -public interface ProcessProjectNotMetUserMapper extends BaseMapper { -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/xml/ProcessProjectNotMetLinkMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/xml/ProcessProjectNotMetLinkMapper.xml index 425b0110..9a366f67 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/xml/ProcessProjectNotMetLinkMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/xml/ProcessProjectNotMetLinkMapper.xml @@ -26,7 +26,6 @@ - @@ -50,10 +49,8 @@ ppnmu.file_id, ppnmu.reality_time - from process_project_not_met_link ppnml - left join process_project_not_met_user ppnmu on ppnml.id = ppnmu.link_id - where ppnmu.engineer_id = #{originUserId} - and ppnml.process_id = #{processId} + from process_project_not_met_link + where process_id = #{processId}