feat: 英德中医院,任务使用删除,不使用作废,直接移动到作废表,表结构相同

master
wyb 1 year ago
parent 1094e9f2fa
commit cac84cbd81

@ -32,7 +32,11 @@ public interface CollectTaskMapper {
*/ */
int cancel(@Param("ids") List<Long> ids); int cancel(@Param("ids") List<Long> ids);
int del(@Param("ids") List<Long> ids);
String getCollectionState(); String getCollectionState();
void updateTaskForRecollect(@Param("taskIds") List<Long> taskIds, @Param("operator") String operator,@Param("state") String state); void updateTaskForRecollect(@Param("taskIds") List<Long> taskIds, @Param("operator") String operator,@Param("state") String state);
int moveCancel(@Param("ids") List<Long> ids);
} }

@ -217,7 +217,9 @@ public class YingDeZyyReportManagerServiceImpl implements ReportManagerService {
List<Long> fileIds = tasks.stream().map(AfCollectTask::getAfArchiveDetailId).collect(Collectors.toList()); List<Long> fileIds = tasks.stream().map(AfCollectTask::getAfArchiveDetailId).collect(Collectors.toList());
List<Long> taskIds = tasks.stream().map(AfCollectTask::getId).collect(Collectors.toList()); List<Long> taskIds = tasks.stream().map(AfCollectTask::getId).collect(Collectors.toList());
scanAssortMapper.cancel(fileIds); scanAssortMapper.cancel(fileIds);
collectTaskMapper.cancel(taskIds); // 任务移动作废表,删除任务
collectTaskMapper.moveCancel(taskIds);
collectTaskMapper.del(taskIds);
} }
private void cancelHuiZhenEMRReport(String patientId, String reportName) { private void cancelHuiZhenEMRReport(String patientId, String reportName) {

@ -3,6 +3,14 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.docus.server.reportmanager.mapper.CollectTaskMapper"> <mapper namespace="com.docus.server.reportmanager.mapper.CollectTaskMapper">
<insert id="moveCancel">
INSERT INTO `docus_archivefile`.`af_collect_task_cancel`
SELECT * FROM `docus_archivefile`.`af_collect_task`
WHERE `id` in
<foreach collection="ids" item="id" separator="," open="(" close=")">
#{id}
</foreach>
</insert>
<update id="cancel"> <update id="cancel">
UPDATE `docus_archivefile`.`af_collect_task` UPDATE `docus_archivefile`.`af_collect_task`
SET `state` = '4' SET `state` = '4'
@ -23,6 +31,13 @@
#{taskId} #{taskId}
</foreach> </foreach>
</update> </update>
<delete id="del">
DELETE FROM `docus_archivefile`.`af_collect_task`
WHERE `id` in
<foreach collection="ids" item="id" separator="," open="(" close=")">
#{id}
</foreach>
</delete>
<select id="getTasks" resultType="com.docus.server.reportmanager.entity.AfCollectTask"> <select id="getTasks" resultType="com.docus.server.reportmanager.entity.AfCollectTask">
SELECT SELECT

Loading…
Cancel
Save