历史表添加是否清洗字段

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

@@ -57,6 +57,9 @@ public class ActSuppliesHistorydata extends BaseEntity
     @Excel(name = "状态")
     private Long status;
 
+    /** 是否清洗 */
+    private Long cleanStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -159,6 +162,14 @@ public class ActSuppliesHistorydata extends BaseEntity
         return status;
     }
 
+    public Long getCleanStatus() {
+        return cleanStatus;
+    }
+
+    public void setCleanStatus(Long cleanStatus) {
+        this.cleanStatus = cleanStatus;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesDetailsServiceImpl.java

@@ -81,7 +81,7 @@ public class ActSuppliesDetailsServiceImpl implements IActSuppliesDetailsService
         /*if (actSuppliesDetails.getLevel() == 2){
             actSuppliesDetails.setTwoLevel(actSuppliesDetails.getOneLevel()+actSuppliesDetails.getTwoLevel());
         }else if (actSuppliesDetails.getLevel()==3){
-            actSuppliesDetails.setTwoLevel(actSuppliesDetails.getTwoLevel()+actSuppliesDetails.getThreeLevel());
+            actSuppliesDetails.setThreeLevel(actSuppliesDetails.getTwoLevel()+actSuppliesDetails.getThreeLevel());
         }
 
         int countBySuppliesLevel = actSuppliesDetailsMapper.countBySuppliesLevel(actSuppliesDetails);
@@ -111,7 +111,7 @@ public class ActSuppliesDetailsServiceImpl implements IActSuppliesDetailsService
        /* if (actSuppliesDetails.getLevel() == 2){
             actSuppliesDetails.setTwoLevel(actSuppliesDetails.getOneLevel()+actSuppliesDetails.getTwoLevel());
         }else if (actSuppliesDetails.getLevel()==3){
-            actSuppliesDetails.setTwoLevel(actSuppliesDetails.getTwoLevel()+actSuppliesDetails.getThreeLevel());
+            actSuppliesDetails.setThreeLevel(actSuppliesDetails.getTwoLevel()+actSuppliesDetails.getThreeLevel());
         }*/
 
         SysUser user = SecurityUtils.getLoginUser().getUser();

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesHistorydataServiceImpl.java

@@ -115,6 +115,7 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
             for (int i=0;i<actSuppliesHistorydata.size();i++) {
                 actSuppliesHistorydata.get(i).setCreateBy(user.getUserName());
                 actSuppliesHistorydata.get(i).setCreateTime(DateUtils.getNowDate());
+                actSuppliesHistorydata.get(i).setCleanStatus(1L);
                 actSuppliesHistorydataMapper.updateActSuppliesHistorydatas(actSuppliesHistorydata.get(i));
             }
         }else {
@@ -127,6 +128,7 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
                     actSuppliesHistorydata1.setTemplateId(actSuppliesHistorydata.get(0).getTemplateId());
                     actSuppliesHistorydata1.setRoleId(actSuppliesHistorydata.get(i).getRoleId());
                     actSuppliesHistorydata1.setStatus(1L);
+                    actSuppliesHistorydata.get(i).setCleanStatus(1L);
                     actSuppliesHistorydata1.setIdentifyingCode(0L);
                     actSuppliesHistorydataMapper.insertActSuppliesHistorydata(actSuppliesHistorydata1);
 
@@ -137,6 +139,7 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
             actSuppliesHistorydata1.setImportUuid(actSuppliesHistorydata.get(0).getImportUuid());
             actSuppliesHistorydata1.setTemplateId(actSuppliesHistorydata.get(0).getTemplateId());
             actSuppliesHistorydata1.setStatus(1L);
+            actSuppliesHistorydata1.setCleanStatus(1L);
             actSuppliesHistorydata1.setIdentifyingCode(1L);
             actSuppliesHistorydataMapper.insertActSuppliesHistorydata(actSuppliesHistorydata1);
 
@@ -144,6 +147,7 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
 
                 actSuppliesHistorydata.get(i).setCreateBy(user.getUserName());
                 actSuppliesHistorydata.get(i).setCreateTime(DateUtils.getNowDate());
+                actSuppliesHistorydata.get(i).setCleanStatus(1L);
                 actSuppliesHistorydataMapper.updateActSuppliesHistorydatas(actSuppliesHistorydata.get(i));
 
             }

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

@@ -15,13 +15,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="historyName"    column="history_name"    />
         <result property="historyContent"    column="history_content"    />
         <result property="identifyingCode"    column="identifying_code"    />
+        <result property="cleanStatus"    column="clean_status"    />
         <result property="status"    column="status"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
     </resultMap>
 
     <sql id="selectActSuppliesHistorydataVo">
-        select id, import_uuid, template_id, export_uuid, role_id, history_name, history_content, identifying_code, 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, create_time from act_supplies_historydata
     </sql>
 
     <select id="selectActSuppliesHistorydataList" parameterType="ActSuppliesHistorydata" resultMap="ActSuppliesHistorydataResult">
@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="historyName != null">history_name,</if>
             <if test="historyContent != null">history_content,</if>
             <if test="identifyingCode != null">identifying_code,</if>
+            <if test="cleanStatus != null">clean_status,</if>
             <if test="status != null">status,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="historyName != null">#{historyName},</if>
             <if test="historyContent != null">#{historyContent},</if>
             <if test="identifyingCode != null">#{identifyingCode},</if>
+            <if test="cleanStatus != null">#{cleanStatus},</if>
             <if test="status != null">#{status},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -123,6 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="historyName != null">history_name = #{historyName},</if>
             <if test="historyContent != null">history_content = #{historyContent},</if>
             <if test="identifyingCode != null">identifying_code = #{identifyingCode},</if>
+            <if test="cleanStatus != null">clean_status = #{cleanStatus},</if>
             <if test="status != null">status = #{status},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -137,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectActSuppliesHistorydata"  resultMap="ActSuppliesHistorydataResult">
         <include refid="selectActSuppliesHistorydataVo"/>
-        where 1 = 1
+        where clean_status = 0
     </select>
 </mapper>
 

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

@@ -64,10 +64,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
 
-    <select id="countByRoleName" parameterType="ActSuppliesRole" resultType="int">
+    <select id="countByRoleName" parameterType="com.ruoyi.system.domain.ActSuppliesRole" resultType="int">
         select count(*) from act_supplies_role
         <where>
-            status = 1
+            status = 0
             <if test="roleName !=null and roleName !=''">and role_name=#{roleName}</if>
             <if test="tempId !=null and tempId !=''">and temp_id=#{tempId}</if>
         </where>

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

@@ -357,7 +357,7 @@ export default {
                     const exportJson = await cons;
                     await this.summary(exportJson);
                     //console.log('summary 执行完毕');
-                    //this.submit(exportJson);
+                    this.submit(exportJson);
 
                 } catch (Error) {
                     this.$message({
@@ -872,11 +872,13 @@ export default {
                     }
                         break;
                     case 7: {
+                        debugger
                         let map = new Map();
                         let smallMat = [];
                         let deps = [];
                         try {
                             for (let i = parseFloat(sysRulez[0].re) + 1; i < data.length; i++) {
+
                                 if (data[i][sysRulez[1].ce] != null && data[i][key_i] != null) {
                                     let num = data[i][key_i].m;
                                     let dep = data[i][sysRulez[1].ce].m;
@@ -938,6 +940,7 @@ export default {
 
                             }
                             //循环得到汇总结果
+                                debugger
                             console.log(map);
                                 if (map.size === 0) {
                                     throw new Error("导入失败,导入文件错误");
@@ -1010,6 +1013,7 @@ export default {
                                     warn++;
                                 }
                             });
+                                debugger
                                 if (warn === map.size) {
                                     throw new Error("导入文件与所选模板规则不匹配");
                                 } else if (warn > 0) {