项目库标准详情

laws-modules/src/main/java/com/jero/modules/projectLibrary/service/ILawsAssessService.java

@@ -58,14 +58,6 @@ public interface ILawsAssessService extends IService<LawsAssess> {
 	 */
     void deleteById(String id);
 
-	/**
-	 * 批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-    void deleteByIds(List<String> ids);
-
 	/**
 	 * 通过id查询
 	 *
@@ -74,5 +66,13 @@ public interface ILawsAssessService extends IService<LawsAssess> {
 	 */
     LawsAssess queryById(String id);
 
-	List<LawsAssess> getAllByProjectId(String projectId);
+	/**
+	 * 	查询该项目下所有未删除的标准
+	 */
+	List<LawsAssess> getAllByProjectIdNotDeleted(String projectId);
+
+	/**
+	 * 	查询该项目下所有删除的标准
+	 */
+	List<LawsAssess> getAllByProjectIdDeleted(String projectId);
 }

laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java

@@ -95,18 +95,9 @@ public class LawsAssessServiceImpl extends ServiceImpl<LawsAssessMapper, LawsAss
 	 */
 	@Override
     public void deleteById(String id) {
-        removeById(id);
-    }
-
-	/**
-	 * 批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@Override
-    public void deleteByIds(List<String> ids) {
-        removeByIds(ids);
+		LawsAssess lawsAssess = getById(id);
+		lawsAssess.setDelFlag("1");
+		updateById(lawsAssess);
     }
 
 	/**
@@ -121,12 +112,24 @@ public class LawsAssessServiceImpl extends ServiceImpl<LawsAssessMapper, LawsAss
     }
 
 	@Override
-	public List<LawsAssess> getAllByProjectId(String projectId) {
+	public List<LawsAssess> getAllByProjectIdNotDeleted(String projectId) {
 		if (StringUtils.isBlank(projectId)){
 			return new ArrayList<>();
 		}
 		LambdaQueryWrapper<LawsAssess> wrapper = new LambdaQueryWrapper<>();
 		wrapper.eq(LawsAssess::getProjectId, projectId);
+		wrapper.eq(LawsAssess::getDelFlag, "0");
+		return list(wrapper);
+	}
+
+	@Override
+	public List<LawsAssess> getAllByProjectIdDeleted(String projectId) {
+		if (StringUtils.isBlank(projectId)){
+			return new ArrayList<>();
+		}
+		LambdaQueryWrapper<LawsAssess> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(LawsAssess::getProjectId, projectId);
+		wrapper.eq(LawsAssess::getDelFlag, "1");
 		return list(wrapper);
 	}
 }