回收站修改

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/RecycleBinInfo.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.business.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -105,6 +106,10 @@ public class RecycleBinInfo extends BaseEntity {
     @ApiModelProperty("更新者姓名")
     private String updateUserName;
 
+    @TableField(exist = false)
+    @ApiModelProperty("删除信息")
+    private String delInfo;
+
     public RecycleBinInfo(String businessIds, String title, Integer deletedType, String position, String projectId, String contractId) {
         this.businessId = businessIds;
         this.fileName = title;
@@ -123,4 +128,8 @@ public class RecycleBinInfo extends BaseEntity {
     public RecycleBinInfo() {
     }
 
+    public String getDelInfo() {
+        return this.getCreateUserName() == null ? "" : this.getCreateUserName() + "\n" + (this.getCreateTime() == null ? "" : DateUtil.format(this.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+    }
+
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/RecycleBinInfoVO.java

@@ -21,14 +21,12 @@ public class RecycleBinInfoVO extends Query implements Serializable {
      * 开始时间
      */
     @ApiModelProperty("开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
+    private String startTime;
     /**
      * 结束时间
      */
     @ApiModelProperty("结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
+    private String endTime;
 
     /**
      * 用户ID

blade-service/blade-business/src/main/java/org/springblade/business/controller/RecycleBinController.java

@@ -264,8 +264,8 @@ public class RecycleBinController extends BladeController {
     @GetMapping("/queryOperation")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "查询同一批删除数据")
-    public R<Collection<RecycleBinInfo>> queryOperation(@RequestParam Long id) {
-        return R.data(this.recycleBinInfoService.queryOperation(id));
+    public R<Collection<RecycleBinInfo>> queryOperation(@RequestParam String ids) {
+        return R.data(this.recycleBinInfoService.queryOperation(ids));
     }
 
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/RecycleBinInfoMapper.java

@@ -6,8 +6,12 @@ import org.apache.ibatis.annotations.Param;
 import org.springblade.business.entity.RecycleBinInfo;
 import org.springblade.business.vo.RecycleBinInfoVO;
 
+import java.util.Collection;
+
 public interface RecycleBinInfoMapper extends BaseMapper<RecycleBinInfo> {
 
 
     IPage<RecycleBinInfo> page(IPage<RecycleBinInfo> iPage, @Param("vo") RecycleBinInfoVO recycleBinInfoVO);
+
+    Collection<RecycleBinInfo> queryOperation(String ids);
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/RecycleBinInfoMapper.xml

@@ -84,4 +84,7 @@
             update_time desc
         </if>
     </select>
+    <select id="queryOperation" resultType="org.springblade.business.entity.RecycleBinInfo">
+        select operation_id,del_root_name from u_recycle_bin_info where operation_id in ( select operation_id from u_recycle_bin_info where id in ( #{ids} ) and is_deleted = 0 group by operation_id )  group by operation_id, del_root_name having count(1) > 1
+    </select>
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/IRecycleBinInfoService.java

@@ -19,7 +19,7 @@ public interface IRecycleBinInfoService extends BaseService<RecycleBinInfo> {
 
     Collection<UserVO2> queryUser(Long contractId, Integer isRecycleBin, String name);
 
-    Collection<RecycleBinInfo> queryOperation(Long id);
+    Collection<RecycleBinInfo> queryOperation(String ids);
 
     Boolean saveRecycleBinInfoByWbsTreeContract(String ids, String rootIds);
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/RecycleBinInfoServiceImpl.java

@@ -53,6 +53,20 @@ public class RecycleBinInfoServiceImpl extends BaseServiceImpl<RecycleBinInfoMap
     @Override
     public IPage<RecycleBinInfo> selectPage(RecycleBinInfoVO recycleBinInfoVO) {
         IPage<RecycleBinInfo> iPage = Condition.getPage(recycleBinInfoVO);
+        if (recycleBinInfoVO.getStartTime() != null) {
+            if (recycleBinInfoVO.getStartTime().trim().matches("^\\d{4}-\\d{2}-\\d{2}$")) {
+                recycleBinInfoVO.setStartTime(recycleBinInfoVO.getStartTime().trim() + " 00:00:00");
+            } else {
+                recycleBinInfoVO.setStartTime(null);
+            }
+        }
+        if (recycleBinInfoVO.getEndTime() != null) {
+            if (recycleBinInfoVO.getEndTime().trim().matches("^\\d{4}-\\d{2}-\\d{2}$")) {
+                recycleBinInfoVO.setEndTime(recycleBinInfoVO.getEndTime().trim() + " 23:59:59");
+            } else {
+                recycleBinInfoVO.setEndTime(null);
+            }
+        }
         return this.recycleBinInfoMapper.page(iPage, recycleBinInfoVO);
     }
 
@@ -97,12 +111,18 @@ public class RecycleBinInfoServiceImpl extends BaseServiceImpl<RecycleBinInfoMap
     }
 
     @Override
-    public Collection<RecycleBinInfo> queryOperation(Long id) {
-        RecycleBinInfo info = this.getById(id);
-        if (info == null || !StringUtil.hasText(info.getOperationId())) {
+    public Collection<RecycleBinInfo> queryOperation(String ids) {
+        if (ids == null || ids.isEmpty()) {
+            return new ArrayList<>();
+        }
+        String[] split = ids.split(",");
+        ids = Arrays.stream(split).filter(StringUtil::isNumeric).collect(Collectors.joining(","));
+        if (ids.isEmpty()) {
             return new ArrayList<>();
         }
-        return this.list(Wrappers.<RecycleBinInfo>lambdaQuery().eq(RecycleBinInfo::getOperationId, info.getOperationId()).eq(RecycleBinInfo::getDelType, info.getDelType()).eq(RecycleBinInfo::getStatus, info.getStatus()));
+
+//        return this.list(Wrappers.<RecycleBinInfo>lambdaQuery().eq(RecycleBinInfo::getOperationId, info.getOperationId()).eq(RecycleBinInfo::getDelType, info.getDelType()).eq(RecycleBinInfo::getStatus, info.getStatus()));
+        return this.baseMapper.queryOperation(ids);
     }
 
     @Override