ci: 修改企标实体类字段

2023-09-19 09:13:28 +08:00
parent e6ba82aab6
commit 7bbd590533
10 changed files with 16 additions and 17 deletions
@@ -64,5 +64,5 @@ public class EnterpriseStandardInspectObject implements Serializable {

    /** 计划稽查对象 */
    @ApiModelProperty(value = "计划稽查对象")
-    private String planInspectObjecy;
+    private String planInspectObject;
 }
@@ -31,7 +31,7 @@
    <select id="page" resultType="com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo">
        SELECT
            d.id,
-            s.standard_no,
+            s.standard_number,
            s.standard_name,
            s.release_date,
            s.implementation_date,
@@ -48,7 +48,7 @@
        Where 1 = 1
        <!--企标编号判断-->
        <if test="param.standardNo != null and param.standardNo != ''">
-            AND s.standard_no LIKE CONCAT('%',#{param.standardNo},'%')
+            AND s.standard_number LIKE CONCAT('%',#{param.standardNo},'%')
        </if>
        <!--企标名称判断-->
        <if test="param.standardName != null and param.standardName != ''">
@@ -13,7 +13,7 @@
            <result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
            <result property="inspectId" column="inspect_id" jdbcType="VARCHAR"/>
            <result property="requestDelayDate" column="request_delay_date" jdbcType="TIMESTAMP"/>
-            <result property="delayDescprtion" column="delay_descprtion" jdbcType="VARCHAR"/>
+            <result property="delayDescription" column="delay_descprtion" jdbcType="VARCHAR"/>
    </resultMap>

    <sql id="Base_Column_List">
@@ -27,7 +27,7 @@
        SELECT
            DISTINCT
            i.id,
-            s.standard_no AS inspectNo,
+            s.standard_number AS inspectNo,
            s.standard_name AS inspectName,
            io.planInspectObject AS planInspectObject,
            w.`name` AS standardizationWorkGroup,
@@ -46,7 +46,7 @@
        FROM
            `laws_enterprise_standard_inspect` AS i
            LEFT JOIN laws_working_group AS w ON w.id = i.standardization_work_group
-            LEFT JOIN laws_enterprise_standard AS s ON s.standard_no = i.inspect_no
+            LEFT JOIN laws_enterprise_standard AS s ON s.standard_number = i.inspect_no
            LEFT JOIN sys_depart AS d ON d.id = i.belong_dept
            LEFT JOIN sys_user AS u1 ON u1.id = i.inspect_user
            LEFT JOIN sys_user AS u2 ON u2.id = i.standardization_docking_user
@@ -62,7 +62,7 @@
        WHERE 1 = 1
            <!--企标编号判断-->
            <if test="param.standardNo != null and param.standardNo != ''">
-                AND s.standard_no LIKE CONCAT('%',#{param.standardNo},'%')
+                AND s.standard_number LIKE CONCAT('%',#{param.standardNo},'%')
            </if>
            <!--企标名称判断-->
            <if test="param.standardName != null and param.standardName != ''">
@@ -74,7 +74,7 @@
            </if>
            <!--所属部门判断-->
            <if test="param.inspectDept != null and param.inspectDept != ''">
-                AND i.belone_dept = #{param.inspectDept}
+                AND i.belong_dept = #{param.inspectDept}
            </if>
            <!--计划稽查日期判断-->
            <if test="param.inspectStartDate != null and param.inspectEndDate != null">
@@ -12,7 +12,7 @@
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
            <result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
            <result property="inspectId" column="inspect_id" jdbcType="VARCHAR"/>
-            <result property="planInspectObjecy" column="plan_inspect_objecy" jdbcType="VARCHAR"/>
+            <result property="planInspectObject" column="plan_inspect_object" jdbcType="VARCHAR"/>
    </resultMap>

    <sql id="Base_Column_List">
@@ -25,7 +25,7 @@
    <select id="page" resultType="com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardRecheckPlanVo">
        SELECT
            p.id,
-            s.standard_no AS standardNo,
+            s.standard_number AS standardNo,
            s.standard_name AS standardName,
            s.release_date AS releaseDate,
            p.recheck_date AS recheckDate,
@@ -34,7 +34,7 @@
            d.depart_name AS mainDraftingUnit
        FROM
            laws_enterprise_standard_recheck_plan AS p
-                LEFT JOIN laws_enterprise_standard AS s ON s.standard_no = p.standard_no
+                LEFT JOIN laws_enterprise_standard AS s ON s.standard_number = p.standard_no
                LEFT JOIN sys_user AS u ON u.id = s.main_drafting_user
                LEFT JOIN sys_depart AS d ON d.id = s.main_drafting_unit
        WHERE
@@ -43,7 +43,7 @@
            (p.recheck_result IS NOT NULL)
            <!--企标编号判断-->
            <if test="param.standardNo != null and param.standardNo != ''">
-                AND s.standard_no LIKE CONCAT('%',#{param.standardNo},'%')
+                AND s.standard_number LIKE CONCAT('%',#{param.standardNo},'%')
            </if>
            <!--企标名称判断-->
            <if test="param.standardName != null and param.standardName != ''">
@@ -11,7 +11,6 @@
            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
            <result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
-            <result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
            <result property="evaluateItem" column="evaluate_item" jdbcType="VARCHAR"/>
            <result property="evaluateScore" column="evaluate_score" jdbcType="VARCHAR"/>
            <result property="deductionScoreReason" column="deduction_score_reason" jdbcType="VARCHAR"/>
@@ -20,7 +19,7 @@
    <sql id="Base_Column_List">
        id,create_by,create_time,
        update_by,update_time,org_code,
-        standard_no,evaluate_item,evaluate_score,
+        evaluate_item,evaluate_score,
        deduction_score_reason
    </sql>
 </mapper>
@@ -71,7 +71,7 @@ public class LawsEnterpriseStandard implements Serializable {
     * 企标编号
     */
    @ApiModelProperty(value = "企标编号")
-    private String standardNo;
+    private String standardNumber;

    /**
     * 企标名称
@@ -12,7 +12,7 @@
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
            <result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
            <result property="delFlag" column="del_flag" jdbcType="TINYINT"/>
-            <result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
+            <result property="standardNumber" column="standard_number" jdbcType="VARCHAR"/>
            <result property="standardName" column="standard_name" jdbcType="VARCHAR"/>
            <result property="standardCode" column="standard_code" jdbcType="VARCHAR"/>
            <result property="nameCode" column="name_code" jdbcType="VARCHAR"/>
@@ -59,7 +59,7 @@ public class LawsEnterpriseStandardTest {

        // ... continue with more fields as needed

-        lawsEnterpriseStandard.setStandardNo(faker.code().ean8());
+        lawsEnterpriseStandard.setStandardNumber(faker.code().ean8());
        lawsEnterpriseStandard.setStandardName(faker.commerce().productName());
        lawsEnterpriseStandard.setEnglishName(faker.commerce().productName());
        lawsEnterpriseStandard.setReleaseDate(faker.date().past(1, TimeUnit.SECONDS));