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

feat: There is no way the

Browse Source
This commit is contained in:
super_liu
2021-10-29 23:53:33 +08:00
parent 62c18594db
commit 831f8d321a
18 changed files with 641 additions and 557 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|分页查询")
@GetMapping("/page")
public ResponseMessage<IPage<TsPersonCollect>> page(Integer pageNo, Integer pageSize, String collectTitle, String userId) throws Exception {
public ResponseMessage<IPage<TsPersonCollect>> page(Integer pageNo, Integer pageSize, String collectTitle, String modeType,String userId) throws Exception {
return personCollectEOService.queryCollectByWrapper(pageNo, pageSize,collectTitle,userId);
return personCollectEOService.queryCollectByWrapper(pageNo, pageSize,collectTitle,modeType,userId);
}
adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java
+1 -1
View File
@@ -27,6 +27,6 @@ public interface IPersonCollectEOService extends IService<TsPersonCollect> {
int updateByPrimaryKeySelective(TsPersonCollect tsPersonCollect) throws Exception;
public ResponseMessage<IPage<TsPersonCollect>> queryCollectByWrapper(Integer pageNo, Integer pageSize, String modeType, String collectTitle);
public ResponseMessage<IPage<TsPersonCollect>> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle,String modeType, String userId);
}
adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java
+4 -2
View File
@@ -129,13 +129,15 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
@Override
public ResponseMessage<IPage<TsPersonCollect>> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle, String userId) {
public ResponseMessage<IPage<TsPersonCollect>> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle, String modeType,String userId) {
BasePage basePage = new BasePage();
QueryWrapper<TsPersonCollect> wrapper = new QueryWrapper<>();
wrapper.eq("user_id",userId);
if (collectTitle != null && !collectTitle.equals("")){
wrapper.like("collect_title",collectTitle);
}
if (modeType != null && !modeType.equals("")){
wrapper.eq("collect_type",modeType);
}
if (pageNo != null) {