1

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesSixMinesSummaryTable.java

@@ -5,6 +5,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+
 /**
  *  六矿汇总表 act_supplies_sixminessummarytable
  *
@@ -47,6 +49,10 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity
     @Excel(name = "创建人")
     private String createBy;
 
+    /** 日期 */
+    @Excel(name = "日期")
+    private Date date;
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -125,6 +131,14 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity
         this.createBy = createBy;
     }
 
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
     @Override
     public String toString() {
         return "ActSuppliesSixMinesSummaryTable{" +
@@ -137,6 +151,7 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity
                 ", nuitPrice=" + nuitPrice +
                 ", money=" + money +
                 ", createBy='" + createBy + '\'' +
+                ", date=" + date +
                 '}';
     }
 }

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesCleaningRuleMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nuitPrice"    column="nuit_price"    />
         <result property="money"    column="money"    />
         <result property="createBy"    column="create_by"    />
+        <result property="date"    column="date"    />
 
     </resultMap>
     <insert id="addActSuppliesSixMinesSummaryTable" parameterType="ActSuppliesSixMinesSummaryTable" useGeneratedKeys="true" keyProperty="id">
@@ -26,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nuitPrice != null">nuit_price,</if>
             <if test="money != null">money,</if>
             <if test="createBy != null">create_by,</if>
+            <if test="date != null">date,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="hId != null">#{hId},</if>
@@ -36,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nuitPrice != null">#{nuitPrice},</if>
             <if test="money != null">#{money},</if>
             <if test="createBy != null">#{createBy},</if>
+            <if test="date != null">#{date},</if>
         </trim>
     </insert>
 

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesHistorydataMapper.xml

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectActSuppliesHistorydataVo">
-        select id, import_uuid, template_id, export_uuid, role_id, history_name, history_content, identifying_code,clean_status ,status, create_by, create_time from act_supplies_historydata
+        select id, import_uuid, template_id, export_uuid, role_id, history_name, history_content, identifying_code,clean_status ,status, create_by, date, create_time from act_supplies_historydata
     </sql>
 
     <select id="selectActSuppliesHistorydataList" parameterType="ActSuppliesHistorydata" resultMap="ActSuppliesHistorydataResult">

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

@@ -107,7 +107,8 @@ export default {
                 number  : "",
                 nuitPrice : "",
                 money : "",
-                createBy  : ""
+                createBy  : "",
+                date : null
 
             },
             dfrom:{},
@@ -904,7 +905,7 @@ export default {
                                 if (allNull ) {
                                     throw new Error("导入失败,导入文件错误,所选文件与模板规则不匹");
                                 }
-                                
+
 
 
 
@@ -1199,6 +1200,9 @@ export default {
                         for (let j = 0; j < jsonDataa.length; j++) {
                             let  dataa=window.luckysheet.transToData(jsonDataa[j].celldata);
                             for (let k = 2; k < dataa.length; k++) {
+                                if(dataa[k][1] == null){
+                                    break;
+                                }
                                 let a0;
                                 let a1;
                                 let a3;
@@ -1257,6 +1261,7 @@ export default {
                                     this.froms.nuitPrice =a5;
                                     this.froms.money =a6;
                                     this.froms.createBy = data[i].createBy;
+                                    this.froms.date = data[i].date;
                                     addActSuppliesSixMinesSummaryTable(this.froms).then(response => {});
                                 }
                             }