diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java new file mode 100644 index 00000000..2d23876b --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java @@ -0,0 +1,280 @@ +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_init + */ +@TableName(value ="process_es_annual_init") +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="process_es_annual_init", description="企标-年度制修订计划-标准化发起") +public class ProcessEsAnnualInit 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 solicitationDraftCompletionDate; + + /** + * 变更状态 + */ + private String changeStatus; + + /** + * 备注 + */ + private String remarks; + + /** + * 上传附件 + */ + private String uploadAttachment; + + /** + * 变更原因 + */ + private String changeReason; + + /** + * 授权部门 + */ + private String authDept; + + /** + * 配合单位 + */ + private String cooperationUnit; + + /** + * 联络人 + */ + private String contactUser; + + /** + * 审批人 + */ + private String approvalUser; + + @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/ProcessEsAnnualInitMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/mapper/ProcessEsAnnualInitMapper.java new file mode 100644 index 00000000..0a6895b9 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/mapper/ProcessEsAnnualInitMapper.java @@ -0,0 +1,18 @@ +package com.jero.modules.activiti.process.esAnnualInit.mapper; + +import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author ThinkBook +* @description 针对表【process_es_annual_init(企标立项变更流程)】的数据库操作Mapper +* @createDate 2023-10-18 10:01:44 +* @Entity com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit +*/ +public interface ProcessEsAnnualInitMapper 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/ProcessEsAnnualInitMapper.xml similarity index 86% rename from laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/mapper/xml/ProcessEsAnnualReportMapper.xml rename to laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/mapper/xml/ProcessEsAnnualInitMapper.xml index 8f020b97..6face39e 100644 --- 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/ProcessEsAnnualInitMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -38,16 +38,15 @@ - - - + - + + @@ -62,9 +61,8 @@ 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 + solicitation_draft_completion_date,change_status,remarks, + upload_attachment,change_reason,auth_dept, + cooperation_unit,contact_user,approval_user diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/ProcessEsAnnualInitService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/ProcessEsAnnualInitService.java new file mode 100644 index 00000000..5af982f8 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/ProcessEsAnnualInitService.java @@ -0,0 +1,13 @@ +package com.jero.modules.activiti.process.esAnnualInit.service; + +import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author ThinkBook +* @description 针对表【process_es_annual_init(企标立项变更流程)】的数据库操作Service +* @createDate 2023-10-18 10:01:44 +*/ +public interface ProcessEsAnnualInitService extends IService { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java new file mode 100644 index 00000000..2dbecc8c --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java @@ -0,0 +1,22 @@ +package com.jero.modules.activiti.process.esAnnualInit.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit; +import com.jero.modules.activiti.process.esAnnualInit.service.ProcessEsAnnualInitService; +import com.jero.modules.activiti.process.esAnnualInit.mapper.ProcessEsAnnualInitMapper; +import org.springframework.stereotype.Service; + +/** +* @author ThinkBook +* @description 针对表【process_es_annual_init(企标立项变更流程)】的数据库操作Service实现 +* @createDate 2023-10-18 10:01:44 +*/ +@Service +public class ProcessEsAnnualInitServiceImpl extends ServiceImpl + implements ProcessEsAnnualInitService{ + +} + + + + 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/esAnnualReport/entity/ProcessEsAnnualReport.java similarity index 98% rename from laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualReport.java rename to laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java index 24333387..625072ad 100644 --- 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/esAnnualReport/entity/ProcessEsAnnualReport.java @@ -1,4 +1,4 @@ -package com.jero.modules.activiti.process.esAnnualInit.entity; +package com.jero.modules.activiti.process.esAnnualReport.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; 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/esAnnualReport/mapper/ProcessEsAnnualReportMapper.java similarity index 74% rename from laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/mapper/ProcessEsAnnualReportMapper.java rename to laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/mapper/ProcessEsAnnualReportMapper.java index 0b6e4be6..ae94bff8 100644 --- 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/esAnnualReport/mapper/ProcessEsAnnualReportMapper.java @@ -1,7 +1,7 @@ -package com.jero.modules.activiti.process.esAnnualInit.mapper; +package com.jero.modules.activiti.process.esAnnualReport.mapper; -import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualReport; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.activiti.process.esAnnualReport.entity.ProcessEsAnnualReport; /** * @author ThinkBook 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/esAnnualReport/service/ProcessEsAnnualReportService.java similarity index 69% rename from laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/ProcessEsAnnualReportService.java rename to laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/ProcessEsAnnualReportService.java index 6001c894..785a98ed 100644 --- 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/esAnnualReport/service/ProcessEsAnnualReportService.java @@ -1,7 +1,7 @@ -package com.jero.modules.activiti.process.esAnnualInit.service; +package com.jero.modules.activiti.process.esAnnualReport.service; -import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualReport; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.activiti.process.esAnnualReport.entity.ProcessEsAnnualReport; /** * @author ThinkBook 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/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java similarity index 62% rename from laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualReportServiceImpl.java rename to laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java index 6f619f8c..8f38b598 100644 --- 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/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java @@ -1,10 +1,11 @@ -package com.jero.modules.activiti.process.esAnnualInit.service.impl; +package com.jero.modules.activiti.process.esAnnualReport.service.impl; + +import com.baomidou.mybatisplus.extension.service.IService; 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 com.jero.modules.activiti.process.esAnnualReport.entity.ProcessEsAnnualReport; +import com.jero.modules.activiti.process.esAnnualReport.mapper.ProcessEsAnnualReportMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -16,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional; @Service @Transactional(rollbackFor = JeroBootException.class) public class ProcessEsAnnualReportServiceImpl extends ServiceImpl - implements ProcessEsAnnualReportService{ + implements IService { }