案卷收集

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ArchivesAuto.java

@@ -144,5 +144,7 @@ public class ArchivesAuto extends BaseEntity {
 	private Integer isOpen;
 	private Integer ischeck;
 
+	//是否案卷收集上传的案卷
+	private Integer isAutoFile;
 
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileAutoController.java

@@ -84,7 +84,7 @@ public class ArchiveFileAutoController extends BladeController {
                     //待修改
                     archive.setIsDeleted(0);
                     archive.setIsArchive(0);
-
+                    archive.setIsAutoFile(1);
                     archivesAutoService.save(archive);
                 }else{
                     archivesAutoService.updateById(archive);
@@ -124,6 +124,6 @@ public class ArchiveFileAutoController extends BladeController {
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "迁移文件", notes = "传入ids")
     public R migrateFile(@RequestParam String ids,@RequestParam String nodeId) {
-        return R.status(this.archiveFileClient.updateArchiveFileByNodeId(ids,nodeId));
+        return R.status(archivesAutoService.updateArchivesAutoFileByNodeId(ids,nodeId));
     }
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.java

@@ -43,4 +43,6 @@ public interface ArchivesAutoMapper extends BaseMapper<ArchivesAuto> {
 	Integer selectArchivesAutoFileCount(@Param("vo") ArchivesAutoVO vo);
 
 	List<ArchivesAuto> selectArchivesAutoFilePage(@Param("current") Integer current, @Param("size") Integer size, @Param("vo")  ArchivesAutoVO vo);
+
+	Integer updateArchivesAutoFileByNodeId(List<Long> toLongList, String nodeId);
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -44,6 +44,7 @@
         <result column="tree_sort" property="nodeSort"/>
         <result column="isOpen" property="isOpen"/>
         <result column="ischeck" property="ischeck"/>
+        <result column="is_auto_file" property="isAutoFile"/>
     </resultMap>
 
 
@@ -53,13 +54,16 @@
 
 
     <select id="selectArchivesAutoFileCount" resultType="java.lang.Integer">
-        select count(id) from u_archive_file where is_deleted = 0
+        select count(id) from u_archives_auto where is_deleted = 0
         <if test="vo.projectId != null and vo.projectId != ''">
             and project_id = #{vo.projectId}
         </if>
         <if test="vo.contractId != null and vo.contractId != ''">
             and contract_id = #{vo.contractId}
         </if>
+        <if test="vo.contractId != null and vo.contractId != ''">
+            and is_auto_file = #{vo.isAutoFile}
+        </if>
         <if test="vo.nodeIds != null and vo.nodeIds != ''">
             and node_id in
             <foreach collection="vo.nodeIdArray" item="nodeId" open="(" separator="," close=")">
@@ -69,13 +73,16 @@
     </select>
 
     <select id="selectArchivesAutoFilePage" resultMap="archivesAutoResultMap">
-        select * from u_archive_file where is_deleted = 0
+        select * from u_archives_auto where is_deleted = 0
         <if test="vo.projectId != null and vo.projectId != ''">
             and project_id = #{vo.projectId}
         </if>
         <if test="vo.contractId != null and vo.contractId != ''">
             and contract_id = #{vo.contractId}
         </if>
+        <if test="vo.isAutoFile != null and vo.isAutoFile != ''">
+            and is_auto_file = #{vo.isAutoFile}
+        </if>
         <if test="vo.nodeIds != null and vo.nodeIds != ''">
             and node_id in
             <foreach collection="vo.nodeIdArray" item="nodeId" open="(" separator="," close=")">
@@ -85,4 +92,12 @@
         order by sort,create_time DESC
     </select>
 
+    <update id="updateArchivesAutoFileByNodeId" >
+        update u_archives_auto set node_id = #{nodeId} where
+        id in
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
 </mapper>

blade-service/blade-archive/src/main/java/org/springblade/archive/service/IArchivesAutoService.java

@@ -39,4 +39,6 @@ public interface IArchivesAutoService extends BaseService<ArchivesAuto> {
 	IPage<ArchivesAutoVO> selectArchivesAutoPage(IPage<ArchivesAutoVO> page, ArchivesAutoVO archivesAuto);
 
 	IPage<ArchivesAutoVO> selectArchivesAutoFilePage(ArchivesAutoVO queryVo);
+
+	boolean updateArchivesAutoFileByNodeId(String ids, String nodeId);
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -26,6 +26,7 @@ import org.springblade.archive.service.IArchivesAutoService;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.system.entity.DictBiz;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -70,4 +71,16 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		return iPage.setRecords(pageVoList);
 	}
 
+	@Override
+	public boolean updateArchivesAutoFileByNodeId(String ids, String nodeId) {
+		try {
+			baseMapper.updateArchivesAutoFileByNodeId(Func.toLongList(ids),nodeId);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+		return true;
+	}
+
 }