Browse Source

检验单续表bug

yangyj 1 năm trước cách đây
mục cha
commit
4310319338

+ 2 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.java

@@ -15,6 +15,8 @@ public interface WbsTreeContractMapper extends EasyBaseMapper<WbsTreeContract> {
 
     int deleteByIds(@Param("ids") List<Long> ids);
 
+    int deleteLogicByIds(@Param("ids") List<Long> ids);
+
     List<WbsTreeContract> selectQueryCurrentNodeByAncestors(@Param("ids") List<String> ids, @Param("contractId") String contractId);
 
     List<WbsTreeContract> selectQueryValueLikeNodeName(@Param("queryValue") String queryValue, @Param("contractId") String contractId);

+ 7 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -206,6 +206,13 @@
         </foreach>
     </delete>
 
+    <delete id="deleteLogicByIds">
+        UPDATE  m_wbs_tree_contract SET  is_deleted=1 WHERE p_key_id IN
+        <foreach item="ids" collection="ids" open="(" close=")" separator=",">
+            #{ids}
+        </foreach>
+    </delete>
+
     <select id="selectAll" resultMap="resultMap2">
         SELECT wtc.id,
                wtc.wbs_id,

+ 1 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -1136,6 +1136,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                     /*同时tableAll里也要删除*/
                     tec.getTableAll().removeIf(e -> removeIds.contains(e.getPKeyId()));
                     this.wbsTreeContractMapper.deleteByIds(removeIds);
+                    /*this.wbsTreeContractMapper.deleteLogicByIds(removeIds);*/
                 }
                 /*多余的表删除之后需要,裁剪多余表头数据保留全部实测数据然后重新设置增页大小*/
                 for(NodeTable mt:mainTableList) {