diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java index dbf69392..3dae3b9f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java @@ -46,5 +46,6 @@ public class ResultCommon { public static final String HORIZONTAL_TRANSGRESSION = "horizontal.transgression"; // 水平越权 + public static final String SELECT_LEVEL_TWO_TREE_NODE = "select.level.two.tree.node"; // 请先选择二级及以下体系 } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java b/laws-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java index 5302f302..40bf858b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java @@ -3,6 +3,7 @@ package com.jero.modules.laws.common.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; +import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; @@ -45,6 +46,9 @@ public class LawsCommonController { if (StringUtils.isBlank(selectionBoxVO.getNodeCode())) { throw new JeroBootException(ResultCommon.EMPTY_COMMON, "nodeCode"); } + if (selectionBoxVO.getNodeCode().length() <= 3) { + throw new JeroBootException(MessageUtils.getMessage(ResultCommon.SELECT_LEVEL_TWO_TREE_NODE)); + } return Result.OK(lawsCommonService.getManyStandardSelectionBox(selectionBoxVO, pageNo, pageSize)); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardMapper.java deleted file mode 100644 index df7f09db..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jero.modules.laws.enterprise.mapper; - -import com.jero.modules.laws.enterprise.entity.EnterpriseStandard; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard(企业标准)】的数据库操作Mapper -* @createDate 2023-09-07 11:16:43 -* @Entity generator.entity.EnterpriseStandard -*/ -public interface EnterpriseStandardMapper extends BaseMapper { - -} - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardService.java deleted file mode 100644 index 84c04aa2..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.jero.modules.laws.enterprise.service; - -import com.jero.modules.laws.enterprise.entity.EnterpriseStandard; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard(企业标准)】的数据库操作Service -* @createDate 2023-09-07 11:16:43 -*/ -public interface EnterpriseStandardService extends IService { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardServiceImpl.java deleted file mode 100644 index 9586f6bf..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.jero.modules.laws.enterprise.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.exception.JeroBootException; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandard; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardService; -import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard(企业标准)】的数据库操作Service实现 -* @createDate 2023-09-07 11:16:43 -*/ -@Service -@Transactional(rollbackFor = JeroBootException.class) -@Slf4j -public class EnterpriseStandardServiceImpl extends ServiceImpl - implements EnterpriseStandardService{ - -} - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java similarity index 57% rename from laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandard.java rename to laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java index a062cef0..626fc6a3 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandard.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java @@ -1,64 +1,82 @@ -package com.jero.modules.laws.enterprise.entity; +package com.jero.modules.laws.standard.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 com.fasterxml.jackson.annotation.JsonFormat; +import java.io.Serializable; +import java.util.Date; + +import com.jero.common.aspect.annotation.Dict; 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; - -import java.io.Serializable; -import java.util.Date; /** - * @Description: 企业标准 - * @Author: caihaohan - * @Date: 2023-09-06 - * @Version: V1.0 + * 企业标准 + * @TableName laws_enterprise_standard */ @Data @TableName("laws_enterprise_standard") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="laws_enterprise_standard对象", description="企业标准") -public class EnterpriseStandard implements Serializable { - - private static final long serialVersionUID = 6238741256895478223L; - +public class LawsEnterpriseStandard implements Serializable { + /** + * 主键ID + */ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键ID") private String id; + /** + * 创建人 + */ @ApiModelProperty(value = "创建人") private String createBy; - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建人") private Date createTime; - @ApiModelProperty(value = "更新人") + /** + * 更新人 + */ + @ApiModelProperty(value = "创建人") private String updateBy; - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间") + /** + * 更新时间 + */ + @ApiModelProperty(value = "创建人") private Date updateTime; - @ApiModelProperty(value = "所属部门") + /** + * 所属部门 + */ + @ApiModelProperty(value = "创建人") private String orgCode; - @ApiModelProperty(value = "删除标识") + /** + * 0表示未删除,1表示删除 + */ + @ApiModelProperty(value = "0表示未删除,1表示删除") private Integer delFlag; + /** + * 企标编号 + */ @ApiModelProperty(value = "企标编号") private String standardNo; - @ApiModelProperty(value = "标准名称") + /** + * 企标名称 + */ + @ApiModelProperty(value = "企标名称") private String standardName; /** @@ -92,9 +110,9 @@ public class EnterpriseStandard implements Serializable { private String standardCategory; /** - * 标准英文名称 + * 企标英文名称 */ - @ApiModelProperty(value = "标准英文名称") + @ApiModelProperty(value = "企标英文名称") private String englishName; /** @@ -136,9 +154,16 @@ public class EnterpriseStandard implements Serializable { /** * 标准状态 */ + @Dict(dicCode = "es_status") @ApiModelProperty(value = "标准状态") private Integer standardState; + /** + * 企标体系 + */ + @ApiModelProperty(value = "企标体系") + private String standardSystem; + /** * 主起草人 */ @@ -152,35 +177,11 @@ public class EnterpriseStandard implements Serializable { private String mainDraftingUnit; /** - * 主起草单位责任人 + * 主起草部门负责人 */ - @ApiModelProperty(value = "主起草单位责任人") + @ApiModelProperty(value = "主起草部门负责人") private String mainDraftingUnitResponsiblePerson; - /** - * 适用专业 - */ - @ApiModelProperty(value = "适用专业") - private String applicableMajor; - - /** - * 配合单位 - */ - @ApiModelProperty(value = "配合单位") - private String cooperationUnit; - - /** - * 零部件名称 - */ - @ApiModelProperty(value = "零部件名称") - private String partName; - - /** - * 标准适用范围 - */ - @ApiModelProperty(value = "标准适用范围") - private String standardScope; - /** * 代替标准号 */ @@ -205,117 +206,102 @@ public class EnterpriseStandard implements Serializable { @ApiModelProperty(value = "被引用标准") private String referencedStandard; + /** + * 配合单位 + */ + @ApiModelProperty(value = "配合单位") + private String cooperationUnit; + + /** + * 标准推进人 + */ + @ApiModelProperty(value = "标准推进人") + private String standardPromoter; + + /** + * 零部件名称 + */ + @ApiModelProperty(value = "零部件名称") + private String partName; + + /** + * 标准适用范围 + */ + @ApiModelProperty(value = "标准适用范围") + private String standardScope; + /** * 采标程度 */ @ApiModelProperty(value = "采标程度") private String acquisitionDegree; + /** + * 关联文件 + */ + @ApiModelProperty(value = "关联文件") + private String relevantDocument; + /** * 采用国际标准号 */ @ApiModelProperty(value = "采用国际标准号") private String internationalStandardNum; + /** + * 发布稿（原文） + */ + @ApiModelProperty(value = "发布稿（原文）") + private String originalRelease; + + /** + * 修改单 + */ + @ApiModelProperty(value = "修改单") + private String modificationForm; + + /** + * 报批稿 + */ + @ApiModelProperty(value = "报批稿") + private String approvalDraft; + + /** + * 征求意见稿 + */ + @ApiModelProperty(value = "征求意见稿") + private String feedbackDraft; + + /** + * 草案 + */ + @ApiModelProperty(value = "草案") + private String draft; + + /** + * 章节条款 + */ + @ApiModelProperty(value = "章节条款") + private String chapterClause; + + /** + * 标准内容或要求 + */ + @ApiModelProperty(value = "标准内容或要求") + private String standardContentOrRequirements; + + /** + * 整改部门 + */ + @ApiModelProperty(value = "整改部门") + private String rectificationDepartment; + /** * 授权部门 */ @ApiModelProperty(value = "授权部门") private String authDept; - /** - * 稽查-章节条款 - */ - @ApiModelProperty(value = "稽查-章节条款") - private String chapterClause; - - /** - * 稽查-标准内容或要求 - */ - @ApiModelProperty(value = "稽查-标准内容或要求") - private String standardContent; - - /** - * 稽查-整改部门 - */ - @ApiModelProperty(value = "稽查-整改部门") - private String correctionDepartment; - - /** - * 草案审批会-参会人员 - */ - @ApiModelProperty(value = "草案审批会-参会人员") - private String participants; - - /** - * 草案审批会-校对人 - */ - @ApiModelProperty(value = "草案审批会-校对人") - private String proofreader; - - /** - * 草案审批会-会议纪要 - */ - @ApiModelProperty(value = "草案审批会-会议纪要") - private String draftMeetingSummary; - - /** - * 草案审批会-草稿完成日期 - */ - @ApiModelProperty(value = "草案审批会-草稿完成日期") - private Date draftCompletionDate; - - /** - * 草案审批会-草稿评审完成日期 - */ - @ApiModelProperty(value = "草案审批会-草稿评审完成日期") - private Date draftReviewDate; - - /** - * 征求意见稿-是否开启征求意见 - */ - @ApiModelProperty(value = "征求意见稿-是否开启征求意见") - private String feedbackOpenFlag; - - /** - * 征求意见稿-征求意见稿完成日期 - */ - @ApiModelProperty(value = "征求意见稿-征求意见稿完成日期") - private Date feedbackDraftDate; - - /** - * 报批评审会-评审人 - */ - @ApiModelProperty(value = "报批评审会-评审人") - private String reviewer; - - /** - * 报批评审会-评分人 - */ - @ApiModelProperty(value = "报批评审会-评分人") - private String scorer; - - /** - * 报批评审会-评审时间 - */ - @ApiModelProperty(value = "报批评审会-评审时间") - private Date reviewTime; - - /** - * 报批评审会-评审地点 - */ - @ApiModelProperty(value = "报批评审会-评审地点") - private String reviewLocation; - - /** - * 报批评审会-会议纪要 - */ - @ApiModelProperty(value = "报批评审会-会议纪要") - private String rmrMeetingSummary; - - /** - * 报批评审会-报批日期 - */ - @ApiModelProperty(value = "报批评审会-报批日期") - private Date approvalDate; + @TableField(exist = false) + private static final long serialVersionUID = 1809789807789012221L; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsEnterpriseStandardMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsEnterpriseStandardMapper.java new file mode 100644 index 00000000..c4743d9e --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsEnterpriseStandardMapper.java @@ -0,0 +1,18 @@ +package com.jero.modules.laws.standard.mapper; + +import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author ThinkBook +* @description 针对表【laws_enterprise_standard(企业标准)】的数据库操作Mapper +* @createDate 2023-09-18 14:49:51 +* @Entity com.jero.modules.laws.standard.entity.EnterpriseStandard +*/ +public interface LawsEnterpriseStandardMapper extends BaseMapper { + +} + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsEnterpriseStandardMapper.xml similarity index 63% rename from laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardMapper.xml rename to laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsEnterpriseStandardMapper.xml index b0c0fba1..026ea959 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsEnterpriseStandardMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -27,36 +27,30 @@ + - - - - + + + + + - + + + + + - - - - - - - - - - - - - - - + + + @@ -67,16 +61,14 @@ year_number,standard_category,english_name, grade_classification,release_date,implementation_date, comp_illustration,try_flag,trial_period, - standard_state,main_drafting_user,main_drafting_unit, - main_drafting_unit_responsible_person,applicable_major,cooperation_unit, - part_name,standard_scope,substitute_standard_num, + standard_state,standard_system,main_drafting_user, + main_drafting_unit,main_drafting_unit_responsible_person,substitute_standard_num, replaced_standard_num,quoted_standard,referenced_standard, - acquisition_degree,international_standard_num,auth_dept, - chapter_clause,standard_content,correction_department, - participants,proofreader,draft_meeting_summary, - draft_completion_date,draft_review_date,feedback_open_flag, - feedback_draft_date,reviewer,scorer, - review_time,review_location,rmr_meeting_summary, - approval_date + cooperation_unit,standard_promoter,part_name, + standard_scope,acquisition_degree,relevent_document, + international_standard_num,original_release,modification_form, + approval_draft,feedback_draft,draft, + chapter_clause,standard_content_or_requirements,rectification_department, + auth_dept diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/EnterpriseStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/EnterpriseStandardService.java new file mode 100644 index 00000000..6c3b0291 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/EnterpriseStandardService.java @@ -0,0 +1,13 @@ +package com.jero.modules.laws.standard.service; + +import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author ThinkBook +* @description 针对表【laws_enterprise_standard(企业标准)】的数据库操作Service +* @createDate 2023-09-18 14:49:51 +*/ +public interface EnterpriseStandardService extends IService { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/EnterpriseStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/EnterpriseStandardServiceImpl.java new file mode 100644 index 00000000..8886451a --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/EnterpriseStandardServiceImpl.java @@ -0,0 +1,22 @@ +package com.jero.modules.laws.standard.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; +import com.jero.modules.laws.standard.service.EnterpriseStandardService; +import com.jero.modules.laws.standard.mapper.LawsEnterpriseStandardMapper; +import org.springframework.stereotype.Service; + +/** +* @author ThinkBook +* @description 针对表【laws_enterprise_standard(企业标准)】的数据库操作Service实现 +* @createDate 2023-09-18 14:49:51 +*/ +@Service +public class EnterpriseStandardServiceImpl extends ServiceImpl + implements EnterpriseStandardService{ + +} + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java index b0a1e65d..1845f55a 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java @@ -6,8 +6,8 @@ import com.jero.common.api.vo.Result; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.ResultCommon; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandard; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardService; +import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; +import com.jero.modules.laws.standard.service.EnterpriseStandardService; import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.entity.LawsOverseasStandard; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; @@ -178,7 +178,7 @@ public class LawsStandardSharingController extends JeroController