diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualReport.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualReport.java new file mode 100644 index 00000000..24333387 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualReport.java @@ -0,0 +1,289 @@ +package com.jero.modules.activiti.process.esAnnualInit.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 java.io.Serializable; +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +/** + * 企标-年度制修订计划-各部门主动上报 + * @TableName process_es_annual_report + */ +@Data +@TableName(value ="process_es_annual_report") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="process_es_annual_report对象", description="企标-年度制修订计划-各部门主动上报") +public class ProcessEsAnnualReport implements Serializable { + + /** + * 主键ID + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键ID") + private String id; + + /** + * 企标计划Id + */ + private String espId; + + /** + * 创建人 + */ + private String createBy; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新人 + */ + private String updateBy; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 所属部门 + */ + private String orgCode; + + /** + * 0表示未删除,1表示删除 + */ + private Integer delFlag; + + /** + * 流程实例Id + */ + private String processInstanceId; + + /** + * 申请类别 + */ + private String applicationCategory; + + /** + * 项目类型 + */ + private String projectType; + + /** + * 原企标编号 + */ + private String originEnStandardNo; + + /** + * 新企标编号 + */ + private String newEnStandardNo; + + /** + * 原企标名称 + */ + private String originEnStandardName; + + /** + * 新企标名称 + */ + private String newEnStandardName; + + /** + * 企标英文名称 + */ + private String enStandardEnglishName; + + /** + * 企标体系 + */ + private String enStandardSystem; + + /** + * 企业标准代号 + */ + private String enStandardCode; + + /** + * 企业名称代号 + */ + private String enNameCode; + + /** + * 标准类别代号 + */ + private String standardCategoryCode; + + /** + * 年代号 + */ + private String decadeCode; + + /** + * 标准类型 + */ + private String standardType; + + /** + * 企标等级分类 + */ + private String enStandardClassification; + + /** + * 草稿计划完成日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date draftPlannedCompleteDate; + + /** + * 征求意见稿计划完成日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date solicitationDraftPlanCompleteDate; + + /** + * 计划报批日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date planApprovalDate; + + /** + * 项目状态 + */ + private String projectStatus; + + /** + * 编制说明 + */ + private String compilationDescription; + + /** + * 零部件名称 + */ + private String componentName; + + /** + * 主起草人 + */ + private String mainDraftingUser; + + /** + * 主起草人 + */ + @TableField(exist = false) + @JsonProperty("mainDraftingUser_dictText") + private String mainDraftingUserDictText; + + /** + * 主起草单位 + */ + private String mainDraftingUnit; + + /** + * 主起草单位 + */ + @TableField(exist = false) + @JsonProperty("mainDraftingUnit_dictText") + private String mainDraftingUnitDictText; + + /** + * 主起草单位责任人 + */ + private String mainDraftingUnitResponsiblePerson; + + /** + * 主起草单位责任人 + */ + @TableField(exist = false) + @JsonProperty("mainDraftingUnitResponsiblePerson_dictText") + private String mainDraftingUnitResponsiblePersonDictText; + + /** + * 标准推进人 + */ + private String standardPromoter; + + /** + * 标准推进人 + */ + @TableField(exist = false) + @JsonProperty("standardPromoter_dictText") + private String standardPromoterDictText; + + /** + * 草稿完成日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date draftCompletionDate; + + /** + * 提交草稿日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date draftSubmissionDate; + + /** + * 是否征求意见 + */ + private String solicitationOpinionEnabled; + + /** + * 征求意见稿完成日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date solicitationDraftCompletionDate; + + /** + * 变更状态 + */ + private String changeStatus; + + /** + * 上传附件 + */ + private String uploadAttachment; + + /** + * 变更原因 + */ + private String changeReason; + + /** + * 授权部门 + */ + private String authDept; + + /** + * 配合单位 + */ + private String cooperationUnit; + + /** + * 隶属工作组 + */ + private String workGroup; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/mapper/ProcessEsAnnualReportMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/mapper/ProcessEsAnnualReportMapper.java new file mode 100644 index 00000000..0b6e4be6 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/mapper/ProcessEsAnnualReportMapper.java @@ -0,0 +1,18 @@ +package com.jero.modules.activiti.process.esAnnualInit.mapper; + +import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualReport; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author ThinkBook +* @description 针对表【process_es_annual_report(企标-年度制修订计划-各部门主动上报)】的数据库操作Mapper +* @createDate 2023-10-18 09:52:41 +* @Entity com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualReport +*/ +public interface ProcessEsAnnualReportMapper extends BaseMapper { + +} + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/mapper/xml/ProcessEsAnnualReportMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/mapper/xml/ProcessEsAnnualReportMapper.xml new file mode 100644 index 00000000..8f020b97 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/mapper/xml/ProcessEsAnnualReportMapper.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,esp_id,create_by, + create_time,update_by,update_time, + org_code,del_flag,process_instance_id, + application_category,project_type,origin_en_standard_no, + new_en_standard_no,origin_en_standard_name,new_en_standard_name, + en_standard_english_name,en_standard_system,en_standard_code, + en_name_code,standard_category_code,decade_code, + standard_type,en_standard_classification,draft_planned_complete_date, + solicitation_draft_plan_complete_date,plan_approval_date,project_status, + compilation_description,component_name,main_drafting_user, + main_drafting_unit,main_drafting_unit_responsible_person,standard_promoter, + draft_completion_date,draft_submission_date,solicitation_opinion_enabled, + solicitation_draft_completion_date,change_status,upload_attachment, + change_reason,auth_dept,cooperation_unit, + work_group + + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/ProcessEsAnnualReportService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/ProcessEsAnnualReportService.java new file mode 100644 index 00000000..6001c894 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/ProcessEsAnnualReportService.java @@ -0,0 +1,13 @@ +package com.jero.modules.activiti.process.esAnnualInit.service; + +import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualReport; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author ThinkBook +* @description 针对表【process_es_annual_report(企标-年度制修订计划-各部门主动上报)】的数据库操作Service +* @createDate 2023-10-18 09:52:41 +*/ +public interface ProcessEsAnnualReportService extends IService { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualReportServiceImpl.java new file mode 100644 index 00000000..6f619f8c --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualReportServiceImpl.java @@ -0,0 +1,25 @@ +package com.jero.modules.activiti.process.esAnnualInit.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; +import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualReport; +import com.jero.modules.activiti.process.esAnnualInit.service.ProcessEsAnnualReportService; +import com.jero.modules.activiti.process.esAnnualInit.mapper.ProcessEsAnnualReportMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** +* @author ThinkBook +* @description 针对表【process_es_annual_report(企标-年度制修订计划-各部门主动上报)】的数据库操作Service实现 +* @createDate 2023-10-18 09:52:41 +*/ +@Service +@Transactional(rollbackFor = JeroBootException.class) +public class ProcessEsAnnualReportServiceImpl extends ServiceImpl + implements ProcessEsAnnualReportService{ + +} + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java index 9a373aaf..bd747dbd 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java @@ -17,7 +17,7 @@ import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; /** - * 企标计划 + * 企标立项变更计划 * @TableName process_es_init_change */ @Data @@ -291,7 +291,6 @@ public class ProcessEsInitChange implements Serializable { @JsonProperty("mainDraftingUnitResponsiblePerson_dictText") private String mainDraftingUnitResponsiblePersonDictText; - /** * 新主起草单位负责人 */