Commit 767214e2113d0610e516e0f3b8c54462f70baf8c
1 parent
2d5aaac5
tijiao
Showing
1 changed file
with
34 additions
and
23 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BillManageController.java
... | ... | @@ -83,17 +83,21 @@ public class BillManageController extends BizController { |
83 | 83 | HttpServletResponse response) throws Exception { |
84 | 84 | TdCustCompanyService sert = map.get("tdCustCompanyService"); |
85 | 85 | logger.info("---begin--日账汇总单查询调用后场dubbo服务,入参={}", JSONObject.toJSON(billQueryRequest)); |
86 | - System.out.println("seesionId="+request.getSession().getId()); | |
87 | - UserInfo userInfo = sessionCommUtil.getUserInfo(); | |
88 | - logger.info("从session中获取的用户信息={}" + JSONObject.toJSONString(userInfo)); | |
89 | - TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest(); | |
90 | - if (userInfo != null) { | |
91 | - | |
92 | - tdCompanyParkQueryRequest.setSysCode(billQueryRequest.getSysCode()); | |
93 | - tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds()); | |
94 | - tdCompanyParkQueryRequest.setSessionId(request.getSession().getId()); | |
95 | - billQueryRequest.setParkIdList(this.queryParkNoByCustIds(tdCompanyParkQueryRequest)); | |
96 | - } | |
86 | +// System.out.println("seesionId="+request.getSession().getId()); | |
87 | +// UserInfo userInfo = sessionCommUtil.getUserInfo(); | |
88 | +// logger.info("从session中获取的用户信息={}" + JSONObject.toJSONString(userInfo)); | |
89 | +// TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest(); | |
90 | +// if (userInfo != null) { | |
91 | +// | |
92 | +// tdCompanyParkQueryRequest.setSysCode(billQueryRequest.getSysCode()); | |
93 | +// tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds()); | |
94 | +// tdCompanyParkQueryRequest.setSessionId(request.getSession().getId()); | |
95 | +// billQueryRequest.setParkIdList(this.queryParkNoByCustIds(tdCompanyParkQueryRequest)); | |
96 | +// } | |
97 | + // 2.调用接口查询当前登录人管辖的停车场名称 | |
98 | + UserInfo userInfo = sessionCommUtil.getUserInfo(); | |
99 | + List<String> plNos = userInfo.getOrgIds(); | |
100 | + billQueryRequest.setParkIdList(plNos); | |
97 | 101 | |
98 | 102 | BizResult<PageBean<BillManageDTO>> result = billManageForDayService.queryBillforDayTotalForPage(billQueryRequest); |
99 | 103 | result.setErrMsg(billQueryRequest.getParkIdList().toString()); |
... | ... | @@ -115,18 +119,25 @@ public class BillManageController extends BizController { |
115 | 119 | HttpServletResponse response) throws Exception { |
116 | 120 | BizResult<PageBean<BillManageDTO>> result = new BizResult<PageBean<BillManageDTO>>(); |
117 | 121 | logger.info("---begin---日账单查看调用后场dubbo服务,入参={}", JSONObject.toJSONString(billQueryRequest)); |
118 | - TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest(); | |
119 | - UserInfo userInfo = (UserInfo) request.getSession().getAttribute(SessionEnum.USER_INFO.key()); | |
120 | - logger.info("从session中获取的用户信息={}" + JSONObject.toJSONString(userInfo)); | |
121 | - if (userInfo != null) { | |
122 | - | |
123 | - tdCompanyParkQueryRequest.setSysCode(billQueryRequest.getSysCode()); | |
124 | - tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds()); | |
125 | - tdCompanyParkQueryRequest.setSessionId(request.getSession().getId()); | |
126 | - billQueryRequest.setUserName(userInfo.getName()); | |
127 | - billQueryRequest.setParkIdList(this.queryParkNoByCustIds(tdCompanyParkQueryRequest)); | |
128 | - | |
129 | - } | |
122 | +// TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest(); | |
123 | +// UserInfo userInfo = (UserInfo) request.getSession().getAttribute(SessionEnum.USER_INFO.key()); | |
124 | +// logger.info("从session中获取的用户信息={}" + JSONObject.toJSONString(userInfo)); | |
125 | +// if (userInfo != null) { | |
126 | +// | |
127 | +// tdCompanyParkQueryRequest.setSysCode(billQueryRequest.getSysCode()); | |
128 | +// tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds()); | |
129 | +// tdCompanyParkQueryRequest.setSessionId(request.getSession().getId()); | |
130 | +// billQueryRequest.setUserName(userInfo.getName()); | |
131 | +// billQueryRequest.setParkIdList(this.queryParkNoByCustIds(tdCompanyParkQueryRequest)); | |
132 | +// | |
133 | +// } | |
134 | + | |
135 | + // 2.调用接口查询当前登录人管辖的停车场名称 | |
136 | + UserInfo userInfo = sessionCommUtil.getUserInfo(); | |
137 | + List<String> plNos = userInfo.getOrgIds(); | |
138 | + billQueryRequest.setParkIdList(plNos); | |
139 | + billQueryRequest.setUserName(userInfo.getName()); | |
140 | + | |
130 | 141 | result = billManageForDayService.queryBillforDayDeatilPage(billQueryRequest); |
131 | 142 | logger.info("---end---日账单查看调用后场dubbo服务,结果={}", JSONObject.toJSON(result)); |
132 | 143 | ... | ... |