删除正则关联删除结果表信息

daqe-center/src/main/java/com/lantone/daqe/facade/ColumnResultManagementFacade.java

@@ -453,7 +453,7 @@ public class ColumnResultManagementFacade {
     public List<BehospitalInfo> getBehospitalInfos(Date startDate, Date endDate, Long hospitalId) {
         return behospitalInfoFacade.getBaseMapper().selectList(new QueryWrapper<BehospitalInfo>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", hospitalId)
+                .eq(hospitalId!=null,"hospital_id", hospitalId)
                 .ge("behospital_date", startDate)
                 .le("behospital_date", endDate)
         );
@@ -814,9 +814,6 @@ public class ColumnResultManagementFacade {
             String standardvalue = standardvalueInfo.getStandardvalue();
             String modeId = ModeEnum.valueOf(columnInfo.getTableEname()).getKey();
             String modeName = ModeEnum.valueOf(columnInfo.getTableEname()).getName();
-            //删除结果表所有的信息
-            removeStandardvalueResultSolved(behospitalCodeList, hospitalId, columnId);
-            removeColumnResultSolved(behospitalCodeList, hospitalId, columnId, ColumnResultTypeEnum.STANDARD_TYPE.getKey());
             for (GetTableColumnInfoDTO getTableColumnInfoDTO : tableColumnVal) {
                 getTableColumnInfoDTO.setModeId(Long.valueOf(modeId));
                 getTableColumnInfoDTO.setModeName(modeName);
@@ -1246,76 +1243,6 @@ public class ColumnResultManagementFacade {
         return false;
     }
 
-    /**
-     * 删除非空校验结果表信息
-     *
-     * @param behospitalCodeList
-     * @param hospitalId
-     * @param columnId
-     * @return:
-     */
-    public void removeNonnullResultSolved(List<String> behospitalCodeList, Long hospitalId, Long columnId) {
-        nonnullResultFacade.remove(new UpdateWrapper<NonnullResult>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", hospitalId)
-                .in("behospital_code", behospitalCodeList)
-                .eq("column_id", columnId)
-        );
-    }
-
-    /**
-     * 删除正则校验结果表信息
-     *
-     * @param behospitalCodeList
-     * @param hospitalId
-     * @param columnId
-     * @return:
-     */
-    public void removeRegularResultSolved(List<String> behospitalCodeList, Long hospitalId, Long columnId) {
-        regularResultFacade.remove(new UpdateWrapper<RegularResult>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", hospitalId)
-                .in("behospital_code", behospitalCodeList)
-                .eq("column_id", columnId)
-        );
-    }
-
-    /**
-     * 删除关键字校验结果表信息
-     *
-     * @param behospitalCodeList
-     * @param hospitalId
-     * @param columnId
-     * @return:
-     */
-    public void removeStandardvalueResultSolved(List<String> behospitalCodeList, Long hospitalId, Long columnId) {
-        standardvalueResultFacade.remove(new UpdateWrapper<StandardvalueResult>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", hospitalId)
-                .in("behospital_code", behospitalCodeList)
-                .eq("column_id", columnId)
-        );
-    }
-
-    /**
-     * 删除结果总表
-     *
-     * @param behospitalCodeList
-     * @param hospitalId
-     * @param columnId
-     * @return:
-     */
-    public void removeColumnResultSolved(List<String> behospitalCodeList, Long hospitalId, Long columnId, String type) {
-        //未解决修改
-        columnResultFacade.remove(new UpdateWrapper<ColumnResult>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", hospitalId)
-                .in("behospital_code", behospitalCodeList)
-                .eq("column_id", columnId)
-                .eq("type", type)
-        );
-    }
-
     /**
      * 新增校验结果总表信息
      *

daqe-center/src/main/java/com/lantone/daqe/facade/RegularManagementFacade.java

@@ -11,10 +11,13 @@ import com.lantone.common.util.DateUtil;
 import com.lantone.common.util.ListUtil;
 import com.lantone.common.util.SysUserUtils;
 import com.lantone.daqe.dto.GetRegularPageDTO;
+import com.lantone.daqe.entity.ColumnResult;
 import com.lantone.daqe.entity.ColumnVerify;
 import com.lantone.daqe.entity.RegularInfo;
 import com.lantone.daqe.entity.RegularMapping;
+import com.lantone.daqe.entity.RegularResult;
 import com.lantone.daqe.enums.ColumnVerifyTypeEnum;
+import com.lantone.daqe.facade.base.ColumnResultFacade;
 import com.lantone.daqe.facade.base.ColumnVerifyFacade;
 import com.lantone.daqe.facade.base.RegularInfoFacade;
 import com.lantone.daqe.facade.base.RegularMappingFacade;
@@ -29,6 +32,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 正则式维护-业务处理类
@@ -50,6 +54,9 @@ public class RegularManagementFacade {
     @Autowired
     private ColumnVerifyFacade columnVerifyFacade;
 
+    @Autowired
+    private ColumnResultFacade columnResultFacade;
+
     /**
      * 获取正则式维护分页列表
      *
@@ -146,19 +153,34 @@ public class RegularManagementFacade {
             if (regularMappingFacade.remove(new UpdateWrapper<RegularMapping>()
                     .eq("regular_id", id)
                     .eq("is_deleted", IsDeleteEnum.N.getKey()))) {
-                return columnVerifyFacade.remove(new UpdateWrapper<ColumnVerify>()
+                if (columnVerifyFacade.remove(new UpdateWrapper<ColumnVerify>()
                         .in("verify_id", regularMappingIdList)
                         .eq("type", ColumnVerifyTypeEnum.REGULAR_TYPE.getKey())
-                        .eq("is_deleted", IsDeleteEnum.N.getKey()));
+                        .eq("is_deleted", IsDeleteEnum.N.getKey()))) {
+                    //拿到正则结果表中关联数据的id
+                    List<RegularResult> regularResults = regularResultFacade.getBaseMapper().selectList(new QueryWrapper<RegularResult>()
+                            .eq("regular_id", id)
+                            .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    );
+                    List<Long> regularResultId = new ArrayList<>();
+                    regularResults.stream().forEach(regularResult->{
+                        regularResultId.add(regularResult.getId());
+                    });
+                    //            删除表字段的正则式校验结果表中的正则式
+                    if (regularResultFacade.remove(new UpdateWrapper<RegularResult>()
+                            .eq(hospitalId != null, "hospital_id", hospitalId)
+                            .eq("regular_id", id)
+                            .eq("is_deleted", IsDeleteEnum.N.getKey()))) {
+                        //删除总结果表信息
+                        return columnResultFacade.remove(new UpdateWrapper<ColumnResult>()
+                                .eq(hospitalId != null, "hospital_id", hospitalId)
+                                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                                .eq("result_id",regularResultId)
+                        );
+                    }
+                }
             }
-            //删除表字段的正则式校验结果表中的正则式
-            //            return regularResultFacade.update(new UpdateWrapper<RegularResult>()
-            //                    .eq(hospitalId != null, "hospital_id", hospitalId)
-            //                    .eq("regular_id", id)
-            //                    .eq("is_deleted", IsDeleteEnum.N.getKey())
-            //                    .set("modifier", SysUserUtils.getCurrentPrinciple() == null ? "0" : SysUserUtils.getCurrentPrinciple())
-            //                    .set("gmt_modified", DateUtil.now())
-            //                    .set("is_deleted", IsDeleteEnum.Y.getKey()));
+
 
         }
         return false;
@@ -185,16 +207,16 @@ public class RegularManagementFacade {
     }
 
     /**
-     *  判断该正则式是否关联
+     * 判断该正则式是否关联
      *
      * @param upRegularByIdVO
      * @Return java.lang.Boolean
      */
     public Boolean isRelation(UpRegularByIdVO upRegularByIdVO) {
         int count = regularMappingFacade.count(new QueryWrapper<RegularMapping>()
-                .eq("is_deleted",IsDeleteEnum.N.getKey())
-                .eq("regular_id",upRegularByIdVO.getId()));
-        if(count>0){
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("regular_id", upRegularByIdVO.getId()));
+        if (count > 0) {
             return true;
         }
         return false;

daqe-center/src/main/resources/bootstrap.yml

@@ -65,7 +65,7 @@ blockloss:
 #数据校验定时器
 columnResult:
   compare:
-    cron: 0 30 1 * * ?
+    cron: 0 0 12 * * ?
     use: true
     hospitalId: 4
 #修改规则数据校验定时器