fix

mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java

@@ -20,6 +20,7 @@ import com.iformall.utils.Constant;
 import com.iformall.utils.DateUtils;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 
 import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
@@ -175,6 +176,16 @@ public class WxAgileContractController extends WxContractBaseController {
         return wxAgileContractService.saveOrUpdate(wxRentContract, user);
     }
 
+    /**
+     * 查询非押金
+     */
+    @GetMapping("detail")
+    public ResultData detail(@ModelAttribute WxRentContract wxRentContract) {
+    	wxRentContract.updateTenantInfo(getTenantInfo());
+        return new ResultData(wxAgileContractService.selectById(wxRentContract.getId()));
+    }
+    
+    
     /**
      * 押金科目
      * @return
@@ -198,6 +209,27 @@ public class WxAgileContractController extends WxContractBaseController {
     	return new ResultData(page.getList());
     }
     
+    @GetMapping("unDepositFeesList")
+    public ResultData unDepositFeesList() {
+    	WxEnergyFees dt = new WxEnergyFees();
+    	dt.updateTenantInfo(getTenantInfo());
+    	dt.setIsDel(EnumYesOrNo.NO.getCode());
+    	List<Integer> billTypeList = new ArrayList<Integer>();
+    	billTypeList.add(EnumBillAllType.RENT.getCode());
+    	billTypeList.add(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode());
+    	billTypeList.add(EnumBillAllType.RENT_OPERATION_MANAGE.getCode());
+    	billTypeList.add(EnumBillAllType.PROPERTY.getCode());
+    	dt.setBillTypeList(billTypeList);
+    	dt.setIsDespoit(EnumYesOrNo.NO.getCode());
+    	dt.setIsPublic(EnumYesOrNo.NO.getCode());
+    	dt.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
+    	PageInfo<WxEnergyFees> page = wxEnergyService.feesListAsPage(dt, 1, 100,false);
+    	if (null == page) {
+    		return new ResultData();
+    	}
+    	return new ResultData(page.getList());
+    }
+    
     /**
      * 添加押金
      */
@@ -224,6 +256,43 @@ public class WxAgileContractController extends WxContractBaseController {
         return new ResultData(wxAgileContractService.findShopFeesDeposit(wxRentContract));
     }
     
+    
+    @GetMapping("createRules")
+    public ResultData createRules() {
+    	Map<Integer,String> tmap = new HashMap<Integer,String>();
+    	for (EnumFeesShopTimeType t : EnumFeesShopTimeType.values()) {
+    		tmap.put(t.getCode(), t.getMessage());
+    	}
+        return new ResultData(tmap);
+    } 
+    
+    @GetMapping("settingMethods")
+    public ResultData settingMethods() {
+    	Map<Integer,String> tmap = new HashMap<Integer,String>();
+    	for (EnumRentContractAgilSettingMethod t : EnumRentContractAgilSettingMethod.values()) {
+    		tmap.put(t.getCode(), t.getMessage());
+    	}
+        return new ResultData(tmap);
+    } 
+    
+    @GetMapping("priceUnits")
+    public ResultData priceUnits() {
+    	Map<Integer,String> tmap = new HashMap<Integer,String>();
+    	for (EnumRentContractAgilPriceUnit t : EnumRentContractAgilPriceUnit.values()) {
+    		tmap.put(t.getCode(), t.getMessage());
+    	}
+        return new ResultData(tmap);
+    } 
+    
+    @GetMapping("timeUnits")
+    public ResultData timeUnits() {
+    	Map<Integer,String> tmap = new HashMap<Integer,String>();
+    	for (EnumRentContractAgilTimeUnit t : EnumRentContractAgilTimeUnit.values()) {
+    		tmap.put(t.getCode(), t.getMessage());
+    	}
+        return new ResultData(tmap);
+    } 
+    
     /**
      * 添加非押金项
      */
@@ -254,6 +323,19 @@ public class WxAgileContractController extends WxContractBaseController {
     	unDeposit.updateTenantInfo(getTenantInfo());
         return new ResultData(wxAgileContractService.findUnDeposit(unDeposit));
     }
+    
+    
+    @ApiOperation("分页列表接口")
+    @GetMapping("billList")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
+    public ResultData list(@ModelAttribute WxAllBill record, Integer pageNum, Integer pageSize) {
+        if (record == null) record = new WxAllBill();
+        record.updateTenantInfo(getTenantInfo());
+        record.setSortColumns("starttime asc , status asc");
+        return new ResultData(wxAllBillService.listAsPage(record, pageNum, pageSize));
+    }
 
     
 }