add： 宣教文档web端查询、删除接口 广场删除接口实现

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/dto/BizMissionDocDTO.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import javax.validation.constraints.*;
+import java.util.Date;
 
 /**
  * 宣教文档传输对象

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/dto/BizMissionDocQueryDTO.java

@@ -1,9 +1,12 @@
 package cn.tr.module.smart.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.ToString;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 宣教文档查询参数
  *
@@ -13,6 +16,15 @@ import lombok.Data;
 @Data
 @ApiModel("宣教文档查询参数")
 @ToString
-public class BizMissionDocQueryDTO  {
+public class BizMissionDocQueryDTO implements Serializable {
     private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("科室ID")
+    private String deptId;
+
+    @ApiModelProperty("查询标题内容")
+    private String title;
+
+    @ApiModelProperty("宣教阶段 术前：BEFORE, 术后：AFTER")
+    private String phase;
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/repository/BizMissionDocRepository.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -27,4 +28,6 @@ public interface BizMissionDocRepository extends BaseMapper<BizMissionDocPO> {
     int updateBizMissionDocById(BizMissionDocPO source);
 
     List<BizDeptAndDocVO> selectBizDeptAndDocByDeptIdList(@Param("query") BizWxQueryDTO query);
+
+    int updateDeletedById(@Param("ids") Collection<String> ids);
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/repository/BizMissionDocSquareRepository.java

@@ -3,7 +3,11 @@ package cn.tr.module.smart.common.repository;
 import cn.tr.module.smart.common.po.BizMissionDocSquarePO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
+
+import java.util.Collection;
+
 /**
  * 宣教文档广场Mapper接口
  *
@@ -16,4 +20,6 @@ public interface BizMissionDocSquareRepository extends BaseMapper<BizMissionDocS
 
     BizMissionDocSquarePO selectOneByHospitalId(String id);
     int updateBizMissionDocSquareById(BizMissionDocSquarePO source);
+
+    int updateDeletedById(@Param("ids") Collection<String> ids);
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/IBizMissionDocService.java

@@ -25,7 +25,7 @@ public interface IBizMissionDocService {
      * @author lf
      * @date 2025/05/23 16:24
      */
-    List<BizMissionDocDTO> selectBizMissionDocList(BizMissionDocQueryDTO query);
+    List<BizDeptAndDocVO> selectBizMissionDocList(BizMissionDocQueryDTO query);
 
     /**
      * 根据id查询宣教文档

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizMissionDocServiceImpl.java

@@ -62,11 +62,9 @@ public class BizMissionDocServiceImpl implements IBizMissionDocService {
      * @date 2025/05/23 16:24
      */
     @Override
-    public List<BizMissionDocDTO> selectBizMissionDocList(BizMissionDocQueryDTO query) {
-        return BizMissionDocMapper.INSTANCE.convertDtoList(
-                baseRepository.selectList(new LambdaQueryWrapper<BizMissionDocPO>()
-                )
-        );
+    public List<BizDeptAndDocVO> selectBizMissionDocList(BizMissionDocQueryDTO query) {
+        return baseRepository.selectBizDeptAndDocByDeptIdList(new BizWxQueryDTO(query.getDeptId(),
+                null, query.getPhase(),query.getTitle()));
     }
 
 
@@ -144,7 +142,7 @@ public class BizMissionDocServiceImpl implements IBizMissionDocService {
         if (CollectionUtil.isEmpty(ids)) {
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001, "请选择要删除的数据");
         }
-        return baseRepository.deleteBatchIds(ids);
+        return baseRepository.updateDeletedById(ids);
     }
 
     /**

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizMissionDocSquareServiceImpl.java

@@ -126,7 +126,7 @@ public class BizMissionDocSquareServiceImpl implements IBizMissionDocSquareServi
         if (CollectionUtil.isEmpty(ids)) {
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001, "请选择要删除的数据");
         }
-        return baseRepository.deleteBatchIds(ids);
+        return baseRepository.updateDeletedById(ids);
     }
 
     /**

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/web/controller/BizMissionDocController.java

@@ -10,6 +10,7 @@ import cn.tr.module.api.sys.log.annotation.OperateLog;
 import cn.tr.module.smart.common.dto.BizMissionDocDTO;
 import cn.tr.module.smart.common.dto.BizMissionDocQueryDTO;
 import cn.tr.module.smart.common.service.IBizMissionDocService;
+import cn.tr.module.smart.wx.controller.vo.BizDeptAndDocVO;
 import cn.tr.module.sys.oauth2.LoginTypeConstant;
 import cn.tr.plugin.mybatis.base.BaseController;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -38,7 +39,7 @@ public class BizMissionDocController extends BaseController{
     @ApiOperationSupport(author = "lf",order = 1)
     @ApiOperation(value="根据条件查询宣教文档",notes = "权限： 无")
     @PostMapping("/query/page")
-    public TableDataInfo<BizMissionDocDTO> selectList(@RequestBody BizMissionDocQueryDTO query) {
+    public TableDataInfo<BizDeptAndDocVO> selectList(@RequestBody BizMissionDocQueryDTO query) {
         startPage();
         return getDataTable(bizMissionDocService.selectBizMissionDocList(query));
     }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/dto/BizWxQueryDTO.java

@@ -1,6 +1,8 @@
 package cn.tr.module.smart.wx.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @author wangzl
@@ -8,6 +10,8 @@ import lombok.Data;
  * @date 2025/6/4 14:07
  */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class BizWxQueryDTO {
     private String deptId;
     private Long time;

tr-modules/tr-module-smartFollowUp/src/main/resources/mapper/smart/BizMissionDocMapper.xml

@@ -33,7 +33,7 @@
         SELECT
         <include refid="baseColumn"/>
         FROM biz_mission_doc
-        where id = #{id ,jdbcType=VARCHAR}
+        where id = #{id ,jdbcType=VARCHAR} and deleted = 0
     </select>
 
     <select id="selectOneBySquareId" resultMap="MissionDoc">
@@ -42,6 +42,7 @@
         FROM biz_mission_doc
         where
         square_doc_id = #{squareId ,jdbcType=VARCHAR}
+        and deleted = 0
         order by create_time desc
         limit 1
     </select>
@@ -103,6 +104,14 @@
         </set>
         where id = #{id ,jdbcType=VARCHAR}
     </update>
+    <update id="updateDeletedById">
+        UPDATE biz_mission_doc
+        SET deleted = 1
+        WHERE id IN
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
 
     <select id="selectBizDeptAndDocByDeptIdList" resultType="cn.tr.module.smart.wx.controller.vo.BizDeptAndDocVO">
         select bdd.dept_id as deptId,
@@ -124,6 +133,7 @@
         join biz_dept bd on
         bd.id = bdd.dept_id
         <where>
+            and deleted = 0
             <if test="query.deptId != null and query.deptId != ''">
                 and bdd.dept_id = #{query.deptId ,jdbcType=VARCHAR}
             </if>

tr-modules/tr-module-smartFollowUp/src/main/resources/mapper/smart/BizMissionDocSquareMapper.xml

@@ -96,12 +96,21 @@
         </set>
         where id = #{id ,jdbcType=VARCHAR}
     </update>
+    <update id="updateDeletedById">
+        UPDATE biz_mission_doc_square
+        SET deleted = 1
+        WHERE id IN
+        <foreach item="item" collection="ids" separator="," open="(" close=")" index="">
+            #{item}
+        </foreach>
+    </update>
 
     <select id="selectOneByHospitalId" resultMap="MissionDocSquare">
         select
         <include refid="baseColumn"/>
         from biz_mission_doc_square
         where hospital_doc_id = #{id ,jdbcType=VARCHAR}
+        and deleted = 0
         order by create_time desc
         limit 1
     </select>