Browse Source

Merge branch 'master' of http://git.zthymaoyi.com/gongdc/wuye

achao 2 năm trước cách đây
mục cha
commit
39b0decc02

+ 1 - 35
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/user/AdminUserServiceImpl.java

@@ -1,24 +1,6 @@
 package com.iotechn.unimall.admin.api.user;
 
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.dangdang.openplatform.openapi.sdk.ApiException;
-import com.dangdang.openplatform.openapi.sdk.SdkClient;
-import com.dangdang.openplatform.openapi.sdk.internal.util.FileItem;
-import com.dangdang.openplatform.openapi.sdk.request.order.OrderDetailsGetRequest;
-import com.dangdang.openplatform.openapi.sdk.request.order.OrderGoodsSendRequest;
-import com.dangdang.openplatform.openapi.sdk.request.order.OrdersContentDecryptRequest;
-import com
-        .dangdang.openplatform.openapi.sdk.requestmodel.order.EncryptDTO;
-import com.dangdang.openplatform.openapi.sdk.requestmodel.order.OrderDetailsGet;
-import com.dangdang.openplatform.openapi.sdk.response.order.OrderDetailsGetResponse;
-import com.dangdang.openplatform.openapi.sdk.response.order.OrderGoodsSendResponse;
-import com.dangdang.openplatform.openapi.sdk.response.order.OrdersContentDecryptResponse;
-import com.dangdang.openplatform.openapi.sdk.responsemodel.order.CryptUserInfo;
-import com.dangdang.openplatform.openapi.sdk.responsemodel.order.OrdersContentDecryptDTO;
-import com.iotechn.unimall.data.util.XMLUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.iotechn.unimall.core.exception.AdminServiceException;
 import com.iotechn.unimall.core.exception.ExceptionDefinition;
@@ -26,28 +8,12 @@ import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.domain.UserDO;
 import com.iotechn.unimall.data.mapper.UserMapper;
 import com.iotechn.unimall.data.model.Page;
-import okhttp3.*;
 import org.apache.commons.codec.digest.Md5Crypt;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.*;
-import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * Created with IntelliJ IDEA.

+ 78 - 73
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/wuye/IWuyeAmountInfoService.java

@@ -9,89 +9,94 @@ import com.iotechn.unimall.core.annotation.HttpParamType;
 import com.iotechn.unimall.core.annotation.param.NotNull;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.model.Page;
+
 import java.util.Date;
 
 /**
  * infoService接口
- * 
+ *
  * @author jlb
  * @date 2022-10-12
  */
 @HttpOpenApi(group = "admin.wuye.wuyeAmountInfo", description = "info")
-public interface IWuyeAmountInfoService{
-	@HttpMethod(description = "新增", permission = "admin:wuye:wuyeAmountInfo:add", permissionParentName = "宠物管理", permissionName = "info管理")
-	public Boolean add(@NotNull @HttpParam(name = "wuyeAmountInfo", type = HttpParamType.COMMON, description = "info") WuyeAmountInfo wuyeAmountInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+public interface IWuyeAmountInfoService {
+    @HttpMethod(description = "新增", permission = "admin:wuye:wuyeAmountInfo:add", permissionParentName = "宠物管理", permissionName = "info管理")
+    public Boolean add(@NotNull @HttpParam(name = "wuyeAmountInfo", type = HttpParamType.COMMON, description = "info") WuyeAmountInfo wuyeAmountInfo,
+                       @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
+
+    @HttpMethod(description = "列表", permission = "admin:wuye:wuyeAmountInfo:list", permissionParentName = "宠物管理", permissionName = "info管理")
+    public Page<WuyeAmountInfo> list(
+            @HttpParam(name = "buildingNo", type = HttpParamType.COMMON, description = "楼号") String buildingNo,
+            @HttpParam(name = "unitNo", type = HttpParamType.COMMON, description = "单元号") String unitNo,
+            @HttpParam(name = "floor", type = HttpParamType.COMMON, description = "楼层") String floor,
+            @HttpParam(name = "sourceNumber", type = HttpParamType.COMMON, description = "房源号") String sourceNumber,
+            @HttpParam(name = "householder", type = HttpParamType.COMMON, description = "户主") String householder,
+            @HttpParam(name = "predictedArea", type = HttpParamType.COMMON, description = "预测面积") Double predictedArea,
+            @HttpParam(name = "actualMoney", type = HttpParamType.COMMON, description = "实际面积") Double actualMoney,
+            @HttpParam(name = "propertyFee", type = HttpParamType.COMMON, description = "一年物业费(1.6元/平)") Double propertyFee,
+            @HttpParam(name = "elevatorFee", type = HttpParamType.COMMON, description = "一年电梯费(一层30元/月,每增加一层累加3元/月)") Double elevatorFee,
+            @HttpParam(name = "parkingSpace", type = HttpParamType.COMMON, description = "一年车位管理费(单独150元/月,子母225元/月)") Double parkingSpace,
+            @HttpParam(name = "cheweiNo", type = HttpParamType.COMMON, description = "车位号") String cheweiNo,
+            @HttpParam(name = "garage", type = HttpParamType.COMMON, description = "一年车库管理费(单独150元/月,子母225元/月)") Double garage,
+            @HttpParam(name = "garageNo", type = HttpParamType.COMMON, description = "车库号") String garageNo,
+            @HttpParam(name = "warehouse", type = HttpParamType.COMMON, description = "一年仓库管理费(200元/年)") Double warehouse,
+            @HttpParam(name = "warehouseNo", type = HttpParamType.COMMON, description = "仓库号") String warehouseNo,
+            @HttpParam(name = "garbageClearing", type = HttpParamType.COMMON, description = "垃圾清运费(平层建筑面积3元/平,带地下及阁楼5元/平)") Double garbageClearing,
+            @HttpParam(name = "paymentDate", type = HttpParamType.COMMON, description = "缴费日期") Date paymentDate,
+            @HttpParam(name = "paymentMethod", type = HttpParamType.COMMON, description = "缴费方式") String paymentMethod,
+            @HttpParam(name = "totalActualPayment", type = HttpParamType.COMMON, description = "实际缴费总合计") Double totalActualPayment,
+            @HttpParam(name = "paymentRange", type = HttpParamType.COMMON, description = "缴费区间") String paymentRange,
+            @HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Long deleteFlag,
+            @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+            @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+            @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+            @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
+            @HttpParam(name = "pageNum", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+            @HttpParam(name = "pageSize", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
+            throws ServiceException;
+
+    @HttpMethod(description = "删除", permission = "admin:wuye:wuyeAmountInfo:delete", permissionParentName = "宠物管理", permissionName = "info管理")
+    public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") Long id) throws ServiceException;
+
+    @HttpMethod(description = "修改", permission = "admin:wuyeAmountInfo:wuyeAmountInfo:update", permissionParentName = "宠物管理", permissionName = "info管理")
+    public Boolean update(@NotNull @HttpParam(name = "wuyeAmountInfo", type = HttpParamType.COMMON, description = "info") WuyeAmountInfo wuyeAmountInfo,
+                          @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
 
-	@HttpMethod(description = "列表", permission = "admin:wuye:wuyeAmountInfo:list",permissionParentName = "宠物管理", permissionName = "info管理")
-	public Page<WuyeAmountInfo> list(
-								@HttpParam(name = "buildingNo", type = HttpParamType.COMMON, description = "楼号") String buildingNo,
-							@HttpParam(name = "unitNo", type = HttpParamType.COMMON, description = "单元号") String unitNo,
-							@HttpParam(name = "floor", type = HttpParamType.COMMON, description = "楼层") String floor,
-							@HttpParam(name = "sourceNumber", type = HttpParamType.COMMON, description = "房源号") String sourceNumber,
-							@HttpParam(name = "householder", type = HttpParamType.COMMON, description = "户主") String householder,
-							@HttpParam(name = "predictedArea", type = HttpParamType.COMMON, description = "预测面积") Double predictedArea,
-							@HttpParam(name = "actualMoney", type = HttpParamType.COMMON, description = "实际面积") Double actualMoney,
-							@HttpParam(name = "propertyFee", type = HttpParamType.COMMON, description = "一年物业费(1.6元/平)") Double propertyFee,
-							@HttpParam(name = "elevatorFee", type = HttpParamType.COMMON, description = "一年电梯费(一层30元/月,每增加一层累加3元/月)") Double elevatorFee,
-							@HttpParam(name = "parkingSpace", type = HttpParamType.COMMON, description = "一年车位管理费(单独150元/月,子母225元/月)") Double parkingSpace,
-							@HttpParam(name = "cheweiNo", type = HttpParamType.COMMON, description = "车位号") String cheweiNo,
-							@HttpParam(name = "garage", type = HttpParamType.COMMON, description = "一年车库管理费(单独150元/月,子母225元/月)") Double garage,
-							@HttpParam(name = "garageNo", type = HttpParamType.COMMON, description = "车库号") String garageNo,
-							@HttpParam(name = "warehouse", type = HttpParamType.COMMON, description = "一年仓库管理费(200元/年)") Double warehouse,
-							@HttpParam(name = "warehouseNo", type = HttpParamType.COMMON, description = "仓库号") String warehouseNo,
-							@HttpParam(name = "garbageClearing", type = HttpParamType.COMMON, description = "垃圾清运费(平层建筑面积3元/平,带地下及阁楼5元/平)") Double garbageClearing,
-							@HttpParam(name = "paymentDate", type = HttpParamType.COMMON, description = "缴费日期") Date paymentDate,
-							@HttpParam(name = "paymentMethod", type = HttpParamType.COMMON, description = "缴费方式") String paymentMethod,
-							@HttpParam(name = "totalActualPayment", type = HttpParamType.COMMON, description = "实际缴费总合计") Double totalActualPayment,
-							@HttpParam(name = "paymentRange", type = HttpParamType.COMMON, description = "缴费区间") String paymentRange,
-										@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Long deleteFlag,
-							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-					@HttpParam(name = "pageNum", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-		@HttpParam(name = "pageSize", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
-		throws ServiceException;
+    @HttpMethod(description = "查询", permission = "admin:wuye:wuyeAmountInfo:get", permissionParentName = "宠物管理", permissionName = "info管理")
+    public WuyeAmountInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") Long id) throws ServiceException;
 
-	@HttpMethod(description = "删除", permission = "admin:wuye:wuyeAmountInfo:delete",permissionParentName = "宠物管理", permissionName = "info管理")
-	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
+    @HttpMethod(description = "查询", permission = "admin:wuye:wuyeAmountInfo:get", permissionParentName = "宠物管理", permissionName = "info管理")
+    public WuyeAmountInfo getInfo(@NotNull @HttpParam(name = "wuyeAmountInfo", type = HttpParamType.COMMON, description = "info") WuyeAmountInfo wuyeAmountInfo
+    ) throws ServiceException;
 
-	@HttpMethod(description = "修改", permission = "admin:wuyeAmountInfo:wuyeAmountInfo:update",permissionParentName = "宠物管理", permissionName = "info管理")
-	public Boolean update(@NotNull @HttpParam(name = "wuyeAmountInfo", type = HttpParamType.COMMON, description = "info") WuyeAmountInfo wuyeAmountInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+    @HttpMethod(description = "导出excl表", permission = "admin:wuye:wuyeAmountInfo:export", permissionParentName = "宠物管理", permissionName = "info管理")
+    public String export(
+            @HttpParam(name = "buildingNo", type = HttpParamType.COMMON, description = "楼号") String buildingNo,
+            @HttpParam(name = "unitNo", type = HttpParamType.COMMON, description = "单元号") String unitNo,
+            @HttpParam(name = "floor", type = HttpParamType.COMMON, description = "楼层") String floor,
+            @HttpParam(name = "sourceNumber", type = HttpParamType.COMMON, description = "房源号") String sourceNumber,
+            @HttpParam(name = "householder", type = HttpParamType.COMMON, description = "户主") String householder,
+            @HttpParam(name = "predictedArea", type = HttpParamType.COMMON, description = "预测面积") Double predictedArea,
+            @HttpParam(name = "actualMoney", type = HttpParamType.COMMON, description = "实际面积") Double actualMoney,
+            @HttpParam(name = "propertyFee", type = HttpParamType.COMMON, description = "一年物业费(1.6元/平)") Double propertyFee,
+            @HttpParam(name = "elevatorFee", type = HttpParamType.COMMON, description = "一年电梯费(一层30元/月,每增加一层累加3元/月)") Double elevatorFee,
+            @HttpParam(name = "parkingSpace", type = HttpParamType.COMMON, description = "一年车位管理费(单独150元/月,子母225元/月)") Double parkingSpace,
+            @HttpParam(name = "cheweiNo", type = HttpParamType.COMMON, description = "车位号") String cheweiNo,
+            @HttpParam(name = "garage", type = HttpParamType.COMMON, description = "一年车库管理费(单独150元/月,子母225元/月)") Double garage,
+            @HttpParam(name = "garageNo", type = HttpParamType.COMMON, description = "车库号") String garageNo,
+            @HttpParam(name = "warehouse", type = HttpParamType.COMMON, description = "一年仓库管理费(200元/年)") Double warehouse,
+            @HttpParam(name = "warehouseNo", type = HttpParamType.COMMON, description = "仓库号") String warehouseNo,
+            @HttpParam(name = "garbageClearing", type = HttpParamType.COMMON, description = "垃圾清运费(平层建筑面积3元/平,带地下及阁楼5元/平)") Double garbageClearing,
+            @HttpParam(name = "paymentDate", type = HttpParamType.COMMON, description = "缴费日期") Date paymentDate,
+            @HttpParam(name = "paymentMethod", type = HttpParamType.COMMON, description = "缴费方式") String paymentMethod,
+            @HttpParam(name = "totalActualPayment", type = HttpParamType.COMMON, description = "实际缴费总合计") Double totalActualPayment,
+            @HttpParam(name = "paymentRange", type = HttpParamType.COMMON, description = "缴费区间") String paymentRange,
+            @HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Long deleteFlag,
+            @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+            @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+            @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+            @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
+            @HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+            @HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit) throws ServiceException;
 
-	@HttpMethod(description = "查询", permission = "admin:wuye:wuyeAmountInfo:get",permissionParentName = "宠物管理", permissionName = "info管理")
-	public WuyeAmountInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
-	
-	@HttpMethod(description = "导出excl表", permission = "admin:wuye:wuyeAmountInfo:export",permissionParentName = "宠物管理", permissionName = "info管理")
-	public String export(
-								@HttpParam(name = "buildingNo", type = HttpParamType.COMMON, description = "楼号") String buildingNo,
-							@HttpParam(name = "unitNo", type = HttpParamType.COMMON, description = "单元号") String unitNo,
-							@HttpParam(name = "floor", type = HttpParamType.COMMON, description = "楼层") String floor,
-							@HttpParam(name = "sourceNumber", type = HttpParamType.COMMON, description = "房源号") String sourceNumber,
-							@HttpParam(name = "householder", type = HttpParamType.COMMON, description = "户主") String householder,
-							@HttpParam(name = "predictedArea", type = HttpParamType.COMMON, description = "预测面积") Double predictedArea,
-							@HttpParam(name = "actualMoney", type = HttpParamType.COMMON, description = "实际面积") Double actualMoney,
-							@HttpParam(name = "propertyFee", type = HttpParamType.COMMON, description = "一年物业费(1.6元/平)") Double propertyFee,
-							@HttpParam(name = "elevatorFee", type = HttpParamType.COMMON, description = "一年电梯费(一层30元/月,每增加一层累加3元/月)") Double elevatorFee,
-							@HttpParam(name = "parkingSpace", type = HttpParamType.COMMON, description = "一年车位管理费(单独150元/月,子母225元/月)") Double parkingSpace,
-							@HttpParam(name = "cheweiNo", type = HttpParamType.COMMON, description = "车位号") String cheweiNo,
-							@HttpParam(name = "garage", type = HttpParamType.COMMON, description = "一年车库管理费(单独150元/月,子母225元/月)") Double garage,
-							@HttpParam(name = "garageNo", type = HttpParamType.COMMON, description = "车库号") String garageNo,
-							@HttpParam(name = "warehouse", type = HttpParamType.COMMON, description = "一年仓库管理费(200元/年)") Double warehouse,
-							@HttpParam(name = "warehouseNo", type = HttpParamType.COMMON, description = "仓库号") String warehouseNo,
-							@HttpParam(name = "garbageClearing", type = HttpParamType.COMMON, description = "垃圾清运费(平层建筑面积3元/平,带地下及阁楼5元/平)") Double garbageClearing,
-							@HttpParam(name = "paymentDate", type = HttpParamType.COMMON, description = "缴费日期") Date paymentDate,
-							@HttpParam(name = "paymentMethod", type = HttpParamType.COMMON, description = "缴费方式") String paymentMethod,
-							@HttpParam(name = "totalActualPayment", type = HttpParamType.COMMON, description = "实际缴费总合计") Double totalActualPayment,
-							@HttpParam(name = "paymentRange", type = HttpParamType.COMMON, description = "缴费区间") String paymentRange,
-										@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Long deleteFlag,
-							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-				@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-	@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)throws ServiceException;
-	
 }

+ 209 - 201
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/wuye/impl/WuyeAmountInfoServiceImpl.java

@@ -15,220 +15,228 @@ import com.iotechn.unimall.data.mapper.wuye.WuyeAmountInfoMapper;
 import com.iotechn.unimall.data.domain.wuye.WuyeAmountInfo;
 import com.iotechn.unimall.admin.api.wuye.IWuyeAmountInfoService;
 import com.iotechn.unimall.data.model.Page;
+
 import java.util.Date;
+
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * infoService业务层处理
- * 
+ *
  * @author jlb
  * @date 2022-10-12
  */
 @Service
-public class WuyeAmountInfoServiceImpl implements IWuyeAmountInfoService{
-	@Autowired
-	private WuyeAmountInfoMapper wuyeAmountInfoMapper;
-	
-	@Override
-	public Boolean add(WuyeAmountInfo wuyeAmountInfo,Long adminId) throws ServiceException {
-		Date now = new Date();
-		wuyeAmountInfo.setGmtCreate(now);
-		wuyeAmountInfo.setGmtUpdate(now);
-		wuyeAmountInfo.setAdminId(adminId);
-		return wuyeAmountInfoMapper.insert(wuyeAmountInfo)>0;
-	}
+public class WuyeAmountInfoServiceImpl implements IWuyeAmountInfoService {
+    @Autowired
+    private WuyeAmountInfoMapper wuyeAmountInfoMapper;
 
-	@Override
-	public Page<WuyeAmountInfo> list(String buildingNo,String unitNo,String floor,String sourceNumber,String householder,Double predictedArea,Double actualMoney,Double propertyFee,Double elevatorFee,Double parkingSpace,String cheweiNo,Double garage,String garageNo,Double warehouse,String warehouseNo,Double garbageClearing,Date paymentDate,String paymentMethod,Double totalActualPayment,String paymentRange,Long deleteFlag,Date gmtCreate,Date gmtUpdate,Long userId,Long adminId, Integer page, Integer limit)throws ServiceException {
-		Wrapper<WuyeAmountInfo> wrapper = new EntityWrapper<WuyeAmountInfo>();
-														if (!StringUtils.isEmpty(buildingNo)) {
-					wrapper.eq("building_no", buildingNo);
-				}
-												if (!StringUtils.isEmpty(unitNo)) {
-					wrapper.eq("unit_no", unitNo);
-				}
-												if (!StringUtils.isEmpty(floor)) {
-					wrapper.eq("floor", floor);
-				}
-												if (!StringUtils.isEmpty(sourceNumber)) {
-					wrapper.eq("source_number", sourceNumber);
-				}
-												if (!StringUtils.isEmpty(householder)) {
-					wrapper.eq("householder", householder);
-				}
-												if (!StringUtils.isEmpty(predictedArea)) {
-					wrapper.eq("predicted_area", predictedArea);
-				}
-												if (!StringUtils.isEmpty(actualMoney)) {
-					wrapper.eq("actual_money", actualMoney);
-				}
-												if (!StringUtils.isEmpty(propertyFee)) {
-					wrapper.eq("property_fee", propertyFee);
-				}
-												if (!StringUtils.isEmpty(elevatorFee)) {
-					wrapper.eq("elevator_fee", elevatorFee);
-				}
-												if (!StringUtils.isEmpty(parkingSpace)) {
-					wrapper.eq("parking_space", parkingSpace);
-				}
-												if (!StringUtils.isEmpty(cheweiNo)) {
-					wrapper.eq("chewei_no", cheweiNo);
-				}
-												if (!StringUtils.isEmpty(garage)) {
-					wrapper.eq("garage", garage);
-				}
-												if (!StringUtils.isEmpty(garageNo)) {
-					wrapper.eq("garage_no", garageNo);
-				}
-												if (!StringUtils.isEmpty(warehouse)) {
-					wrapper.eq("warehouse", warehouse);
-				}
-												if (!StringUtils.isEmpty(warehouseNo)) {
-					wrapper.eq("warehouse_no", warehouseNo);
-				}
-												if (!StringUtils.isEmpty(garbageClearing)) {
-					wrapper.eq("garbage_clearing", garbageClearing);
-				}
-												if (!StringUtils.isEmpty(paymentDate)) {
-					wrapper.eq("payment_date", paymentDate);
-				}
-												if (!StringUtils.isEmpty(paymentMethod)) {
-					wrapper.eq("payment_method", paymentMethod);
-				}
-												if (!StringUtils.isEmpty(totalActualPayment)) {
-					wrapper.eq("total_actual_payment", totalActualPayment);
-				}
-												if (!StringUtils.isEmpty(paymentRange)) {
-					wrapper.eq("payment_range", paymentRange);
-				}
-																	if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(userId)) {
-					wrapper.eq("user_id", userId);
-				}
-												if (!StringUtils.isEmpty(adminId)) {
-					wrapper.eq("admin_id", adminId);
-				}
-							wrapper.eq("delete_flag", 0);
-		List<WuyeAmountInfo> list = wuyeAmountInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-		Integer count = wuyeAmountInfoMapper.selectCount(wrapper);
-		return new Page<WuyeAmountInfo>(list, page, limit, count);
-	}
+    @Override
+    public Boolean add(WuyeAmountInfo wuyeAmountInfo, Long adminId) throws ServiceException {
+        Date now = new Date();
+        wuyeAmountInfo.setGmtCreate(now);
+        wuyeAmountInfo.setGmtUpdate(now);
+        wuyeAmountInfo.setAdminId(adminId);
+        return wuyeAmountInfoMapper.insert(wuyeAmountInfo) > 0;
+    }
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(Long id) {
-		String[] ids = String.valueOf(id).split(",");
-		for (String tt:ids) {
-			WuyeAmountInfo tmp =  wuyeAmountInfoMapper.selectById(Long.parseLong(tt));
-			if(tmp != null){
-				tmp.setDeleteFlag(1L);
-				wuyeAmountInfoMapper.updateById(tmp);
-			}
-		}
-		return true;
-	}
+    @Override
+    public Page<WuyeAmountInfo> list(String buildingNo, String unitNo, String floor, String sourceNumber, String householder, Double predictedArea, Double actualMoney, Double propertyFee, Double elevatorFee, Double parkingSpace, String cheweiNo, Double garage, String garageNo, Double warehouse, String warehouseNo, Double garbageClearing, Date paymentDate, String paymentMethod, Double totalActualPayment, String paymentRange, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<WuyeAmountInfo> wrapper = new EntityWrapper<WuyeAmountInfo>();
+        if (!StringUtils.isEmpty(buildingNo)) {
+            wrapper.eq("building_no", buildingNo);
+        }
+        if (!StringUtils.isEmpty(unitNo)) {
+            wrapper.eq("unit_no", unitNo);
+        }
+        if (!StringUtils.isEmpty(floor)) {
+            wrapper.eq("floor", floor);
+        }
+        if (!StringUtils.isEmpty(sourceNumber)) {
+            wrapper.eq("source_number", sourceNumber);
+        }
+        if (!StringUtils.isEmpty(householder)) {
+            wrapper.eq("householder", householder);
+        }
+        if (!StringUtils.isEmpty(predictedArea)) {
+            wrapper.eq("predicted_area", predictedArea);
+        }
+        if (!StringUtils.isEmpty(actualMoney)) {
+            wrapper.eq("actual_money", actualMoney);
+        }
+        if (!StringUtils.isEmpty(propertyFee)) {
+            wrapper.eq("property_fee", propertyFee);
+        }
+        if (!StringUtils.isEmpty(elevatorFee)) {
+            wrapper.eq("elevator_fee", elevatorFee);
+        }
+        if (!StringUtils.isEmpty(parkingSpace)) {
+            wrapper.eq("parking_space", parkingSpace);
+        }
+        if (!StringUtils.isEmpty(cheweiNo)) {
+            wrapper.eq("chewei_no", cheweiNo);
+        }
+        if (!StringUtils.isEmpty(garage)) {
+            wrapper.eq("garage", garage);
+        }
+        if (!StringUtils.isEmpty(garageNo)) {
+            wrapper.eq("garage_no", garageNo);
+        }
+        if (!StringUtils.isEmpty(warehouse)) {
+            wrapper.eq("warehouse", warehouse);
+        }
+        if (!StringUtils.isEmpty(warehouseNo)) {
+            wrapper.eq("warehouse_no", warehouseNo);
+        }
+        if (!StringUtils.isEmpty(garbageClearing)) {
+            wrapper.eq("garbage_clearing", garbageClearing);
+        }
+        if (!StringUtils.isEmpty(paymentDate)) {
+            wrapper.eq("payment_date", paymentDate);
+        }
+        if (!StringUtils.isEmpty(paymentMethod)) {
+            wrapper.eq("payment_method", paymentMethod);
+        }
+        if (!StringUtils.isEmpty(totalActualPayment)) {
+            wrapper.eq("total_actual_payment", totalActualPayment);
+        }
+        if (!StringUtils.isEmpty(paymentRange)) {
+            wrapper.eq("payment_range", paymentRange);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(userId)) {
+            wrapper.eq("user_id", userId);
+        }
+        if (!StringUtils.isEmpty(adminId)) {
+            wrapper.eq("admin_id", adminId);
+        }
+        wrapper.eq("delete_flag", 0);
+        wrapper.orderBy("source_number");
+        List<WuyeAmountInfo> list = wuyeAmountInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        Integer count = wuyeAmountInfoMapper.selectCount(wrapper);
+        return new Page<WuyeAmountInfo>(list, page, limit, count);
+    }
 
-	@Override
-	public Boolean update(WuyeAmountInfo wuyeAmountInfo,Long adminId) throws ServiceException {
-		Date now = new Date();
-		wuyeAmountInfo.setGmtUpdate(now);
-		wuyeAmountInfo.setAdminId(adminId);
-		return wuyeAmountInfoMapper.updateById(wuyeAmountInfo)>0;
-	}
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(Long id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            WuyeAmountInfo tmp = wuyeAmountInfoMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1L);
+                wuyeAmountInfoMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public Boolean update(WuyeAmountInfo wuyeAmountInfo, Long adminId) throws ServiceException {
+        Date now = new Date();
+        wuyeAmountInfo.setGmtUpdate(now);
+        wuyeAmountInfo.setAdminId(adminId);
+        return wuyeAmountInfoMapper.updateById(wuyeAmountInfo) > 0;
+    }
+
+    @Override
+    public WuyeAmountInfo get(Long id) throws ServiceException {
+        return wuyeAmountInfoMapper.selectById(id);
+    }
 
 	@Override
-	public WuyeAmountInfo get(Long id) throws ServiceException {
-		return wuyeAmountInfoMapper.selectById(id);
-	}
-	
-	@Override
-	public String export(String buildingNo,String unitNo,String floor,String sourceNumber,String householder,Double predictedArea,Double actualMoney,Double propertyFee,Double elevatorFee,Double parkingSpace,String cheweiNo,Double garage,String garageNo,Double warehouse,String warehouseNo,Double garbageClearing,Date paymentDate,String paymentMethod,Double totalActualPayment,String paymentRange,Long deleteFlag,Date gmtCreate,Date gmtUpdate,Long userId,Long adminId, Integer page, Integer limit)throws ServiceException {
-		Wrapper<WuyeAmountInfo> wrapper = new EntityWrapper<WuyeAmountInfo>();
-														if (!StringUtils.isEmpty(buildingNo)) {
-					wrapper.eq("building_no", buildingNo);
-				}
-												if (!StringUtils.isEmpty(unitNo)) {
-					wrapper.eq("unit_no", unitNo);
-				}
-												if (!StringUtils.isEmpty(floor)) {
-					wrapper.eq("floor", floor);
-				}
-												if (!StringUtils.isEmpty(sourceNumber)) {
-					wrapper.eq("source_number", sourceNumber);
-				}
-												if (!StringUtils.isEmpty(householder)) {
-					wrapper.eq("householder", householder);
-				}
-												if (!StringUtils.isEmpty(predictedArea)) {
-					wrapper.eq("predicted_area", predictedArea);
-				}
-												if (!StringUtils.isEmpty(actualMoney)) {
-					wrapper.eq("actual_money", actualMoney);
-				}
-												if (!StringUtils.isEmpty(propertyFee)) {
-					wrapper.eq("property_fee", propertyFee);
-				}
-												if (!StringUtils.isEmpty(elevatorFee)) {
-					wrapper.eq("elevator_fee", elevatorFee);
-				}
-												if (!StringUtils.isEmpty(parkingSpace)) {
-					wrapper.eq("parking_space", parkingSpace);
-				}
-												if (!StringUtils.isEmpty(cheweiNo)) {
-					wrapper.eq("chewei_no", cheweiNo);
-				}
-												if (!StringUtils.isEmpty(garage)) {
-					wrapper.eq("garage", garage);
-				}
-												if (!StringUtils.isEmpty(garageNo)) {
-					wrapper.eq("garage_no", garageNo);
-				}
-												if (!StringUtils.isEmpty(warehouse)) {
-					wrapper.eq("warehouse", warehouse);
-				}
-												if (!StringUtils.isEmpty(warehouseNo)) {
-					wrapper.eq("warehouse_no", warehouseNo);
-				}
-												if (!StringUtils.isEmpty(garbageClearing)) {
-					wrapper.eq("garbage_clearing", garbageClearing);
-				}
-												if (!StringUtils.isEmpty(paymentDate)) {
-					wrapper.eq("payment_date", paymentDate);
-				}
-												if (!StringUtils.isEmpty(paymentMethod)) {
-					wrapper.eq("payment_method", paymentMethod);
-				}
-												if (!StringUtils.isEmpty(totalActualPayment)) {
-					wrapper.eq("total_actual_payment", totalActualPayment);
-				}
-												if (!StringUtils.isEmpty(paymentRange)) {
-					wrapper.eq("payment_range", paymentRange);
-				}
-																	if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(userId)) {
-					wrapper.eq("user_id", userId);
-				}
-												if (!StringUtils.isEmpty(adminId)) {
-					wrapper.eq("admin_id", adminId);
-				}
-							List<WuyeAmountInfo> list = wuyeAmountInfoMapper.selectList(wrapper);
-		ExcelUtil<WuyeAmountInfo> util = new ExcelUtil<WuyeAmountInfo>(WuyeAmountInfo.class);
-		return util.exportExcel(list, "操作日志");
+	public WuyeAmountInfo getInfo(WuyeAmountInfo wuyeAmountInfo) throws ServiceException {
+		return wuyeAmountInfoMapper.selectOne(wuyeAmountInfo);
 	}
+
+    @Override
+    public String export(String buildingNo, String unitNo, String floor, String sourceNumber, String householder, Double predictedArea, Double actualMoney, Double propertyFee, Double elevatorFee, Double parkingSpace, String cheweiNo, Double garage, String garageNo, Double warehouse, String warehouseNo, Double garbageClearing, Date paymentDate, String paymentMethod, Double totalActualPayment, String paymentRange, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<WuyeAmountInfo> wrapper = new EntityWrapper<WuyeAmountInfo>();
+        if (!StringUtils.isEmpty(buildingNo)) {
+            wrapper.eq("building_no", buildingNo);
+        }
+        if (!StringUtils.isEmpty(unitNo)) {
+            wrapper.eq("unit_no", unitNo);
+        }
+        if (!StringUtils.isEmpty(floor)) {
+            wrapper.eq("floor", floor);
+        }
+        if (!StringUtils.isEmpty(sourceNumber)) {
+            wrapper.eq("source_number", sourceNumber);
+        }
+        if (!StringUtils.isEmpty(householder)) {
+            wrapper.eq("householder", householder);
+        }
+        if (!StringUtils.isEmpty(predictedArea)) {
+            wrapper.eq("predicted_area", predictedArea);
+        }
+        if (!StringUtils.isEmpty(actualMoney)) {
+            wrapper.eq("actual_money", actualMoney);
+        }
+        if (!StringUtils.isEmpty(propertyFee)) {
+            wrapper.eq("property_fee", propertyFee);
+        }
+        if (!StringUtils.isEmpty(elevatorFee)) {
+            wrapper.eq("elevator_fee", elevatorFee);
+        }
+        if (!StringUtils.isEmpty(parkingSpace)) {
+            wrapper.eq("parking_space", parkingSpace);
+        }
+        if (!StringUtils.isEmpty(cheweiNo)) {
+            wrapper.eq("chewei_no", cheweiNo);
+        }
+        if (!StringUtils.isEmpty(garage)) {
+            wrapper.eq("garage", garage);
+        }
+        if (!StringUtils.isEmpty(garageNo)) {
+            wrapper.eq("garage_no", garageNo);
+        }
+        if (!StringUtils.isEmpty(warehouse)) {
+            wrapper.eq("warehouse", warehouse);
+        }
+        if (!StringUtils.isEmpty(warehouseNo)) {
+            wrapper.eq("warehouse_no", warehouseNo);
+        }
+        if (!StringUtils.isEmpty(garbageClearing)) {
+            wrapper.eq("garbage_clearing", garbageClearing);
+        }
+        if (!StringUtils.isEmpty(paymentDate)) {
+            wrapper.eq("payment_date", paymentDate);
+        }
+        if (!StringUtils.isEmpty(paymentMethod)) {
+            wrapper.eq("payment_method", paymentMethod);
+        }
+        if (!StringUtils.isEmpty(totalActualPayment)) {
+            wrapper.eq("total_actual_payment", totalActualPayment);
+        }
+        if (!StringUtils.isEmpty(paymentRange)) {
+            wrapper.eq("payment_range", paymentRange);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(userId)) {
+            wrapper.eq("user_id", userId);
+        }
+        if (!StringUtils.isEmpty(adminId)) {
+            wrapper.eq("admin_id", adminId);
+        }
+        List<WuyeAmountInfo> list = wuyeAmountInfoMapper.selectList(wrapper);
+        ExcelUtil<WuyeAmountInfo> util = new ExcelUtil<WuyeAmountInfo>(WuyeAmountInfo.class);
+        return util.exportExcel(list, "操作日志");
+    }
 }

+ 1 - 1
unimall-admin/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <title>电商后台管理</title>
+    <title>东方御后台管理</title>
   </head>
   <body>
     <script src=<%= BASE_URL %>/tinymce4.7.5/tinymce.min.js></script>

+ 1 - 1
unimall-admin/src/views/login/index.vue

@@ -11,7 +11,7 @@
           class="img"
           src="@/assets/avatar.png"
           alt="">
-        <p class="title">电商后台登录</p>
+        <p class="title">东方御后台管理</p>
       </div>
       <div class="login-border">
         <div class="login-main">

+ 85 - 25
unimall-admin/src/views/wuye/info/index.vue

@@ -131,8 +131,8 @@
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" fixed width="55" align="center" />
+    <el-table v-loading="loading" :data="infoList" :summary-method="getSummaries" show-summary @selection-change="handleSelectionChange">
+      <el-table-column type="selection" fixed width="85px" align="center" />
       <!-- <el-table-column label="楼号" align="center" prop="buildingNo" /> -->
       <!-- <el-table-column label="单元号" align="center" prop="unitNo" /> -->
       <!-- <el-table-column label="楼层" align="center" prop="floor" /> -->
@@ -151,12 +151,12 @@
       <el-table-column label="垃圾清运费" width="100px" align="center" prop="garbageClearing" />
       <el-table-column label="缴费日期" align="center" prop="paymentDate" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.paymentDate) }}</span>
+          <span>{{ scope.row.paymentDate!=null? parseTime(scope.row.paymentDate):'' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="缴费方式" align="center" prop="paymentMethod" />
       <el-table-column label="实缴合计" align="center" prop="totalActualPayment" />
-      <el-table-column label="缴费区间" width="150px" align="center" prop="paymentRange" />
+      <el-table-column label="缴费区间" width="250px" align="center" prop="paymentRange" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" width="150px" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -167,22 +167,31 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
           >修改</el-button>
-          <el-button
+          <!-- <el-button
             v-permission="['wuye:info:remove']"
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-          >删除</el-button>
+          >删除</el-button> -->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-position"
+            @click="handlePrint(scope.row)"
+          >打印</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
+    <el-pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :current-page="queryParams.pageNum"
+      :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]"
+      layout="total, sizes, prev, pager, next, jumper"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
       @pagination="getList"
     />
 
@@ -190,21 +199,21 @@
     <el-dialog :title="title" :visible.sync="open" width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="楼号" prop="buildingNo">
-          <el-input v-model="form.buildingNo" placeholder="请输入楼号" />
+          <el-input v-model="form.buildingNo" placeholder="请输入楼号" disabled/>
         </el-form-item>
         <el-form-item label="单元号" prop="unitNo">
-          <el-input v-model="form.unitNo" placeholder="请输入单元号" />
+          <el-input v-model="form.unitNo" placeholder="请输入单元号" disabled/>
         </el-form-item>
         <el-form-item label="楼层" prop="floor">
-          <el-input v-model="form.floor" placeholder="请输入楼层" />
+          <el-input v-model="form.floor" placeholder="请输入楼层" disabled/>
         </el-form-item>
         <el-form-item label="房源号" prop="sourceNumber">
-          <el-input v-model="form.sourceNumber" placeholder="请输入房源号" />
+          <el-input v-model="form.sourceNumber" placeholder="请输入房源号" disabled/>
         </el-form-item>
         <el-form-item label="户主" prop="householder">
           <el-input v-model="form.householder" placeholder="请输入户主" />
         </el-form-item>
-        <el-form-item label="预测面积" prop="predictedArea">
+        <!-- <el-form-item label="预测面积" prop="predictedArea">
           <el-input v-model="form.predictedArea" placeholder="请输入预测面积" />
         </el-form-item>
         <el-form-item label="实际面积" prop="actualMoney">
@@ -218,23 +227,23 @@
         </el-form-item>
         <el-form-item label="一年车位管理费" prop="parkingSpace">
           <el-input v-model="form.parkingSpace" placeholder="请输入一年车位管理费" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="车位号" prop="cheweiNo">
           <el-input v-model="form.cheweiNo" placeholder="请输入车位号" />
         </el-form-item>
-        <el-form-item label="一年车库管理费" prop="garage">
+        <!-- <el-form-item label="一年车库管理费" prop="garage">
           <el-input v-model="form.garage" placeholder="请输入一年车库管理费" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="车库号" prop="garageNo">
           <el-input v-model="form.garageNo" placeholder="请输入车库号" />
         </el-form-item>
-        <el-form-item label="一年仓库管理费" prop="warehouse">
+        <!-- <el-form-item label="一年仓库管理费" prop="warehouse">
           <el-input v-model="form.warehouse" placeholder="请输入一年仓库管理费" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="仓库号" prop="warehouseNo">
           <el-input v-model="form.warehouseNo" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="垃圾清运费" prop="garbageClearing">
+        <!-- <el-form-item label="垃圾清运费" prop="garbageClearing">
           <el-input v-model="form.garbageClearing" placeholder="请输入垃圾清运费" />
         </el-form-item>
         <el-form-item label="缴费日期" prop="paymentDate">
@@ -255,11 +264,11 @@
         </el-form-item>
         <el-form-item label="缴费区间" prop="paymentRange">
           <el-input v-model="form.paymentRange" placeholder="请输入缴费区间" />
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="删除标识" prop="deleteFlag">
+        <!-- <el-form-item label="删除标识" prop="deleteFlag">
           <el-input v-model="form.deleteFlag" placeholder="请输入删除标识" />
         </el-form-item>
         <el-form-item label="" prop="gmtCreate">
@@ -287,7 +296,7 @@
         </el-form-item>
         <el-form-item label="" prop="adminId">
           <el-input v-model="form.adminId" placeholder="请输入" />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -360,6 +369,51 @@ export default {
     this.getList()
   },
   methods: {
+    getSummaries(param) {
+      const {
+        columns,
+        data
+      } = param
+      const sums = []
+      var _number = [5, 6, 7, 9, 11, 13, 16]
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+        } else if (index === _number[0] || index === _number[1] || index === _number[2] || index === _number[
+          3] || index === _number[4]|| index === _number[5]|| index === _number[6]) {
+          const values = data.map((item) => Number(item[column.property]))
+          if (!values.every((value) => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] = sums[index].toFixed(0)
+          } else {
+            // sums[index] = '元'
+          }
+        } else {
+          sums[index] = '--'
+        }
+      })
+
+      // sums[6]=sums[6].toFixed(2)
+      // sums[sums.length-2]=sums[sums.length-2].toFixed(2)
+      return sums
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.queryParams.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.queryParams.pageNum = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
     /** 查询info列表 */
     getList() {
       this.loading = true
@@ -436,7 +490,7 @@ export default {
       getInfo(id).then(response => {
         this.form = response.data.data
         this.open = true
-        this.title = '修改info'
+        this.title = '修改信息'
       })
     },
     /** 提交按钮 */
@@ -481,10 +535,16 @@ export default {
         this.msgSuccess('删除成功')
       }).catch(function() {})
     },
+    /** 打印 */
+    handlePrint(row) {
+      getInfo(row.id).then(response => {
+        window.open('../../../../../static/print.html?data='+ JSON.stringify(response.data.data).replace(/%/g, 'baifenhao'))
+      })
+    },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams
-      this.$confirm('是否确认导出所有info数据项?', '警告', {
+      this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

+ 307 - 0
unimall-admin/static/print.html

@@ -0,0 +1,307 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
+    <title></title>
+    <style>
+        table,
+        table tr th,
+        table tr td {
+            border: 2px solid #333333;
+            padding: 5px 0;
+            height: 37px;
+        }
+        
+        body {
+            margin: 0;
+        }
+        
+        #app {
+            /* height: 98vh;
+        position: relative; */
+        }
+        
+        .content {
+            width: 1000px;
+            padding: 30px 20px 20px 20px;
+            font-size: 18px;
+            height: 630px;
+            /* height: 570px; */
+            position: relative;
+        }
+        
+        .a5-content {
+            height: 130vh;
+        }
+        
+        table {
+            width: 100%;
+            text-align: center;
+            border-collapse: collapse;
+            border: 3px solid #333333;
+        }
+        
+        .col-bgc {
+            background: #f6f7fb;
+        }
+        
+        .bottom-row1 {
+            display: flex;
+            /* justify-content: space-between; */
+            margin-top: 5px 0;
+        }
+        
+        .bottom-row2 {
+            display: flex;
+        }
+        
+        img,
+        .left {
+            width: 120px;
+            height: 120px;
+            position: absolute;
+            left: 12px;
+            top: 10px;
+        }
+        
+        .config {
+            margin-top: 10px;
+            margin-right: 240px;
+        }
+        
+        .autograph {
+            margin-top: 10px;
+            margin-right: 170px;
+        }
+        
+        .bottom-row3 {
+            margin: 10px 0;
+        }
+        
+        .title {
+            text-align: center;
+            font-size: 36px;
+            font-weight: 500;
+            position: relative;
+            /* margin-top: 47px; */
+        }
+        
+        .number {
+            text-align: right;
+            margin-bottom: 10px;
+            margin-top: 30px;
+        }
+        
+        .small-row {
+            display: flex;
+        }
+        
+        .small-content {
+            width: 300px;
+            /* margin: 0 auto;
+        border: 1px solid #ccc;
+        padding: 20px 20px 160px 20px;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        margin: auto; */
+        }
+        
+        .small-title {
+            text-align: center;
+            font-size: 18px;
+            /* display: flex; */
+            justify-content: space-between;
+            align-items: center;
+        }
+        
+        .numberNo {
+            font-size: 36px;
+            margin: auto;
+        }
+        
+        .small-row {
+            display: flex;
+            justify-content: space-between;
+            margin: 10px;
+        }
+        
+        .small-img {
+            margin-right: 0;
+        }
+        
+        .sign {
+            margin-right: 100px;
+        }
+        
+        .small-code {
+            position: relative;
+            left: calc(50% - 55px)
+        }
+    </style>
+</head>
+
+<body>
+    <div id="app">
+        <div class="content"">
+            <!-- <div class="title">{{tableData.compName}}</div> -->
+            <div class="title">入库检斤单</div>
+            <div class="left">
+                <img src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/hengxinlogo.png" alt="">
+                <img src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/dongfangyulogo.png" alt="">
+            </div>
+            <div class="number">{{tableData.number}}</div>
+            <table class="table">
+                <tr class="row">
+                    <td class="col col-bgc" >客户姓名</td>
+                    <td class="col" colspan="2" >{{tableData.customer}}</td>
+                    <td class="col col-bgc" >发货单位</td>
+                    <td class="col" colspan="2" >{{tableData.customer}}</td>
+                    <td class="col col-bgc" >客户电话</td>
+                    <td class="col" >{{tableData.customerPhone}}</td>
+                    <td class="col col-bgc" >联系电话</td>
+                    <td class="col" >{{tableData.contractManagement ? tableData.contractManagement.sellerPhone : ""}}</td>
+                    <td class="col col-bgc">车牌号</td>
+                    <td class="col" colspan="2">{{tableData.carNumber}}</td>
+                </tr>
+                <tr class="row">
+                    <td class="col col-bgc">收货单位</td>
+                    <td class="col" colspan="2">{{tableData.compName}}</td>
+                    <td class="col col-bgc">联系人</td>
+                    <td class="col">{{tableData.person}}</td>
+                    <td class="col col-bgc">联系电话</td>
+                    <td class="col" colspan="2">{{tableData.personPhone}}</td>
+                </tr>
+                <tr class="row">
+                    <td class="col col-bgc">货名</td>
+                    <td class="col">{{tableData.goodsName}}</td>
+                    <td class="col col-bgc">类型</td>
+                    <td class="col">{{tableData.type}}</td>
+                    <td class="col col-bgc">容量(克/升)</td>
+                    <td class="col">
+                        {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}</td>
+                    <td class="col col-bgc">不完善粒(%)</td>
+                    <td class="col">
+                        {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.imperfectGrain:''}}</td>
+                </tr>
+                <tr class="row">
+                    <td class="col col-bgc">等级</td>
+                    <td class="col">{{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.grade:''}}
+                    </td>
+                    <td class="col col-bgc">水分(%)</td>
+                    <td class="col">
+                        {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.waterContent:''}}</td>
+                    <td class="col col-bgc">热损伤(%)</td>
+                    <td class="col">
+                        {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.jiaorenli:''}}</td>
+                    <td class="col col-bgc">质检时间</td>
+                    <td class="col">
+                        {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.qualityDate:''}}</td>
+                </tr>
+                <tr class="row">
+                    <td class="col col-bgc">杂质(%)</td>
+                    <td class="col">
+                        {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.impurity:''}}</td>
+                    <td class="col col-bgc">霉变粒(%)</td>
+                    <td class="col">
+                        {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.mildewGrain:''}}</td>
+                    <td class="col col-bgc">扣杂</td>
+                    <td class="col">
+                        {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.buckleMiscellaneous:''}}
+                    </td>
+                    <td class="col " colspan="2"></td>
+                </tr>
+                <tr class="row">
+                    <td class="col col-bgc">毛重(公斤)</td>
+                    <td class="col">{{tableData.grossWeight}}</td>
+                    <td class="col col-bgc">皮重(公斤)</td>
+                    <td class="col">{{tableData.tare}}</td>
+                    <td class="col col-bgc">扣重(公斤)</td>
+                    <td class="col">{{tableData.buckleMiscellaneous}}</td>
+                    <td class="col col-bgc">净重(公斤)</td>
+                    <td class="col">{{tableData.netWeight}}</td>
+                    <td class="col " colspan="2"></td>
+                </tr>
+                <tr class="row">
+                    <td class="col col-bgc" colspan="2">毛重检斤时间</td>
+                    <td class="col" colspan="2">{{tableData.grossDate}}</td>
+                    <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
+                    <td class="col" colspan="2">{{tableData.tareDate}}</td>
+                </tr>
+            </table>
+            <div class="bottom">
+                <div class="bottom-row1">
+                    <div>毛检:{{tableData.secretaryWeigher}}</div>
+                    <div style="margin-left:60px">皮检:{{tableData.skinInspector}}</div>
+                    <!-- <div>{{tableData.qualityDate}}</div> -->
+                </div>
+                <div class="bottom-row2">
+                    <!-- <div class="left">
+            <img :src="tableData.codeUrl" alt="">
+            </div> -->
+
+                    <div class="config" v-if="tableData.warehouseName!='白城补数据'">收货单位签名或盖章:</div>
+                    <div class="config" v-if="tableData.warehouseName=='白城补数据'">收货单位签名或盖章:黑龙江中天昊元贸易有限公司</div>
+                    <div class="autograph">客户签名:</div>
+                    <div class="autograph" v-if="tableData.warehouseName!='白城补数据'">司机签名:</div>
+                </div>
+                <!-- <div class="bottom-row3">扫一扫</div> -->
+            </div>
+        </div>
+    </div>
+</body>
+<script src="../cdn/vue/2.6.10/vue.min.js"></script>
+<script src="../cdn/element-ui/2.13.2/index.js"></script>
+<script type="text/javascript">
+    new Vue({
+        el: '#app',
+        data: {
+            tableData: {
+                // qualityInspectionManagement:{}
+            }
+        },
+        computed: {},
+        methods: {
+            tableRowClassName({
+                row,
+                rowIndex
+            }) {
+                if (rowIndex === 1) {
+                    return 'warning-row';
+                } else if (rowIndex === 3) {
+                    return 'success-row';
+                }
+                return '';
+            },
+            getQueryVariable(variable) {
+                var query = window.location.search.substring(1);
+                var vars = query.split("&");
+                for (var i = 0; i < vars.length; i++) {
+                    var pair = vars[i].split("=");
+                    if (pair[0] == variable) {
+                        return pair[1];
+                    }
+                }
+                return (false);
+            },
+            printSmall() {},
+            printBig() {},
+        },
+        mounted() {
+            this.tableData = decodeURIComponent(this.getQueryVariable("data"))
+           
+            document.title = "收款收据"
+            window.print()
+            window.onafterprint = function(event) {
+                window.history.back(-1)
+            };
+        },
+        watch: {}
+    })
+</script>
+
+</html>

+ 102 - 0
unimall-app-api/src/main/java/com/iotechn/unimall/app/api/wuye/IWuyeAmountInfoAppService.java

@@ -0,0 +1,102 @@
+package com.iotechn.unimall.app.api.wuye;
+
+
+import com.iotechn.unimall.core.annotation.HttpMethod;
+import com.iotechn.unimall.core.annotation.HttpOpenApi;
+import com.iotechn.unimall.core.annotation.HttpParam;
+import com.iotechn.unimall.core.annotation.HttpParamType;
+import com.iotechn.unimall.core.annotation.param.NotNull;
+import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.domain.wuye.WuyeAmountInfo;
+import com.iotechn.unimall.data.model.Page;
+
+import java.util.Date;
+
+/**
+ * infoService接口
+ *
+ * @author jlb
+ * @date 2022-10-12
+ */
+@HttpOpenApi(group = "wuyeAmountInfoApp", description = "info")
+public interface IWuyeAmountInfoAppService {
+    @HttpMethod(description = "新增", permission = "admin:wuye:wuyeAmountInfo:add", permissionParentName = "宠物管理", permissionName = "info管理")
+    public Boolean add(@NotNull @HttpParam(name = "wuyeAmountInfo", type = HttpParamType.COMMON, description = "info") WuyeAmountInfo wuyeAmountInfo,
+                       @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
+
+    @HttpMethod(description = "列表", permission = "admin:wuye:wuyeAmountInfo:list", permissionParentName = "宠物管理", permissionName = "info管理")
+    public Page<WuyeAmountInfo> list(
+            @HttpParam(name = "buildingNo", type = HttpParamType.COMMON, description = "楼号") String buildingNo,
+            @HttpParam(name = "unitNo", type = HttpParamType.COMMON, description = "单元号") String unitNo,
+            @HttpParam(name = "floor", type = HttpParamType.COMMON, description = "楼层") String floor,
+            @HttpParam(name = "sourceNumber", type = HttpParamType.COMMON, description = "房源号") String sourceNumber,
+            @HttpParam(name = "householder", type = HttpParamType.COMMON, description = "户主") String householder,
+            @HttpParam(name = "predictedArea", type = HttpParamType.COMMON, description = "预测面积") Double predictedArea,
+            @HttpParam(name = "actualMoney", type = HttpParamType.COMMON, description = "实际面积") Double actualMoney,
+            @HttpParam(name = "propertyFee", type = HttpParamType.COMMON, description = "一年物业费(1.6元/平)") Double propertyFee,
+            @HttpParam(name = "elevatorFee", type = HttpParamType.COMMON, description = "一年电梯费(一层30元/月,每增加一层累加3元/月)") Double elevatorFee,
+            @HttpParam(name = "parkingSpace", type = HttpParamType.COMMON, description = "一年车位管理费(单独150元/月,子母225元/月)") Double parkingSpace,
+            @HttpParam(name = "cheweiNo", type = HttpParamType.COMMON, description = "车位号") String cheweiNo,
+            @HttpParam(name = "garage", type = HttpParamType.COMMON, description = "一年车库管理费(单独150元/月,子母225元/月)") Double garage,
+            @HttpParam(name = "garageNo", type = HttpParamType.COMMON, description = "车库号") String garageNo,
+            @HttpParam(name = "warehouse", type = HttpParamType.COMMON, description = "一年仓库管理费(200元/年)") Double warehouse,
+            @HttpParam(name = "warehouseNo", type = HttpParamType.COMMON, description = "仓库号") String warehouseNo,
+            @HttpParam(name = "garbageClearing", type = HttpParamType.COMMON, description = "垃圾清运费(平层建筑面积3元/平,带地下及阁楼5元/平)") Double garbageClearing,
+            @HttpParam(name = "paymentDate", type = HttpParamType.COMMON, description = "缴费日期") Date paymentDate,
+            @HttpParam(name = "paymentMethod", type = HttpParamType.COMMON, description = "缴费方式") String paymentMethod,
+            @HttpParam(name = "totalActualPayment", type = HttpParamType.COMMON, description = "实际缴费总合计") Double totalActualPayment,
+            @HttpParam(name = "paymentRange", type = HttpParamType.COMMON, description = "缴费区间") String paymentRange,
+            @HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Long deleteFlag,
+            @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+            @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+            @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+            @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
+            @HttpParam(name = "pageNum", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+            @HttpParam(name = "pageSize", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
+            throws ServiceException;
+
+    @HttpMethod(description = "删除", permission = "admin:wuye:wuyeAmountInfo:delete", permissionParentName = "宠物管理", permissionName = "info管理")
+    public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") Long id) throws ServiceException;
+
+    @HttpMethod(description = "修改")
+    public Boolean update(@NotNull @HttpParam(name = "wuyeAmountInfo", type = HttpParamType.COMMON, description = "info") WuyeAmountInfo wuyeAmountInfo,
+                          @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
+
+    @HttpMethod(description = "查询", permission = "admin:wuye:wuyeAmountInfo:get", permissionParentName = "宠物管理", permissionName = "info管理")
+    public WuyeAmountInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") Long id) throws ServiceException;
+
+    @HttpMethod(description = "查询")
+    public WuyeAmountInfo getInfo(@NotNull @HttpParam(name = "wuyeAmountInfo", type = HttpParamType.COMMON, description = "info") WuyeAmountInfo wuyeAmountInfo
+    ) throws ServiceException;
+
+    @HttpMethod(description = "导出excl表", permission = "admin:wuye:wuyeAmountInfo:export", permissionParentName = "宠物管理", permissionName = "info管理")
+    public String export(
+            @HttpParam(name = "buildingNo", type = HttpParamType.COMMON, description = "楼号") String buildingNo,
+            @HttpParam(name = "unitNo", type = HttpParamType.COMMON, description = "单元号") String unitNo,
+            @HttpParam(name = "floor", type = HttpParamType.COMMON, description = "楼层") String floor,
+            @HttpParam(name = "sourceNumber", type = HttpParamType.COMMON, description = "房源号") String sourceNumber,
+            @HttpParam(name = "householder", type = HttpParamType.COMMON, description = "户主") String householder,
+            @HttpParam(name = "predictedArea", type = HttpParamType.COMMON, description = "预测面积") Double predictedArea,
+            @HttpParam(name = "actualMoney", type = HttpParamType.COMMON, description = "实际面积") Double actualMoney,
+            @HttpParam(name = "propertyFee", type = HttpParamType.COMMON, description = "一年物业费(1.6元/平)") Double propertyFee,
+            @HttpParam(name = "elevatorFee", type = HttpParamType.COMMON, description = "一年电梯费(一层30元/月,每增加一层累加3元/月)") Double elevatorFee,
+            @HttpParam(name = "parkingSpace", type = HttpParamType.COMMON, description = "一年车位管理费(单独150元/月,子母225元/月)") Double parkingSpace,
+            @HttpParam(name = "cheweiNo", type = HttpParamType.COMMON, description = "车位号") String cheweiNo,
+            @HttpParam(name = "garage", type = HttpParamType.COMMON, description = "一年车库管理费(单独150元/月,子母225元/月)") Double garage,
+            @HttpParam(name = "garageNo", type = HttpParamType.COMMON, description = "车库号") String garageNo,
+            @HttpParam(name = "warehouse", type = HttpParamType.COMMON, description = "一年仓库管理费(200元/年)") Double warehouse,
+            @HttpParam(name = "warehouseNo", type = HttpParamType.COMMON, description = "仓库号") String warehouseNo,
+            @HttpParam(name = "garbageClearing", type = HttpParamType.COMMON, description = "垃圾清运费(平层建筑面积3元/平,带地下及阁楼5元/平)") Double garbageClearing,
+            @HttpParam(name = "paymentDate", type = HttpParamType.COMMON, description = "缴费日期") Date paymentDate,
+            @HttpParam(name = "paymentMethod", type = HttpParamType.COMMON, description = "缴费方式") String paymentMethod,
+            @HttpParam(name = "totalActualPayment", type = HttpParamType.COMMON, description = "实际缴费总合计") Double totalActualPayment,
+            @HttpParam(name = "paymentRange", type = HttpParamType.COMMON, description = "缴费区间") String paymentRange,
+            @HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Long deleteFlag,
+            @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+            @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+            @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+            @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
+            @HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+            @HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit) throws ServiceException;
+
+}

+ 237 - 0
unimall-app-api/src/main/java/com/iotechn/unimall/app/api/wuye/WuyeAmountInfoServiceAppImpl.java

@@ -0,0 +1,237 @@
+package com.iotechn.unimall.app.api.wuye;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.domain.wuye.WuyeAmountInfo;
+import com.iotechn.unimall.data.mapper.wuye.WuyeAmountInfoMapper;
+import com.iotechn.unimall.data.model.Page;
+import com.iotechn.unimall.data.util.ExcelUtil;
+import org.apache.ibatis.session.RowBounds;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * infoService业务层处理
+ *
+ * @author jlb
+ * @date 2022-10-12
+ */
+@Service
+public class WuyeAmountInfoServiceAppImpl implements IWuyeAmountInfoAppService {
+    @Autowired
+    private WuyeAmountInfoMapper wuyeAmountInfoMapper;
+
+    @Override
+    public Boolean add(WuyeAmountInfo wuyeAmountInfo, Long adminId) throws ServiceException {
+        Date now = new Date();
+        wuyeAmountInfo.setGmtCreate(now);
+        wuyeAmountInfo.setGmtUpdate(now);
+        wuyeAmountInfo.setAdminId(adminId);
+        return wuyeAmountInfoMapper.insert(wuyeAmountInfo) > 0;
+    }
+
+    @Override
+    public Page<WuyeAmountInfo> list(String buildingNo, String unitNo, String floor, String sourceNumber, String householder, Double predictedArea, Double actualMoney, Double propertyFee, Double elevatorFee, Double parkingSpace, String cheweiNo, Double garage, String garageNo, Double warehouse, String warehouseNo, Double garbageClearing, Date paymentDate, String paymentMethod, Double totalActualPayment, String paymentRange, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<WuyeAmountInfo> wrapper = new EntityWrapper<WuyeAmountInfo>();
+        if (!StringUtils.isEmpty(buildingNo)) {
+            wrapper.eq("building_no", buildingNo);
+        }
+        if (!StringUtils.isEmpty(unitNo)) {
+            wrapper.eq("unit_no", unitNo);
+        }
+        if (!StringUtils.isEmpty(floor)) {
+            wrapper.eq("floor", floor);
+        }
+        if (!StringUtils.isEmpty(sourceNumber)) {
+            wrapper.eq("source_number", sourceNumber);
+        }
+        if (!StringUtils.isEmpty(householder)) {
+            wrapper.eq("householder", householder);
+        }
+        if (!StringUtils.isEmpty(predictedArea)) {
+            wrapper.eq("predicted_area", predictedArea);
+        }
+        if (!StringUtils.isEmpty(actualMoney)) {
+            wrapper.eq("actual_money", actualMoney);
+        }
+        if (!StringUtils.isEmpty(propertyFee)) {
+            wrapper.eq("property_fee", propertyFee);
+        }
+        if (!StringUtils.isEmpty(elevatorFee)) {
+            wrapper.eq("elevator_fee", elevatorFee);
+        }
+        if (!StringUtils.isEmpty(parkingSpace)) {
+            wrapper.eq("parking_space", parkingSpace);
+        }
+        if (!StringUtils.isEmpty(cheweiNo)) {
+            wrapper.eq("chewei_no", cheweiNo);
+        }
+        if (!StringUtils.isEmpty(garage)) {
+            wrapper.eq("garage", garage);
+        }
+        if (!StringUtils.isEmpty(garageNo)) {
+            wrapper.eq("garage_no", garageNo);
+        }
+        if (!StringUtils.isEmpty(warehouse)) {
+            wrapper.eq("warehouse", warehouse);
+        }
+        if (!StringUtils.isEmpty(warehouseNo)) {
+            wrapper.eq("warehouse_no", warehouseNo);
+        }
+        if (!StringUtils.isEmpty(garbageClearing)) {
+            wrapper.eq("garbage_clearing", garbageClearing);
+        }
+        if (!StringUtils.isEmpty(paymentDate)) {
+            wrapper.eq("payment_date", paymentDate);
+        }
+        if (!StringUtils.isEmpty(paymentMethod)) {
+            wrapper.eq("payment_method", paymentMethod);
+        }
+        if (!StringUtils.isEmpty(totalActualPayment)) {
+            wrapper.eq("total_actual_payment", totalActualPayment);
+        }
+        if (!StringUtils.isEmpty(paymentRange)) {
+            wrapper.eq("payment_range", paymentRange);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(userId)) {
+            wrapper.eq("user_id", userId);
+        }
+        if (!StringUtils.isEmpty(adminId)) {
+            wrapper.eq("admin_id", adminId);
+        }
+        wrapper.eq("delete_flag", 0);
+        List<WuyeAmountInfo> list = wuyeAmountInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        Integer count = wuyeAmountInfoMapper.selectCount(wrapper);
+        return new Page<WuyeAmountInfo>(list, page, limit, count);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(Long id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            WuyeAmountInfo tmp = wuyeAmountInfoMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1L);
+                wuyeAmountInfoMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public Boolean update(WuyeAmountInfo wuyeAmountInfo, Long adminId) throws ServiceException {
+        Date now = new Date();
+        wuyeAmountInfo.setGmtUpdate(now);
+        wuyeAmountInfo.setAdminId(adminId);
+        return wuyeAmountInfoMapper.updateById(wuyeAmountInfo) > 0;
+    }
+
+    @Override
+    public WuyeAmountInfo get(Long id) throws ServiceException {
+        return wuyeAmountInfoMapper.selectById(id);
+    }
+
+	@Override
+	public WuyeAmountInfo getInfo(WuyeAmountInfo wuyeAmountInfo) throws ServiceException {
+		return wuyeAmountInfoMapper.selectOne(wuyeAmountInfo);
+	}
+
+    @Override
+    public String export(String buildingNo, String unitNo, String floor, String sourceNumber, String householder, Double predictedArea, Double actualMoney, Double propertyFee, Double elevatorFee, Double parkingSpace, String cheweiNo, Double garage, String garageNo, Double warehouse, String warehouseNo, Double garbageClearing, Date paymentDate, String paymentMethod, Double totalActualPayment, String paymentRange, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<WuyeAmountInfo> wrapper = new EntityWrapper<WuyeAmountInfo>();
+        if (!StringUtils.isEmpty(buildingNo)) {
+            wrapper.eq("building_no", buildingNo);
+        }
+        if (!StringUtils.isEmpty(unitNo)) {
+            wrapper.eq("unit_no", unitNo);
+        }
+        if (!StringUtils.isEmpty(floor)) {
+            wrapper.eq("floor", floor);
+        }
+        if (!StringUtils.isEmpty(sourceNumber)) {
+            wrapper.eq("source_number", sourceNumber);
+        }
+        if (!StringUtils.isEmpty(householder)) {
+            wrapper.eq("householder", householder);
+        }
+        if (!StringUtils.isEmpty(predictedArea)) {
+            wrapper.eq("predicted_area", predictedArea);
+        }
+        if (!StringUtils.isEmpty(actualMoney)) {
+            wrapper.eq("actual_money", actualMoney);
+        }
+        if (!StringUtils.isEmpty(propertyFee)) {
+            wrapper.eq("property_fee", propertyFee);
+        }
+        if (!StringUtils.isEmpty(elevatorFee)) {
+            wrapper.eq("elevator_fee", elevatorFee);
+        }
+        if (!StringUtils.isEmpty(parkingSpace)) {
+            wrapper.eq("parking_space", parkingSpace);
+        }
+        if (!StringUtils.isEmpty(cheweiNo)) {
+            wrapper.eq("chewei_no", cheweiNo);
+        }
+        if (!StringUtils.isEmpty(garage)) {
+            wrapper.eq("garage", garage);
+        }
+        if (!StringUtils.isEmpty(garageNo)) {
+            wrapper.eq("garage_no", garageNo);
+        }
+        if (!StringUtils.isEmpty(warehouse)) {
+            wrapper.eq("warehouse", warehouse);
+        }
+        if (!StringUtils.isEmpty(warehouseNo)) {
+            wrapper.eq("warehouse_no", warehouseNo);
+        }
+        if (!StringUtils.isEmpty(garbageClearing)) {
+            wrapper.eq("garbage_clearing", garbageClearing);
+        }
+        if (!StringUtils.isEmpty(paymentDate)) {
+            wrapper.eq("payment_date", paymentDate);
+        }
+        if (!StringUtils.isEmpty(paymentMethod)) {
+            wrapper.eq("payment_method", paymentMethod);
+        }
+        if (!StringUtils.isEmpty(totalActualPayment)) {
+            wrapper.eq("total_actual_payment", totalActualPayment);
+        }
+        if (!StringUtils.isEmpty(paymentRange)) {
+            wrapper.eq("payment_range", paymentRange);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(userId)) {
+            wrapper.eq("user_id", userId);
+        }
+        if (!StringUtils.isEmpty(adminId)) {
+            wrapper.eq("admin_id", adminId);
+        }
+        List<WuyeAmountInfo> list = wuyeAmountInfoMapper.selectList(wrapper);
+        ExcelUtil<WuyeAmountInfo> util = new ExcelUtil<WuyeAmountInfo>(WuyeAmountInfo.class);
+        return util.exportExcel(list, "操作日志");
+    }
+}