Commit f4aa2ca9 by 墨竹

fix:使用成员

parent 7747543a
...@@ -232,7 +232,7 @@ public class HmQrcodeController { ...@@ -232,7 +232,7 @@ public class HmQrcodeController {
* 使用成员 * 使用成员
* @return * @return
*/ */
@RequestMapping(value = "detail-clerk-list", method = RequestMethod.GET) @RequestMapping(value = "detail-clerk-list", method = RequestMethod.POST)
public RestResponse detailClerkList(@RequestBody HmQrcodeDetailQO hmQrcodeDetailQO) { public RestResponse detailClerkList(@RequestBody HmQrcodeDetailQO hmQrcodeDetailQO) {
Long hmId = hmQrcodeDetailQO.getHmId(); Long hmId = hmQrcodeDetailQO.getHmId();
HmQrcodeDTO hmQrcodeDTO = hmQrcodeApiService.queryById(hmId); HmQrcodeDTO hmQrcodeDTO = hmQrcodeApiService.queryById(hmId);
...@@ -240,18 +240,20 @@ public class HmQrcodeController { ...@@ -240,18 +240,20 @@ public class HmQrcodeController {
return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_8.getCode()),HaoBanErrCode.ERR_8.getMsg()); return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_8.getCode()),HaoBanErrCode.ERR_8.getMsg());
} }
Integer hmType = hmQrcodeDTO.getHmType(); Integer hmType = hmQrcodeDTO.getHmType();
Page page = new Page();
List<HmDetailClerkListVO> list = new ArrayList<>(); List<HmDetailClerkListVO> list = new ArrayList<>();
if (hmType == 1) { if (hmType == 1) {
HmDetailClerkListVO hmDetailClerkListVO = EntityUtil.changeEntityNew(HmDetailClerkListVO.class,hmQrcodeDTO); HmDetailClerkListVO hmDetailClerkListVO = EntityUtil.changeEntityNew(HmDetailClerkListVO.class,hmQrcodeDTO);
list.add(hmDetailClerkListVO); list.add(hmDetailClerkListVO);
page.setResult(list);
page.setTotalCount(list.size());
} else if (hmType == 2) { } else if (hmType == 2) {
BasePageInfo basePageInfo = new BasePageInfo(); BasePageInfo basePageInfo = new BasePageInfo();
basePageInfo.setPageNum(hmQrcodeDetailQO.getPageNum()); basePageInfo.setPageNum(hmQrcodeDetailQO.getPageNum());
basePageInfo.setPageSize(hmQrcodeDetailQO.getPageSize()); basePageInfo.setPageSize(hmQrcodeDetailQO.getPageSize());
Page<HmClerkRelationDTO> hmClerkRelationDTOPage = hmQrcodeApiService.getHmClerkByHmId(basePageInfo, hmId); page = hmQrcodeApiService.getHmClerkByHmId(basePageInfo, hmId);
list = EntityUtil.changeEntityListNew(HmDetailClerkListVO.class, hmClerkRelationDTOPage.getResult());
} }
return RestResponse.successResult(list); return RestResponse.successResult(page);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment