LAPTOP-FO2T5SIU\35838 7 månader sedan
förälder
incheckning
da1a2f951a

+ 25 - 14
pro-base/src/main/java/com/idea/paymentManagement/controller/MaintenanceFundsManagementController.java

@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.List;
+
 @Controller
 @RequestMapping(value = "MaintenanceFundsManagementController")
 @Api(tags = "专项维修资金")
@@ -27,58 +29,70 @@ public class MaintenanceFundsManagementController extends BaseController {
 
     /**
      * 分页
+     *
      * @param tablepar
      * @param model
      * @param dt
      * @return
      */
-    @PostMapping(value = "list",produces = {"application/json;charset=UTF-8"})
+    @PostMapping(value = "list", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public Object list(Tablepar tablepar, ContractManageDto model, DateTrans dt){
-        PageInfo<ContractManageDto> page= modelService.listByModel(tablepar,model,dt);
+    public Object list(Tablepar tablepar, ContractManageDto model, DateTrans dt) {
+        PageInfo<ContractManageDto> page = modelService.listByModel(tablepar, model, dt);
         TableSplitResult<ContractManageDto> result = new TableSplitResult<ContractManageDto>(page.getPageNum(), page.getTotal(), page.getList());
-        return  result;
+        return result;
+    }
+
+    @PostMapping(value = "listAll", produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object listAll(ContractManageDto model) {
+        List<ContractManageDto> result = modelService.listAll(model);
+        return result;
     }
 
+
     /**
      * 收款登记
+     *
      * @param model
      * @return
      */
-    @PostMapping(value = "add",produces = {"application/json;charset=UTF-8"})
+    @PostMapping(value = "add", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public AjaxResult add(MaintenanceFundsManagement model){
+    public AjaxResult add(MaintenanceFundsManagement model) {
         int result = modelService.add(model);
         return result(result);
     }
 
     /**
      * 收款登记 修改
+     *
      * @param model
      * @return
      */
-    @PostMapping(value = "edit",produces = {"application/json;charset=UTF-8"})
+    @PostMapping(value = "edit", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public AjaxResult edit(MaintenanceFundsManagement model){
+    public AjaxResult edit(MaintenanceFundsManagement model) {
         int result = modelService.edit(model);
         return result(result);
     }
 
     /**
      * 查询对应的银行
+     *
      * @param contractId
      * @return
      */
-    @PostMapping(value = "getBankByFloor",produces = {"application/json;charset=UTF-8"})
+    @PostMapping(value = "getBankByFloor", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     public Object getBankByFloor(String contractId) {
-        if(!StringUtils.isNotEmpty(contractId)){
+        if (!StringUtils.isNotEmpty(contractId)) {
             return AjaxResult.error(503, "参数不能为空");
         }
         return modelService.getBankByFloor(contractId);
     }
 
-    @PostMapping(value = "getById",produces = {"application/json;charset=UTF-8"})
+    @PostMapping(value = "getById", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     public Object getById(String id) {
 
@@ -86,7 +100,4 @@ public class MaintenanceFundsManagementController extends BaseController {
     }
 
 
-
-
-
 }

+ 8 - 0
pro-base/src/main/java/com/idea/paymentManagement/controller/PayLogController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
+import java.util.List;
 
 @Controller
 @RequestMapping(value = "PayLogController")
@@ -38,6 +39,13 @@ public class PayLogController extends BaseController {
         return  result;
     }
 
+    @PostMapping(value = "listAll",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object listAll(ContractManageDto model){
+        List<ContractManageDto> result= modelService.listAll(model);
+        return  result;
+    }
+
 
 
     @ApiOperation(value = "收款信息列表")

+ 6 - 0
pro-base/src/main/java/com/idea/paymentManagement/service/MaintenanceFundsManagementService.java

@@ -258,6 +258,12 @@ public class MaintenanceFundsManagementService implements BaseService<Maintenanc
         return pageInfo;
     }
 
+    public List<ContractManageDto> listAll(ContractManageDto model) {
+        List<ContractManageDto> list = extendMapper.listByModel(model);
+        return list;
+    }
+
+
     /**
      * 查询对应的银行
      * @param contractId

+ 6 - 0
pro-base/src/main/java/com/idea/paymentManagement/service/PayLogService.java

@@ -158,6 +158,12 @@ public class PayLogService implements BaseService<PayLog, PayLogExample> {
         return pageInfo;
     }
 
+    public List<ContractManageDto> listAll(ContractManageDto model) {
+        List<ContractManageDto> list = extendMapper.listByModel(model);
+        return list;
+    }
+
+
 
     /**
      * 新增