加入费用项变更记录

java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java

@@ -86,6 +86,11 @@ public class FeeConfigDto extends PageDto implements Serializable {
     private String decimalPlace;
     private String units;
 
+    private String bId;
+    private String operate;
+
+    private String userName;
+
 
     public String getFeeTypeCd() {
         return feeTypeCd;
@@ -336,4 +341,28 @@ public class FeeConfigDto extends PageDto implements Serializable {
     public void setUnits(String units) {
         this.units = units;
     }
+
+    public String getbId() {
+        return bId;
+    }
+
+    public void setbId(String bId) {
+        this.bId = bId;
+    }
+
+    public String getOperate() {
+        return operate;
+    }
+
+    public void setOperate(String operate) {
+        this.operate = operate;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
 }

java110-interface/src/main/java/com/java110/intf/report/IReportCommunityInnerServiceSMO.java

@@ -1,6 +1,7 @@
 package com.java110.intf.report;
 
 import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.room.RoomDto;
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.owner.OwnerCarDto;
@@ -85,7 +86,7 @@ public interface IReportCommunityInnerServiceSMO {
      * @return
      */
     @RequestMapping(value = "/queryHisFeeConfigCount", method = RequestMethod.POST)
-    int queryHisFeeConfigCount(@RequestBody FeeDto feeDto);
+    int queryHisFeeConfigCount(@RequestBody FeeConfigDto feeDto);
 
     /**
      * 查询费用项
@@ -93,5 +94,5 @@ public interface IReportCommunityInnerServiceSMO {
      * @return
      */
     @RequestMapping(value = "/queryHisFeeConfigs", method = RequestMethod.POST)
-    List<FeeDto> queryHisFeeConfigs(@RequestBody FeeDto feeDto);
+    List<FeeConfigDto> queryHisFeeConfigs(@RequestBody FeeConfigDto feeDto);
 }

service-report/src/main/java/com/java110/report/cmd/fee/QueryHisFeeConfigCmd.java

@@ -5,6 +5,7 @@ import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.fee.FeeDto;
 import com.java110.intf.report.IReportCommunityInnerServiceSMO;
 import com.java110.utils.exception.CmdException;
@@ -39,18 +40,18 @@ public class QueryHisFeeConfigCmd extends Cmd{
 
 
         int row = reqJson.getInteger("row");
-        FeeDto feeDto = BeanConvertUtil.covertBean(reqJson, FeeDto.class);
+        FeeConfigDto feeDto = BeanConvertUtil.covertBean(reqJson, FeeConfigDto.class);
 
         int total = reportCommunityInnerServiceSMOImpl.queryHisFeeConfigCount(feeDto);
 //        int count = 0;
-        List<FeeDto> feeDtos = null;
+        List<FeeConfigDto> feeConfigDtos = null;
         if (total > 0) {
-            feeDtos = reportCommunityInnerServiceSMOImpl.queryHisFeeConfigs(feeDto);
+            feeConfigDtos = reportCommunityInnerServiceSMOImpl.queryHisFeeConfigs(feeDto);
         } else {
-            feeDtos = new ArrayList<>();
+            feeConfigDtos = new ArrayList<>();
         }
 
-        ResponseEntity<String> responseEntity = ResultVo.createResponseEntity((int) Math.ceil((double) total / (double) row), total, feeDtos);
+        ResponseEntity<String> responseEntity = ResultVo.createResponseEntity((int) Math.ceil((double) total / (double) row), total, feeConfigDtos);
         context.setResponseEntity(responseEntity);
     }
 }

service-report/src/main/java/com/java110/report/smo/impl/ReportCommunityInnerServiceSMOImpl.java

@@ -3,6 +3,7 @@ package com.java110.report.smo.impl;
 
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
+import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.room.RoomDto;
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.owner.OwnerAttrDto;
@@ -141,21 +142,21 @@ public class ReportCommunityInnerServiceSMOImpl extends BaseServiceSMO implement
     }
 
     @Override
-    public int queryHisFeeConfigCount(@RequestBody FeeDto feeDto) {
+    public int queryHisFeeConfigCount(@RequestBody FeeConfigDto feeDto) {
         return reportCommunityServiceDaoImpl.queryHisFeeConfigCount(BeanConvertUtil.beanCovertMap(feeDto));
     }
 
     @Override
-    public List<FeeDto> queryHisFeeConfigs(@RequestBody FeeDto feeDto) {
+    public List<FeeConfigDto> queryHisFeeConfigs(@RequestBody FeeConfigDto feeDto) {
         int page = feeDto.getPage();
 
         if (page != PageDto.DEFAULT_PAGE) {
             feeDto.setPage((page - 1) * feeDto.getRow());
         }
 
-        List<FeeDto> feeDtos = BeanConvertUtil.covertBeanList(
+        List<FeeConfigDto> feeDtos = BeanConvertUtil.covertBeanList(
                 reportCommunityServiceDaoImpl.queryHisFeeConfigs(BeanConvertUtil.beanCovertMap(feeDto)),
-                FeeDto.class);
+                FeeConfigDto.class);
 
         return feeDtos;
     }