历史导入

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

@@ -107,7 +107,7 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
         SysUser user = SecurityUtils.getLoginUser().getUser();
         ActSuppliesHistorydata actSuppliesHistorydata1 = new ActSuppliesHistorydata();
 
-        Long s = actSuppliesHistorydataMapper.selectActSuppliesHistorydatauuid(actSuppliesHistorydata.get(0).getExportUuid());
+        Long s = actSuppliesHistorydataMapper.selectActSuppliesHistorydatauuid(actSuppliesHistorydata.get(0).getImportUuid());
 
         if (s>0){
 
@@ -121,6 +121,7 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
                 actSuppliesHistorydata1.setTemplateId(actSuppliesHistorydata.get(0).getTemplateId());
                 actSuppliesHistorydata1.setRoleId(longs[i]);
                 actSuppliesHistorydata1.setStatus(1L);
+                actSuppliesHistorydata1.setIdentifyingCode(0L);
 
                 actSuppliesHistorydataMapper.insertActSuppliesHistorydata(actSuppliesHistorydata1);
 
@@ -129,7 +130,8 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
             actSuppliesHistorydata1.setImportUuid(actSuppliesHistorydata.get(0).getImportUuid());
             actSuppliesHistorydata1.setTemplateId(actSuppliesHistorydata.get(0).getTemplateId());
             actSuppliesHistorydata1.setStatus(1L);
-            actSuppliesHistorydataMapper.insertActSuppliesHistorydatas(actSuppliesHistorydata1);
+            actSuppliesHistorydata1.setIdentifyingCode(1L);
+            actSuppliesHistorydataMapper.insertActSuppliesHistorydata(actSuppliesHistorydata1);
 
             for (int i=0;i<actSuppliesHistorydata.size();i++){
 

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

@@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectActSuppliesRole" parameterType="Long" resultType="Long">
-        select temp_id from act_supplies_role where temp_id = #{templateId}
+        select id from act_supplies_role where temp_id = #{templateId}
     </select>
 
     <update id="updateActSuppliesHistorydatas" parameterType="ActSuppliesHistorydata">
@@ -117,7 +117,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
         </trim>
-        where import_uuid = #{importUuid}
+        <where>
+            import_uuid = #{importUuid}
+            <if test="templateId != null "> and template_id = #{templateId}</if>
+            <if test="roleId != null and identifyingCode == 0"> and role_id = #{roleId}</if>
+            <if test="identifyingCode != null "> and identifying_code = #{identifyingCode}</if>
+        </where>
     </update>
 
 </mapper>