|
@@ -86,8 +86,7 @@ public class BwMeterReadPlanController extends BaseController {
|
|
|
@ToFlyAppLog(title = "保存抄表录入")
|
|
|
@ApiOperation(value = "保存抄表录入")
|
|
|
@PostMapping("/save")
|
|
|
- public ResultRespone updateById(@RequestPostSingleParam("data") JSONObject data) throws Exception {
|
|
|
-
|
|
|
+ public ResultRespone svaeMeterReadInfo(@RequestPostSingleParam("data") JSONObject data) throws Exception {
|
|
|
|
|
|
|
|
|
|
|
@@ -263,6 +262,10 @@ public class BwMeterReadPlanController extends BaseController {
|
|
|
})
|
|
|
public ResultRespone getUserList(Page page, String companyBranch, String mrBooks, String searchText) {
|
|
|
PageSortHelper.setPageSort(page, null);
|
|
|
+ if (!StringUtils.isBlank(mrBooks)) {
|
|
|
+
|
|
|
+ mrBooks = "'" + mrBooks.replace(",", "','") + "'";
|
|
|
+ }
|
|
|
IPage<Map<String, Object>> pageList = bwMeterReadPlanMapper.getUserList(page, companyBranch, mrBooks, searchText);
|
|
|
return ResultRespone.success(pageList);
|
|
|
}
|