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

我的收藏增加状态字段

Browse Source
This commit is contained in:
SUNJIABIN
2023-03-15 12:08:47 +08:00
parent f44c8c1774
commit 57e01dff10
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java
+2 -2
View File
@@ -43,10 +43,10 @@ public class PersonCollectEOController extends BaseController<TsPersonCollect> {
**/ **/
@ApiOperation(value = "|PersonCollectEO|分页查询") @ApiOperation(value = "|PersonCollectEO|分页查询")
@GetMapping("/page") @GetMapping("/page")
public ResponseMessage<IPage<TsPersonCollect>> page(Integer pageNo, Integer pageSize, String collectTitle, String modeType,String userId) throws Exception { public ResponseMessage<IPage<TsPersonCollect>> page(Integer pageNo, Integer pageSize, String collectTitle, String modeType,String userId,Integer validFlag) throws Exception {
return personCollectEOService.queryCollectByWrapper(pageNo, pageSize,collectTitle,modeType,userId); return personCollectEOService.queryCollectByWrapper(pageNo, pageSize,collectTitle,modeType,userId,validFlag);
} }
adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java
+1 -1
View File
@@ -28,7 +28,7 @@ public interface IPersonCollectEOService extends IService<TsPersonCollect> {
int updateByPrimaryKeySelective(TsPersonCollect tsPersonCollect) throws Exception; int updateByPrimaryKeySelective(TsPersonCollect tsPersonCollect) throws Exception;
public ResponseMessage<IPage<TsPersonCollect>> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle,String modeType, String userId); public ResponseMessage<IPage<TsPersonCollect>> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle,String modeType, String userId,Integer validFlag);
/** /**
* 通过标准号和用户id查询是否收藏此标准 * 通过标准号和用户id查询是否收藏此标准
adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java
+6 -1
View File
@@ -133,7 +133,7 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
@Override @Override
public ResponseMessage<IPage<TsPersonCollect>> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle, String modeType,String userId) { public ResponseMessage<IPage<TsPersonCollect>> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle, String modeType,String userId,Integer validFlag) {
BasePage basePage = new BasePage(); BasePage basePage = new BasePage();
QueryWrapper<TsPersonCollect> wrapper = new QueryWrapper<>(); QueryWrapper<TsPersonCollect> wrapper = new QueryWrapper<>();
wrapper.eq("user_id",userId); wrapper.eq("user_id",userId);
@@ -144,6 +144,11 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
List<String> ids = new ArrayList<>(Arrays.asList(modeType.split(","))); List<String> ids = new ArrayList<>(Arrays.asList(modeType.split(",")));
wrapper.in("collect_type",ids); wrapper.in("collect_type",ids);
} }
if (validFlag != null && !validFlag.equals("") && validFlag == 0){
wrapper.eq("valid_flag",validFlag);
}else if (validFlag != null && !validFlag.equals("") && validFlag == 1){
wrapper.eq("valid_flag",validFlag);
}
wrapper.orderByDesc("creation_Time"); wrapper.orderByDesc("creation_Time");
if (pageNo != null) { if (pageNo != null) {