feat: 企标-详情

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"; // 请先选择二级及以下体系
 
 }

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));
     }
 

laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardMapper.java

@@ -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<EnterpriseStandard> {
-
-}
-
-
-
-

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardService.java

@@ -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<EnterpriseStandard> {
-
-}

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardServiceImpl.java

@@ -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<EnterpriseStandardMapper, EnterpriseStandard>
-    implements EnterpriseStandardService{
-
-}
-
-
-
-

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;
 }

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<LawsEnterpriseStandard> {
+
+}
+
+
+
+

laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsEnterpriseStandardMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jero.modules.laws.enterprise.mapper.EnterpriseStandardMapper">
+<mapper namespace="com.jero.modules.laws.standard.mapper.LawsEnterpriseStandardMapper">
 
-    <resultMap id="BaseResultMap" type="com.jero.modules.laws.enterprise.entity.EnterpriseStandard">
+    <resultMap id="BaseResultMap" type="com.jero.modules.laws.standard.entity.LawsEnterpriseStandard">
             <id property="id" column="id" jdbcType="VARCHAR"/>
             <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
@@ -27,36 +27,30 @@
             <result property="tryFlag" column="try_flag" jdbcType="TINYINT"/>
             <result property="trialPeriod" column="trial_period" jdbcType="VARCHAR"/>
             <result property="standardState" column="standard_state" jdbcType="TINYINT"/>
+            <result property="standardSystem" column="standard_system" jdbcType="VARCHAR"/>
             <result property="mainDraftingUser" column="main_drafting_user" jdbcType="VARCHAR"/>
             <result property="mainDraftingUnit" column="main_drafting_unit" jdbcType="VARCHAR"/>
             <result property="mainDraftingUnitResponsiblePerson" column="main_drafting_unit_responsible_person" jdbcType="VARCHAR"/>
-            <result property="applicableMajor" column="applicable_major" jdbcType="VARCHAR"/>
-            <result property="cooperationUnit" column="cooperation_unit" jdbcType="VARCHAR"/>
-            <result property="partName" column="part_name" jdbcType="VARCHAR"/>
-            <result property="standardScope" column="standard_scope" jdbcType="VARCHAR"/>
             <result property="substituteStandardNum" column="substitute_standard_num" jdbcType="VARCHAR"/>
             <result property="replacedStandardNum" column="replaced_standard_num" jdbcType="VARCHAR"/>
             <result property="quotedStandard" column="quoted_standard" jdbcType="VARCHAR"/>
             <result property="referencedStandard" column="referenced_standard" jdbcType="VARCHAR"/>
+            <result property="cooperationUnit" column="cooperation_unit" jdbcType="VARCHAR"/>
+            <result property="standardPromoter" column="standard_promoter" jdbcType="VARCHAR"/>
+            <result property="partName" column="part_name" jdbcType="VARCHAR"/>
+            <result property="standardScope" column="standard_scope" jdbcType="VARCHAR"/>
             <result property="acquisitionDegree" column="acquisition_degree" jdbcType="VARCHAR"/>
+            <result property="relevantDocument" column="relevant_document" jdbcType="VARCHAR"/>
             <result property="internationalStandardNum" column="international_standard_num" jdbcType="VARCHAR"/>
-            <result property="authDept" column="auth_dept" jdbcType="VARCHAR"/>
+            <result property="originalRelease" column="original_release" jdbcType="VARCHAR"/>
+            <result property="modificationForm" column="modification_form" jdbcType="VARCHAR"/>
+            <result property="approvalDraft" column="approval_draft" jdbcType="VARCHAR"/>
+            <result property="feedbackDraft" column="feedback_draft" jdbcType="VARCHAR"/>
+            <result property="draft" column="draft" jdbcType="VARCHAR"/>
             <result property="chapterClause" column="chapter_clause" jdbcType="VARCHAR"/>
-            <result property="standardContent" column="standard_content" jdbcType="VARCHAR"/>
-            <result property="correctionDepartment" column="correction_department" jdbcType="VARCHAR"/>
-            <result property="participants" column="participants" jdbcType="VARCHAR"/>
-            <result property="proofreader" column="proofreader" jdbcType="VARCHAR"/>
-            <result property="draftMeetingSummary" column="draft_meeting_summary" jdbcType="VARCHAR"/>
-            <result property="draftCompletionDate" column="draft_completion_date" jdbcType="TIMESTAMP"/>
-            <result property="draftReviewDate" column="draft_review_date" jdbcType="TIMESTAMP"/>
-            <result property="feedbackOpenFlag" column="feedback_open_flag" jdbcType="VARCHAR"/>
-            <result property="feedbackDraftDate" column="feedback_draft_date" jdbcType="TIMESTAMP"/>
-            <result property="reviewer" column="reviewer" jdbcType="VARCHAR"/>
-            <result property="scorer" column="scorer" jdbcType="VARCHAR"/>
-            <result property="reviewTime" column="review_time" jdbcType="TIMESTAMP"/>
-            <result property="reviewLocation" column="review_location" jdbcType="VARCHAR"/>
-            <result property="rmrMeetingSummary" column="rmr_meeting_summary" jdbcType="VARCHAR"/>
-            <result property="approvalDate" column="approval_date" jdbcType="TIMESTAMP"/>
+            <result property="standardContentOrRequirements" column="standard_content_or_requirements" jdbcType="VARCHAR"/>
+            <result property="rectificationDepartment" column="rectification_department" jdbcType="VARCHAR"/>
+            <result property="authDept" column="auth_dept" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -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
     </sql>
 </mapper>

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<LawsEnterpriseStandard> {
+
+}

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<LawsEnterpriseStandardMapper, LawsEnterpriseStandard>
+    implements EnterpriseStandardService{
+
+}
+
+
+
+

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<LawsStandardSh
 			 LawsStandardSharing sharing = new LawsStandardSharing();
 			 sharing.setSource("3");
 			 sharing.setStandardId(lawsStandardSharing.getStandardId());
-			 EnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardSharing.getStandardId());
+			 LawsEnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardSharing.getStandardId());
 			 sharing.setStandardName(standard.getStandardName());
 			 sharing.setStandardNum(lawsStandardSharing.getStandardNum());
 			 sharing.setSharerId(sysUser.getId());

laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java

@@ -3,9 +3,8 @@ package com.jero.modules.personal.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.system.vo.LoginUser;
-import com.jero.modules.laws.common.service.ILawsCommonService;
-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;
@@ -85,7 +84,7 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
 			}
 			if ("3".equals(source)){
 				//查询企业标准数据，赋值给collection
-				EnterpriseStandard standard = enterpriseStandardService.getById(standardId);
+				LawsEnterpriseStandard standard = enterpriseStandardService.getById(standardId);
 				if (standard != null){
 					collection.setReleaseDate(standard.getReleaseDate());
 				}

laws-single-startup/src/main/resources/i18n/messages.properties

@@ -37,5 +37,5 @@ no.corresponding.record.found=\u672A\u627E\u5230\u5BF9\u5E94\u8BB0\u5F55
 parameters.cannot.be.null=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A
 root.node.cannot.be.edited=\u6839\u8282\u70B9\u65E0\u6CD5\u7F16\u8F91
 horizontal.transgression=\u6C34\u5E73\u8D8A\u6743
-
+select.level.two.tree.node=\u8BF7\u5148\u9009\u62E9\u4E8C\u7EA7\u53CA\u4EE5\u4E0B\u4F53\u7CFB
 

laws-single-startup/src/main/resources/i18n/messages_en.properties

@@ -38,3 +38,4 @@ no.corresponding.record.found=No corresponding record found
 parameters.cannot.be.null=Parameters cannot be null
 root.node.cannot.be.edited=Root node cannot be edited
 horizontal.transgression=Horizontal overstepping of authority
+select.level.two.tree.node=Please select a level 2 or lower system first

laws-single-startup/src/main/resources/i18n/messages_zh.properties

@@ -38,3 +38,4 @@ no.corresponding.record.found=\u672A\u627E\u5230\u5BF9\u5E94\u8BB0\u5F55
 parameters.cannot.be.null=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A
 root.node.cannot.be.edited=\u6839\u8282\u70B9\u65E0\u6CD5\u7F16\u8F91
 horizontal.transgression=\u6C34\u5E73\u8D8A\u6743
+select.level.two.tree.node=\u8BF7\u5148\u9009\u62E9\u4E8C\u7EA7\u53CA\u4EE5\u4E0B\u4F53\u7CFB

laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/LawsEnterpriseStandardTest.java

@@ -2,20 +2,18 @@ package com.jero.modules.standard.enterprise;
 
 import com.github.javafaker.Faker;
 import com.jero.JeroSystemSingleApplication;
-import com.jero.modules.laws.enterprise.entity.EnterpriseStandard;
+import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardRmrEvaluateDetailService;
-import com.jero.modules.laws.enterprise.service.EnterpriseStandardService;
-import jdk.nashorn.internal.ir.annotations.Reference;
+import com.jero.modules.laws.standard.service.EnterpriseStandardService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.annotation.Resource;
-import java.util.Date;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
@@ -26,7 +24,7 @@ import java.util.concurrent.TimeUnit;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeroSystemSingleApplication.class)
-public class EnterpriseStandardTest {
+public class LawsEnterpriseStandardTest {
 
     @Resource
     private EnterpriseStandardService enterpriseStandardService;
@@ -40,36 +38,35 @@ public class EnterpriseStandardTest {
     private static final Faker faker = new Faker();
     private static final Random random = new Random();
 
-    public static EnterpriseStandard generateRandomEnterpriseStandard() {
-        EnterpriseStandard enterpriseStandard = new EnterpriseStandard();
+    public static LawsEnterpriseStandard generateRandomEnterpriseStandard() {
+        LawsEnterpriseStandard lawsEnterpriseStandard = new LawsEnterpriseStandard();
 
-        enterpriseStandard.setDelFlag(faker.bool().bool() ? 1 : 0);
-        enterpriseStandard.setStandardCode(faker.code().ean13());
-        enterpriseStandard.setNameCode(faker.code().asin());
-        enterpriseStandard.setCategoryCode(faker.commerce().department());
-        enterpriseStandard.setYearNumber(String.valueOf(faker.number().numberBetween(1990, 2023)));
-        enterpriseStandard.setStandardCategory(faker.commerce().department());
-        enterpriseStandard.setGradeClassification(faker.book().genre());
-        enterpriseStandard.setCompIllustration(faker.lorem().sentence());
-        enterpriseStandard.setTryFlag(faker.bool().bool() ? 1 : 0);
-        enterpriseStandard.setTrialPeriod(String.valueOf(faker.number().numberBetween(1, 12)) + " months");
-        enterpriseStandard.setMainDraftingUser(faker.name().fullName());
-        enterpriseStandard.setMainDraftingUnit(faker.company().name());
-        enterpriseStandard.setMainDraftingUnitResponsiblePerson(faker.name().fullName());
-        enterpriseStandard.setApplicableMajor(faker.educator().course());
-        enterpriseStandard.setCooperationUnit(faker.company().name());
-        enterpriseStandard.setPartName(faker.lorem().word());
+        lawsEnterpriseStandard.setDelFlag(faker.bool().bool() ? 1 : 0);
+        lawsEnterpriseStandard.setStandardCode(faker.code().ean13());
+        lawsEnterpriseStandard.setNameCode(faker.code().asin());
+        lawsEnterpriseStandard.setCategoryCode(faker.commerce().department());
+        lawsEnterpriseStandard.setYearNumber(String.valueOf(faker.number().numberBetween(1990, 2023)));
+        lawsEnterpriseStandard.setStandardCategory(faker.commerce().department());
+        lawsEnterpriseStandard.setGradeClassification(faker.book().genre());
+        lawsEnterpriseStandard.setCompIllustration(faker.lorem().sentence());
+        lawsEnterpriseStandard.setTryFlag(faker.bool().bool() ? 1 : 0);
+        lawsEnterpriseStandard.setTrialPeriod(String.valueOf(faker.number().numberBetween(1, 12)) + " months");
+        lawsEnterpriseStandard.setMainDraftingUser(faker.name().fullName());
+        lawsEnterpriseStandard.setMainDraftingUnit(faker.company().name());
+        lawsEnterpriseStandard.setMainDraftingUnitResponsiblePerson(faker.name().fullName());
+        lawsEnterpriseStandard.setCooperationUnit(faker.company().name());
+        lawsEnterpriseStandard.setPartName(faker.lorem().word());
 
         // ... continue with more fields as needed
 
-        enterpriseStandard.setStandardNo(faker.code().ean8());
-        enterpriseStandard.setStandardName(faker.commerce().productName());
-        enterpriseStandard.setEnglishName(faker.commerce().productName());
-        enterpriseStandard.setReleaseDate(faker.date().past(1, TimeUnit.SECONDS));
-        enterpriseStandard.setImplementationDate(faker.date().past(1, TimeUnit.SECONDS));
-        enterpriseStandard.setStandardState(faker.random().nextInt(5));
+        lawsEnterpriseStandard.setStandardNo(faker.code().ean8());
+        lawsEnterpriseStandard.setStandardName(faker.commerce().productName());
+        lawsEnterpriseStandard.setEnglishName(faker.commerce().productName());
+        lawsEnterpriseStandard.setReleaseDate(faker.date().past(1, TimeUnit.SECONDS));
+        lawsEnterpriseStandard.setImplementationDate(faker.date().past(1, TimeUnit.SECONDS));
+        lawsEnterpriseStandard.setStandardState(faker.random().nextInt(5));
 
-        return enterpriseStandard;
+        return lawsEnterpriseStandard;
     }
 
     public static EnterpriseStandardPlan generateRandomEnterpriseStandardPlan() {
@@ -89,7 +86,7 @@ public class EnterpriseStandardTest {
     }
     @Test
     public void insertRandomES() {
-        EnterpriseStandard randomData = generateRandomEnterpriseStandard();
+        LawsEnterpriseStandard randomData = generateRandomEnterpriseStandard();
         enterpriseStandardService.save(randomData);
         System.out.println(randomData);
     }