签章撤回调整

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/CwProjectReportMapper.java

@@ -157,4 +157,17 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      * @param cwProjectReportData
      */
     void updateSignatureTypeById(CwProjectReportData cwProjectReportData);
+
+    /**
+     * 删除已盖章的附件(报告签章附件关联表  cw_project_report_file)
+     * @param id work_attachment表的id
+     */
+    void deleteIsSign(@Param("id")String id);
+
+    /**
+     * 根据附件id查询附件是否已盖章
+     * @param id
+     * @return
+     */
+    int checkIsSign(@Param("id")String id);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -499,4 +499,13 @@
         signature_type = #{signatureType}
         where id = #{id}
     </update>
+
+    <delete id="deleteIsSign">
+        delete from cw_project_report_file where report_file_id = #{id} and file_affiliation = 1
+    </delete>
+
+    <select id="checkIsSign" resultType="int">
+        select count(id)
+        from cw_project_report_file where report_file_id = #{id} and file_affiliation = 1
+    </select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportService.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -2675,5 +2676,22 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 cwProjectReportSignatureMapper.updateById(item); // 将修改的数据保存
             });
         }
+        // 删除已盖章的附件
+        // 1. 查询到当前报告的附件
+        List<WorkAttachment> workAttachments = ossServiceMapper.selectList(new LambdaQueryWrapper<WorkAttachment>().eq(WorkAttachment::getAttachmentId, reportId));
+        // 2. 查询哪些附件是已盖章的
+        List<String> delIds = new ArrayList<>();
+        workAttachments.stream().forEach(item -> {
+            int i = reportMapper.checkIsSign(item.getId());
+            if (i != 0) {
+                delIds.add(item.getId());
+            }
+        });
+        // 3. 删除已盖章的附件(报告签章附件关联表  cw_project_report_file)
+        workAttachments.stream().forEach(item -> {
+            reportMapper.deleteIsSign(item.getId());  // 物理删除
+        });
+        // 4. 删除已盖章的附件(附件表 work_attachment)
+        ossServiceMapper.deleteBatchIds(delIds);  // 逻辑删除
     }
 }