数据库字段名修改

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysSupplies.java

@@ -36,7 +36,7 @@ public class SysSupplies extends BaseEntity
 
     /** 内容 */
     @Excel(name = "内容")
-    private String content;
+    private String templateContent;
 
     /** 状态 */
     @Excel(name = "状态")
@@ -80,15 +80,14 @@ public class SysSupplies extends BaseEntity
         return detId;
     }
 
-    public void setContent(String content)
-    {
-        this.content = content;
+    public String getTemplateContent() {
+        return templateContent;
     }
 
-    public String getContent()
-    {
-        return content;
+    public void setTemplateContent(String templateContent) {
+        this.templateContent = templateContent;
     }
+
     public void setStatus(Long status)
     {
         this.status = status;
@@ -105,7 +104,7 @@ public class SysSupplies extends BaseEntity
                 .append("id", getId())
                 .append("detId", getDetId())
                 .append("name", getTemplateName())
-                .append("content", getContent())
+                .append("content", getTemplateContent())
                 .append("status", getStatus())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())

ruoyi-system/src/main/resources/mapper/system/SysSuppliesMapper.xml

@@ -8,7 +8,7 @@
         <result property="id"    column="id"    />
         <result property="detId"    column="det_id"    />
         <result property="templateName"    column="template_name"    />
-        <result property="content"    column="content"    />
+        <result property="templateContent"    column="template_content"    />
         <result property="status"    column="status"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -31,7 +31,7 @@
     </resultMap>
 
     <sql id="selectSuppliesTemplateVo">
-        select id, det_id, template_name, content, status, create_by, create_time, update_by, update_time from act_supplies_template
+        select id, det_id, template_name, template_content, status, create_by, create_time, update_by, update_time from act_supplies_template
     </sql>
 
     <select id="selectlistnameid" parameterType="com.ruoyi.system.domain.ActSuppliesDetails" resultMap="SuppliesDetailsResult">
@@ -40,11 +40,11 @@
 
 
     <select id="selectSuppliesTemplateList" parameterType="SysSupplies" resultMap="SuppliesTemplateResult">
-        select a.id, a.det_id, a.template_name, a.content, a.status,b.details_name sname,b.sysclassify from act_supplies_template a,act_supplies_details b
+        select a.id, a.det_id, a.template_name, a.template_content, a.status,b.details_name sname,b.sysclassify from act_supplies_template a,act_supplies_details b
         <where>
             <if test="detId != null "> and a.det_id = #{detId}</if>
             <if test="templateName != null  and templateName != ''"> and a.template_name like concat('%', #{templateName}, '%')</if>
-            <if test="content != null  and content != ''"> and a.content = #{content}</if>
+            <if test="templateContent != null  and templateContent != ''"> and a.template_content = #{templateContent}</if>
             <if test="status != null "> and a.status = #{status}</if>
             and a.det_id = b.id
         </where>
@@ -65,7 +65,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="detId != null">det_id,</if>
             <if test="templateName != null">template_name,</if>
-            <if test="content != null">content,</if>
+            <if test="templateContent != null">template_content,</if>
             <if test="status != null">status,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -75,7 +75,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="detId != null">#{detId},</if>
             <if test="templateName != null">#{templateName},</if>
-            <if test="content != null">#{content},</if>
+            <if test="templateContent != null">#{templateContent},</if>
             <if test="status != null">#{status},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -89,7 +89,7 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="detId != null">det_id = #{detId},</if>
             <if test="templateName != null">template_name = #{templateName},</if>
-            <if test="content != null">content = #{content},</if>
+            <if test="templateContent != null">template_content = #{templateContent},</if>
             <if test="status != null">status = #{status},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

ruoyi-ui/src/views/system/supplies/index_template.vue

@@ -119,8 +119,8 @@
           <el-select v-model="form.detId" filterable placeholder="请选择关联项" >
             <el-option
               v-for="option in options3"
-              :key="option.name"
-              :label="option.name"
+              :key="option.detailsName"
+              :label="option.detailsName"
               :value="option.id"
             ></el-option>
           </el-select>
@@ -195,7 +195,7 @@ export default {
         pageSize: 10,
         detId: null,
         templateName: null,
-        content: null,
+        templateContent: null,
         status: null,
       },
       form: {
@@ -229,7 +229,7 @@ export default {
       fileName = fileName + "";
       LuckyExcel.transformExcelToLucky(file ,(exportJson,lucksheetfile)=>{
         this.form.templateName = fileName;
-        this.form.content = JSON.stringify(exportJson.sheets);
+        this.form.templateContent = JSON.stringify(exportJson.sheets);
       });
     },
 
@@ -253,8 +253,8 @@ export default {
         id: null,
         detId: null,
         name: null,
-        content: null,
-        status: null,
+        templateContent: null,
+        status: 0,
         createBy: null,
         createTime: null,
         updateBy: null,
@@ -330,7 +330,7 @@ export default {
       luckysheet.create({
         container: "luckysheet", // Luckysheet 的容器元素 ID
         title: this.SuppliesTemplateList[ida].name, // Excel 文件名
-        data: JSON.parse(this.SuppliesTemplateList[ida].content), // Excel 数据
+        data: JSON.parse(this.SuppliesTemplateList[ida].templateContent), // Excel 数据
         myFolderUrl: "http://localhost:5000/supplies/suppliesTemplate",//作用：左上角<返回按钮的链接
         showtoolbar: false, //是否第二列显示工具栏
         showinfobar: true, //是否显示顶部名称栏