字段名修改

rc/src/main/java/com/ruoyi/rc/domain/TProgress.java

@@ -69,7 +69,7 @@ public class TProgress extends BaseEntity
 
     /** 进度描述 */
     @Excel(name = "进度描述")
-    private String progress;
+    private String description;
 
     /** 审批状态 */
     @Excel(name = "审批状态")
@@ -191,14 +191,14 @@ public class TProgress extends BaseEntity
     {
         return preparation;
     }
-    public void setProgress(String progress) 
+    public void setDescription(String description)
     {
-        this.progress = progress;
+        this.description = description;
     }
 
-    public String getProgress() 
+    public String getDescription()
     {
-        return progress;
+        return description;
     }
     public void setApplyStatus(String applyStatus) 
     {
@@ -243,7 +243,7 @@ public class TProgress extends BaseEntity
             .append("targetDate", getTargetDate())
             .append("finishDate", getFinishDate())
             .append("preparation", getPreparation())
-            .append("progress", getProgress())
+            .append("description", getDescription())
             .append("applyStatus", getApplyStatus())
             .append("remarks", getRemarks())
             .append("deptId", getDeptId())

rc/src/main/java/com/ruoyi/rc/domain/TSecSubChap.java

@@ -51,7 +51,7 @@ public class TSecSubChap extends BaseEntity
 
     /** YES/NO/NA */
     @Excel(name = "YES/NO/NA")
-    private String yeaNoNa;
+    private String yesNoNa;
 
     /** MinimumStandard */
     @Excel(name = "MinimumStandard")
@@ -63,7 +63,7 @@ public class TSecSubChap extends BaseEntity
 
     /** 标准 */
     @Excel(name = "标准")
-    private String starndard;
+    private String standard;
 
     /** 完成情况 */
     @Excel(name = "完成情况")
@@ -157,14 +157,14 @@ public class TSecSubChap extends BaseEntity
     {
         return name;
     }
-    public void setYeaNoNa(String yeaNoNa) 
+    public void setYesNoNa(String setYesNoNa)
     {
-        this.yeaNoNa = yeaNoNa;
+        this.yesNoNa = yesNoNa;
     }
 
-    public String getYeaNoNa() 
+    public String getYesNoNa()
     {
-        return yeaNoNa;
+        return yesNoNa;
     }
     public void setMinimumStandard(String minimumStandard) 
     {
@@ -184,14 +184,14 @@ public class TSecSubChap extends BaseEntity
     {
         return goodPractices;
     }
-    public void setStarndard(String starndard) 
+    public void setStandard(String standard)
     {
-        this.starndard = starndard;
+        this.standard = standard;
     }
 
-    public String getStarndard() 
+    public String getStandard()
     {
-        return starndard;
+        return standard;
     }
     public void setCompletionStatus(String completionStatus) 
     {
@@ -250,10 +250,10 @@ public class TSecSubChap extends BaseEntity
             .append("directory", getDirectory())
             .append("code", getCode())
             .append("name", getName())
-            .append("yeaNoNa", getYeaNoNa())
+            .append("yeaNoNa", getYesNoNa())
             .append("minimumStandard", getMinimumStandard())
             .append("goodPractices", getGoodPractices())
-            .append("starndard", getStarndard())
+            .append("standard", getStandard())
             .append("completionStatus", getCompletionStatus())
             .append("personInCharge", getPersonInCharge())
             .append("reviewer", getReviewer())

rc/src/main/resources/mapper/rc/TProgressMapper.xml

@@ -17,14 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="targetDate"    column="target_date"    />
         <result property="finishDate"    column="finish_date"    />
         <result property="preparation"    column="preparation"    />
-        <result property="progress"    column="progress"    />
+        <result property="description"    column="description"    />
         <result property="applyStatus"    column="apply_status"    />
         <result property="remarks"    column="remarks"    />
         <result property="deptId"    column="dept_id"    />
     </resultMap>
 
     <sql id="selectTProgressVo">
-        select id, sec_sub_chap_id, chap_name, sub_chap_name, sec_sub_chap_name, content, person_in_charge, supporter, start_date, target_date, finish_date, preparation, progress, apply_status, remarks, dept_id from t_progress
+        select id, sec_sub_chap_id, chap_name, sub_chap_name, sec_sub_chap_name, content, person_in_charge, supporter, start_date, target_date, finish_date, preparation, description, apply_status, remarks, dept_id from t_progress
     </sql>
 
     <select id="selectTProgressList" parameterType="TProgress" resultMap="TProgressResult">
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="targetDate != null "> and target_date = #{targetDate}</if>
             <if test="finishDate != null "> and finish_date = #{finishDate}</if>
             <if test="preparation != null  and preparation != ''"> and preparation = #{preparation}</if>
-            <if test="progress != null  and progress != ''"> and progress = #{progress}</if>
+            <if test="description != null  and description != ''"> and description = #{description}</if>
             <if test="applyStatus != null  and applyStatus != ''"> and apply_status = #{applyStatus}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="targetDate != null">target_date,</if>
             <if test="finishDate != null">finish_date,</if>
             <if test="preparation != null">preparation,</if>
-            <if test="progress != null">progress,</if>
+            <if test="description != null">description,</if>
             <if test="applyStatus != null">apply_status,</if>
             <if test="remarks != null">remarks,</if>
             <if test="deptId != null">dept_id,</if>
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="targetDate != null">#{targetDate},</if>
             <if test="finishDate != null">#{finishDate},</if>
             <if test="preparation != null">#{preparation},</if>
-            <if test="progress != null">#{progress},</if>
+            <if test="description != null">#{description},</if>
             <if test="applyStatus != null">#{applyStatus},</if>
             <if test="remarks != null">#{remarks},</if>
             <if test="deptId != null">#{deptId},</if>
@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="targetDate != null">target_date = #{targetDate},</if>
             <if test="finishDate != null">finish_date = #{finishDate},</if>
             <if test="preparation != null">preparation = #{preparation},</if>
-            <if test="progress != null">progress = #{progress},</if>
+            <if test="description != null">description = #{description},</if>
             <if test="applyStatus != null">apply_status = #{applyStatus},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTProgressByIds" parameterType="String">
-        delete from t_progress where id in 
+        delete from t_progress where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

rc/src/main/resources/mapper/rc/TSecSubChapMapper.xml

@@ -13,10 +13,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="directory"    column="directory"    />
         <result property="code"    column="code"    />
         <result property="name"    column="name"    />
-        <result property="yeaNoNa"    column="yea_no_na"    />
+        <result property="yesNoNa"    column="yes_no_na"    />
         <result property="minimumStandard"    column="minimum_standard"    />
         <result property="goodPractices"    column="good_practices"    />
-        <result property="starndard"    column="starndard"    />
+        <result property="standard"    column="standard"    />
         <result property="completionStatus"    column="completion_status"    />
         <result property="personInCharge"    column="person_in_charge"    />
         <result property="reviewer"    column="reviewer"    />
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTSecSubChapVo">
-        select id, audit_id, sub_chap_id, year, type, directory, code, name, yea_no_na, minimum_standard, good_practices, starndard, completion_status, person_in_charge, reviewer, remarks, dept_id from t_sec_sub_chap
+        select id, audit_id, sub_chap_id, year, type, directory, code, name, yes_no_na, minimum_standard, good_practices, standard, completion_status, person_in_charge, reviewer, remarks, dept_id from t_sec_sub_chap
     </sql>
 
     <select id="selectTSecSubChapList" parameterType="TSecSubChap" resultMap="TSecSubChapResult">
@@ -38,10 +38,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="directory != null  and directory != ''"> and directory = #{directory}</if>
             <if test="code != null "> and code = #{code}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="yeaNoNa != null  and yeaNoNa != ''"> and yea_no_na = #{yeaNoNa}</if>
+            <if test="yesNoNa != null  and yesNoNa != ''"> and yes_no_na = #{yesNoNa}</if>
             <if test="minimumStandard != null  and minimumStandard != ''"> and minimum_standard = #{minimumStandard}</if>
             <if test="goodPractices != null  and goodPractices != ''"> and good_practices = #{goodPractices}</if>
-            <if test="starndard != null  and starndard != ''"> and starndard = #{starndard}</if>
+            <if test="standard != null  and standard != ''"> and standard = #{standard}</if>
             <if test="completionStatus != null  and completionStatus != ''"> and completion_status = #{completionStatus}</if>
             <if test="personInCharge != null "> and person_in_charge = #{personInCharge}</if>
             <if test="reviewer != null "> and reviewer = #{reviewer}</if>
@@ -65,10 +65,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="directory != null">directory,</if>
             <if test="code != null">code,</if>
             <if test="name != null">name,</if>
-            <if test="yeaNoNa != null">yea_no_na,</if>
+            <if test="yesNoNa != null">yes_no_na,</if>
             <if test="minimumStandard != null">minimum_standard,</if>
             <if test="goodPractices != null">good_practices,</if>
-            <if test="starndard != null">starndard,</if>
+            <if test="standard != null">standard,</if>
             <if test="completionStatus != null">completion_status,</if>
             <if test="personInCharge != null">person_in_charge,</if>
             <if test="reviewer != null">reviewer,</if>
@@ -83,10 +83,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="directory != null">#{directory},</if>
             <if test="code != null">#{code},</if>
             <if test="name != null">#{name},</if>
-            <if test="yeaNoNa != null">#{yeaNoNa},</if>
+            <if test="yesNoNa != null">#{yesNoNa},</if>
             <if test="minimumStandard != null">#{minimumStandard},</if>
             <if test="goodPractices != null">#{goodPractices},</if>
-            <if test="starndard != null">#{starndard},</if>
+            <if test="standard != null">#{standard},</if>
             <if test="completionStatus != null">#{completionStatus},</if>
             <if test="personInCharge != null">#{personInCharge},</if>
             <if test="reviewer != null">#{reviewer},</if>
@@ -105,10 +105,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="directory != null">directory = #{directory},</if>
             <if test="code != null">code = #{code},</if>
             <if test="name != null">name = #{name},</if>
-            <if test="yeaNoNa != null">yea_no_na = #{yeaNoNa},</if>
+            <if test="yesNoNa != null">yes_no_na = #{yesNoNa},</if>
             <if test="minimumStandard != null">minimum_standard = #{minimumStandard},</if>
             <if test="goodPractices != null">good_practices = #{goodPractices},</if>
-            <if test="starndard != null">starndard = #{starndard},</if>
+            <if test="standard != null">standard = #{standard},</if>
             <if test="completionStatus != null">completion_status = #{completionStatus},</if>
             <if test="personInCharge != null">person_in_charge = #{personInCharge},</if>
             <if test="reviewer != null">reviewer = #{reviewer},</if>

ruoyi-ui/src/views/rc/progress/index.vue

@@ -57,9 +57,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="进度描述" prop="progress">
+      <el-form-item label="进度描述" prop="description">
         <el-input
-          v-model="queryParams.progress"
+          v-model="queryParams.description"
           placeholder="请输入进度描述"
           clearable
           @keyup.enter.native="handleQuery"
@@ -151,7 +151,7 @@
         </template>
       </el-table-column>
       <el-table-column label="准备情况" align="center" prop="preparation" />
-      <el-table-column label="进度描述" align="center" prop="progress" />
+      <el-table-column label="进度描述" align="center" prop="description" />
       <el-table-column label="审批状态" align="center" prop="applyStatus" />
       <el-table-column label="备注" align="center" prop="remarks" />
       <el-table-column label="装置id" align="center" prop="deptId" />
@@ -234,8 +234,8 @@
         <el-form-item label="准备情况" prop="preparation">
           <el-input v-model="form.preparation" placeholder="请输入准备情况" />
         </el-form-item>
-        <el-form-item label="进度描述" prop="progress">
-          <el-input v-model="form.progress" placeholder="请输入进度描述" />
+        <el-form-item label="进度描述" prop="description">
+          <el-input v-model="form.description" placeholder="请输入进度描述" />
         </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />
@@ -292,7 +292,7 @@ export default {
         targetDate: null,
         finishDate: null,
         preparation: null,
-        progress: null,
+        description: null,
         applyStatus: null,
         remarks: null,
         deptId: null
@@ -337,7 +337,7 @@ export default {
         targetDate: null,
         finishDate: null,
         preparation: null,
-        progress: null,
+        description: null,
         applyStatus: null,
         remarks: null,
         deptId: null

ruoyi-ui/src/views/rc/secsubchap/index.vue

@@ -33,17 +33,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="YES/NO/NA" prop="yeaNoNa">
+      <el-form-item label="YES/NO/NA" prop="yesNoNa">
         <el-input
-          v-model="queryParams.yeaNoNa"
+          v-model="queryParams.yesNoNa"
           placeholder="请输入YES/NO/NA"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="标准" prop="starndard">
+      <el-form-item label="标准" prop="standard">
         <el-input
-          v-model="queryParams.starndard"
+          v-model="queryParams.standard"
           placeholder="请输入标准"
           clearable
           @keyup.enter.native="handleQuery"
@@ -139,10 +139,10 @@
       <el-table-column label="目录" align="center" prop="directory" />
       <el-table-column label="序号" align="center" prop="code" />
       <el-table-column label="名称" align="center" prop="name" />
-      <el-table-column label="YES/NO/NA" align="center" prop="yeaNoNa" />
+      <el-table-column label="YES/NO/NA" align="center" prop="yesNoNa" />
       <el-table-column label="MinimumStandard" align="center" prop="minimumStandard" />
       <el-table-column label="Good Practices" align="center" prop="goodPractices" />
-      <el-table-column label="标准" align="center" prop="starndard" />
+      <el-table-column label="标准" align="center" prop="standard" />
       <el-table-column label="完成情况" align="center" prop="completionStatus" />
       <el-table-column label="负责人" align="center" prop="personInCharge" />
       <el-table-column label="审核人" align="center" prop="reviewer" />
@@ -202,8 +202,8 @@
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="YES/NO/NA" prop="yeaNoNa">
-          <el-input v-model="form.yeaNoNa" placeholder="请输入YES/NO/NA" />
+        <el-form-item label="YES/NO/NA" prop="yesNoNa">
+          <el-input v-model="form.yesNoNa" placeholder="请输入YES/NO/NA" />
         </el-form-item>
         <el-form-item label="MinimumStandard" prop="minimumStandard">
           <el-input v-model="form.minimumStandard" type="textarea" placeholder="请输入内容" />
@@ -211,8 +211,8 @@
         <el-form-item label="Good Practices" prop="goodPractices">
           <el-input v-model="form.goodPractices" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="标准" prop="starndard">
-          <el-input v-model="form.starndard" placeholder="请输入标准" />
+        <el-form-item label="标准" prop="standard">
+          <el-input v-model="form.standard" placeholder="请输入标准" />
         </el-form-item>
         <el-form-item label="负责人" prop="personInCharge">
           <el-input v-model="form.personInCharge" placeholder="请输入负责人" />
@@ -271,10 +271,10 @@ export default {
         directory: null,
         code: null,
         name: null,
-        yeaNoNa: null,
+        yesNoNa: null,
         minimumStandard: null,
         goodPractices: null,
-        starndard: null,
+        standard: null,
         completionStatus: null,
         personInCharge: null,
         reviewer: null,
@@ -317,10 +317,10 @@ export default {
         directory: null,
         code: null,
         name: null,
-        yeaNoNa: null,
+        yesNoNa: null,
         minimumStandard: null,
         goodPractices: null,
-        starndard: null,
+        standard: null,
         completionStatus: null,
         personInCharge: null,
         reviewer: null,

sql/create.sql

@@ -58,10 +58,10 @@ create table t_sec_sub_chap (
   directory         varchar(500)  comment '目录',
   code              bigint(20)    comment '序号',
   name              varchar(500)  comment '名称',
-  yea_no_na         char(1)       comment 'YES/NO/NA',
+  yes_no_na         char(1)       comment 'YES/NO/NA',
   minimum_standard  varchar(500)  comment 'MinimumStandard',
   good_practices    varchar(500)  comment 'Good Practices',
-  starndard         char(1)       comment '标准',
+  standard         char(1)        comment '标准',
   completion_status char(1)       comment '完成情况',
   person_in_charge  bigint(20)    comment '负责人',
   reviewer          bigint(20)    comment '审核人',
@@ -86,7 +86,7 @@ create table t_progress (
   target_date       datetime      comment '目标日期',
   finish_date       datetime      comment '实际完成日期',
   preparation       char(1)       comment '准备情况',
-  progress          char(1)       comment '进度描述',
+  description          char(1)    comment '进度描述',
   apply_status      char(1)       comment '审批状态',
   remarks           varchar(500)  comment '备注',
   dept_id           bigint(20)    comment '装置id',