FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-12-15 17:50:25 +08:00
parent 0fafe93d39
commit f00f5b9021
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class FileMaterialController extends BaseController<FileMaterial> {
@DeleteMapping @DeleteMapping
@ApiOperation("删除文件资料组") @ApiOperation("删除文件资料组")
public ResponseMessage deleteMaterial(String id){ public ResponseMessage deleteMaterial(String id){
List<String> idList = Arrays.asList(id.split(id)); List<String> idList = Arrays.asList(id.split(","));
boolean b = iFileMaterialService.removeByIds(idList); boolean b = iFileMaterialService.removeByIds(idList);
return Result.success(b); return Result.success(b);
adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java
+5
View File
@@ -6,6 +6,7 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.Tag; import io.swagger.annotations.Tag;
@@ -58,4 +59,8 @@ public class FileMaterial extends BaseEntity {
@ApiModelProperty(value = "置顶") @ApiModelProperty(value = "置顶")
@TableField("is_top") @TableField("is_top")
private Integer isTop; private Integer isTop;
@ApiModelProperty(value = "删除标志")
@TableLogic(value = "0",delval = "1")
private String delFlag;
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java
+4 -5
View File
@@ -36,7 +36,7 @@ public class FileMaterialServiceImpl extends ServiceImpl<FileMaterialDao, FileMa
QueryWrapper<FileMaterial> queryWrapper = new QueryWrapper<>(); QueryWrapper<FileMaterial> queryWrapper = new QueryWrapper<>();
if (queryPage.getDataType()!=null){ if (queryPage.getDataType()!=null){
queryWrapper.eq("data_type",queryPage.getDataTitle()); queryWrapper.eq("data_type",queryPage.getDataType());
} }
if (queryPage.getDataTitle()!=null){ if (queryPage.getDataTitle()!=null){
@@ -48,9 +48,8 @@ public class FileMaterialServiceImpl extends ServiceImpl<FileMaterialDao, FileMa
String strDateFormat = "yyyy-MM-dd HH:mm:ss"; String strDateFormat = "yyyy-MM-dd HH:mm:ss";
SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat); SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat);
queryWrapper.between("data_upload_time", queryWrapper.between("data_upload_time", queryPage.getStartDataUploadTime(),
sdf.format(queryPage.getStartDataUploadTime()), queryPage.getEndDataUploadTime());
sdf.format(queryPage.getEndDataUploadTime()));
} }
return this.page(new Page<>(queryPage.getPage(),queryPage.getPageSize()),queryWrapper); return this.page(new Page<>(queryPage.getPage(),queryPage.getPageSize()),queryWrapper);
@@ -60,7 +59,7 @@ public class FileMaterialServiceImpl extends ServiceImpl<FileMaterialDao, FileMa
public List<String> getFileMaterialType() { public List<String> getFileMaterialType() {
QueryWrapper<FileMaterial> queryWrapper = new QueryWrapper<>(); QueryWrapper<FileMaterial> queryWrapper = new QueryWrapper<>();
queryWrapper.select("data_type"); queryWrapper.select("DISTINCT data_type");
return this.listObjs(queryWrapper, item -> item.toString()); return this.listObjs(queryWrapper, item -> item.toString());
} }