清洗添加identifying_code = 0

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

@@ -31,7 +31,7 @@ public class ActReadDataServiceImpl implements ActReadDataService {
     @Override
     public AjaxResult read(String mineId) {
 
-        //获取未清洗数据条数
+        //获取导入表未清洗数据条数
         int count = actReadDataMapper.selectCleanToOne(mineId);
         if (count <= 0) {
             return new AjaxResult(500, "数据库没有：" + mineId + "数据，无法清洗");

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

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.ActReadDataMapper">
     <insert id="insertDateToAnalysisAfter">
-        insert into ry_vue.act_supplies_import_cleaning_copy1 (id, ssk_id, hdate, hid, km_code, yy_uuid, name_column,
+        insert into act_supplies_import_cleaning_copy1 (id, ssk_id, hdate, hid, km_code, yy_uuid, name_column,
         code_column, department_column, number_column, money_column, money_columns, date_column, source_of_expenses,
         categories, model, unit, money) values
         <foreach collection="accList" item="list" separator=",">
@@ -15,7 +15,7 @@
         </foreach>
     </insert>
     <update id="updateState">
-        update ry_vue.act_supplies_historydata_copy1
+        update act_supplies_historydata_copy1
         set clean_status = 1
         where import_uuid = #{id}
     </update>
@@ -27,23 +27,25 @@
                ashc.date             hdate,
                ashc.id               hid,
                ashc.import_uuid      yyUuid
-        from ry_vue.act_supplies_historydata_copy1 ashc
-                 left join ry_vue.act_supplies_historycontent_copy1 ashc2 on
+        from act_supplies_historydata_copy1 ashc
+                 left join act_supplies_historycontent_copy1 ashc2 on
             ashc.import_uuid = ashc2.hid
         where ashc.ssk_id = #{id}
-          and ashc.clean_status = '0'
+          and ashc.identifying_code = 0
+          and ashc.clean_status = 0
         limit #{c}
     </select>
     <select id="selectMaterialCode" resultType="com.ruoyi.system.domain.ActHistoryRoleTypeCodeModel">
         select distinct as2.codes as value, asd.code as 'key'
-        from ry_vue.act_supplies_details asd
-                 left join ry_vue.act_supplies as2
+        from act_supplies_details asd
+                 left join act_supplies as2
                            on asd.sid = as2.id
     </select>
     <select id="selectCleanToOne" resultType="java.lang.Integer">
         select count(*)
-        from ry_vue.act_supplies_historydata_copy1
+        from act_supplies_historydata_copy1
         where ssk_id = #{id}
+          and identifying_code = 0
           and clean_status = 0
     </select>
 </mapper>
\ No newline at end of file