FrontService/src/main/java/com/java110/front/components/fee/FeeSummaryComponent.java
File was renamed from ReportComponent/src/main/java/com/java110/report/components/fee/FeeSummaryComponent.java @@ -1,10 +1,8 @@ package com.java110.report.components.fee; package com.java110.front.components.fee; import com.java110.core.context.IPageData; import com.java110.report.smo.fee.IListFeeSummarySMO; import com.java110.report.smo.fee.IListPayFeeSMO; import com.java110.report.smo.feeType.IFeeTypeSMO; import com.java110.front.smo.fee.IListFeeSummarySMO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; FrontService/src/main/java/com/java110/front/components/fee/PayFeeManageComponent.java
File was renamed from ReportComponent/src/main/java/com/java110/report/components/fee/PayFeeManageComponent.java @@ -1,9 +1,9 @@ package com.java110.report.components.fee; package com.java110.front.components.fee; import com.java110.core.context.IPageData; import com.java110.report.smo.fee.IListPayFeeSMO; import com.java110.report.smo.feeType.IFeeTypeSMO; import com.java110.front.smo.fee.IListPayFeeSMO; import com.java110.front.smo.feeType.IFeeTypeSMO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; @@ -27,10 +27,11 @@ /** * 查询费用类型 * * @param pd * @return */ public ResponseEntity<String> listFeeType(IPageData pd){ public ResponseEntity<String> listFeeType(IPageData pd) { return feeTypeSMOImpl.list(pd); }
File was renamed from ReportComponent/src/main/java/com/java110/report/components/fee/StaffFeeManageComponent.java @@ -1,10 +1,8 @@ package com.java110.report.components.fee; package com.java110.front.components.fee; import com.java110.core.context.IPageData; import com.java110.report.smo.fee.IListPayFeeSMO; import com.java110.report.smo.fee.IListStaffFeeSMO; import com.java110.report.smo.feeType.IFeeTypeSMO; import com.java110.front.smo.fee.IListStaffFeeSMO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; FrontService/src/main/java/com/java110/front/components/fee/TempCarInoutFeeManageComponent.java
File was renamed from ReportComponent/src/main/java/com/java110/report/components/fee/TempCarInoutFeeManageComponent.java @@ -1,10 +1,9 @@ package com.java110.report.components.fee; package com.java110.front.components.fee; import com.java110.core.context.IPageData; import com.java110.report.smo.fee.IListPayFeeSMO; import com.java110.report.smo.fee.IListTempCarInoutFeeSMO; import com.java110.report.smo.feeType.IFeeTypeSMO; import com.java110.front.smo.fee.IListTempCarInoutFeeSMO; import com.java110.front.smo.feeType.IFeeTypeSMO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; @@ -28,10 +27,11 @@ /** * 查询费用类型 * * @param pd * @return */ public ResponseEntity<String> listFeeType(IPageData pd){ public ResponseEntity<String> listFeeType(IPageData pd) { return feeTypeSMOImpl.list(pd); }
File was renamed from ReportComponent/src/main/java/com/java110/report/smo/fee/IListFeeSummarySMO.java @@ -1,4 +1,4 @@ package com.java110.report.smo.fee; package com.java110.front.smo.fee; import com.java110.core.context.IPageData; import org.springframework.http.ResponseEntity; FrontService/src/main/java/com/java110/front/smo/fee/IListPayFeeSMO.java
File was renamed from ReportComponent/src/main/java/com/java110/report/smo/fee/IListPayFeeSMO.java @@ -1,4 +1,4 @@ package com.java110.report.smo.fee; package com.java110.front.smo.fee; import com.java110.core.context.IPageData; import org.springframework.http.ResponseEntity; FrontService/src/main/java/com/java110/front/smo/fee/IListStaffFeeSMO.java
File was renamed from ReportComponent/src/main/java/com/java110/report/smo/fee/IListStaffFeeSMO.java @@ -1,4 +1,4 @@ package com.java110.report.smo.fee; package com.java110.front.smo.fee; import com.java110.core.context.IPageData; import org.springframework.http.ResponseEntity; FrontService/src/main/java/com/java110/front/smo/fee/IListTempCarInoutFeeSMO.java
File was renamed from ReportComponent/src/main/java/com/java110/report/smo/fee/IListTempCarInoutFeeSMO.java @@ -1,4 +1,4 @@ package com.java110.report.smo.fee; package com.java110.front.smo.fee; import com.java110.core.context.IPageData; import org.springframework.http.ResponseEntity; FrontService/src/main/java/com/java110/front/smo/fee/impl/ListFeeSummarySMOImpl.java
File was renamed from ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListFeeSummarySMOImpl.java @@ -1,11 +1,10 @@ package com.java110.report.smo.fee.impl; package com.java110.front.smo.fee.impl; import com.alibaba.fastjson.JSONObject; import com.java110.core.component.AbstractComponentSMO; import com.java110.core.context.IPageData; import com.java110.entity.component.ComponentValidateResult; import com.java110.report.smo.fee.IListFeeSummarySMO; import com.java110.utils.constant.PrivilegeCodeConstant; import com.java110.front.smo.fee.IListFeeSummarySMO; import com.java110.utils.constant.ServiceConstant; import com.java110.utils.exception.SMOException; import com.java110.utils.util.Assert; @@ -47,12 +46,12 @@ paramIn.put("page", (page - 1) * row); paramIn.put("row", page * row); if("1001".equals(paramIn.getString("feeSummaryType"))){//日 paramIn.put("formatStr","%Y-%m-%d"); }else if("1101".equals(paramIn.getString("feeSummaryType"))){ paramIn.put("formatStr","%Y-%m"); }else{ paramIn.put("formatStr","%Y"); if ("1001".equals(paramIn.getString("feeSummaryType"))) {//日 paramIn.put("formatStr", "%Y-%m-%d"); } else if ("1101".equals(paramIn.getString("feeSummaryType"))) { paramIn.put("formatStr", "%Y-%m"); } else { paramIn.put("formatStr", "%Y"); } String apiUrl = ""; FrontService/src/main/java/com/java110/front/smo/fee/impl/ListPayFeeSMOImpl.java
File was renamed from ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListPayFeeSMOImpl.java @@ -1,23 +1,19 @@ package com.java110.report.smo.fee.impl; package com.java110.front.smo.fee.impl; import com.alibaba.fastjson.JSONObject; import com.java110.core.component.AbstractComponentSMO; import com.java110.core.context.IPageData; import com.java110.entity.component.ComponentValidateResult; import com.java110.report.smo.fee.IListPayFeeSMO; import com.java110.utils.constant.FeeTypeConstant; import com.java110.front.smo.fee.IListPayFeeSMO; import com.java110.utils.constant.PrivilegeCodeConstant; import com.java110.utils.constant.ServiceConstant; import com.java110.utils.exception.SMOException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; import java.util.Map; /** * 查询app服务类 @@ -59,7 +55,7 @@ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getPropertyPayFee" + mapToUrlParam(paramIn); } else if ("6666".equals(paramIn.getString("payObjType"))) { apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getParkingSpacePayFee" + mapToUrlParam(paramIn); }else{ } else { apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getParkingSpacePayFee" + mapToUrlParam(paramIn); }
File was renamed from ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListStaffFeeSMOImpl.java @@ -1,11 +1,10 @@ package com.java110.report.smo.fee.impl; package com.java110.front.smo.fee.impl; import com.alibaba.fastjson.JSONObject; import com.java110.core.component.AbstractComponentSMO; import com.java110.core.context.IPageData; import com.java110.entity.component.ComponentValidateResult; import com.java110.report.smo.fee.IListStaffFeeSMO; import com.java110.utils.constant.FeeTypeConstant; import com.java110.front.smo.fee.IListStaffFeeSMO; import com.java110.utils.constant.PrivilegeCodeConstant; import com.java110.utils.constant.ServiceConstant; import com.java110.utils.exception.SMOException; FrontService/src/main/java/com/java110/front/smo/fee/impl/ListTempCarInoutFeeSMOImpl.java
File was renamed from ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListTempCarInoutFeeSMOImpl.java @@ -1,13 +1,10 @@ package com.java110.report.smo.fee.impl; package com.java110.front.smo.fee.impl; import com.alibaba.fastjson.JSONObject; import com.java110.core.component.AbstractComponentSMO; import com.java110.core.context.IPageData; import com.java110.entity.component.ComponentValidateResult; import com.java110.report.smo.fee.IListPayFeeSMO; import com.java110.report.smo.fee.IListTempCarInoutFeeSMO; import com.java110.utils.constant.FeeTypeConstant; import com.java110.utils.constant.PrivilegeCodeConstant; import com.java110.front.smo.fee.IListTempCarInoutFeeSMO; import com.java110.utils.constant.ServiceConstant; import com.java110.utils.exception.SMOException; import com.java110.utils.util.Assert; FrontService/src/main/java/com/java110/front/smo/feeType/IFeeTypeSMO.java
File was renamed from ReportComponent/src/main/java/com/java110/report/smo/feeType/IFeeTypeSMO.java @@ -1,4 +1,4 @@ package com.java110.report.smo.feeType; package com.java110.front.smo.feeType; import com.java110.core.context.IPageData; import org.springframework.http.ResponseEntity; FrontService/src/main/java/com/java110/front/smo/feeType/impl/FeeTypeSMOImpl.java
File was renamed from ReportComponent/src/main/java/com/java110/report/smo/feeType/impl/FeeTypeSMOImpl.java @@ -1,11 +1,10 @@ package com.java110.report.smo.feeType.impl; package com.java110.front.smo.feeType.impl; import com.alibaba.fastjson.JSONObject; import com.java110.core.component.BaseComponentSMO; import com.java110.core.context.IPageData; import com.java110.report.smo.feeType.IFeeTypeSMO; import com.java110.front.smo.feeType.IFeeTypeSMO; import com.java110.utils.constant.ServiceConstant; import com.java110.utils.util.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -30,7 +29,6 @@ private RestTemplate restTemplate; @Override public ResponseEntity<String> list(IPageData pd) { validate(pd); @@ -39,8 +37,8 @@ reqParam.put("name", "pay_fee"); reqParam.put("type", "fee_type_cd"); //拉取数据 String url=ServiceConstant.SERVICE_API_URL.concat("/api/dict.queryDict").concat(mapToUrlParam(reqParam)); ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "",url , HttpMethod.GET); String url = ServiceConstant.SERVICE_API_URL.concat("/api/dict.queryDict").concat(mapToUrlParam(reqParam)); ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "", url, HttpMethod.GET); return responseEntity; }
File was deleted ReportComponent/src/main/resources/components/feePackage/fee-manage/payFeeManage.html
File was deleted ReportComponent/src/main/resources/components/feePackage/fee-manage/payFeeManage.js
File was deleted ReportComponent/src/main/resources/components/feePackage/feeSummary/feeSummary.html
File was deleted ReportComponent/src/main/resources/components/feePackage/feeSummary/feeSummary.js
File was deleted ReportComponent/src/main/resources/components/feePackage/staffFeeManage/staffFeeManage.html
File was deleted ReportComponent/src/main/resources/components/feePackage/staffFeeManage/staffFeeManage.js
File was deleted ReportComponent/src/main/resources/components/feePackage/tempCarInoutfee-manage/tempCarInoutFeeManage.html
File was deleted ReportComponent/src/main/resources/components/feePackage/tempCarInoutfee-manage/tempCarInoutFeeManage.js
File was deleted ReportComponent/src/main/resources/views/feeSummaryFlow.html
File was deleted ReportComponent/src/main/resources/views/payFeeFlow.html
File was deleted ReportComponent/src/main/resources/views/staffFeeFlow.html
File was deleted ReportComponent/src/main/resources/views/tempCarInoutFeeFlow.html
File was deleted pom.xml
@@ -35,7 +35,6 @@ <module>JobService</module> <module>CommonService</module> <module>ReportService</module> <module>ReportComponent</module> <module>HardwareAdapationService</module> <module>FrontService</module> </modules>
