Merge branch 'back' of https://github.com/java110/MicroCommunity into back

Api/src/main/java/com/java110/api/bmo/ApiBaseBMO.java

@@ -51,6 +51,7 @@ public class ApiBaseBMO implements IApiBaseBMO{
      * @return
      */
     public ResponseEntity<String> callService(DataFlowContext context, String serviceCode,JSONArray businesses) {
+        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
         JSONObject paramInObj = restToCenterProtocol(businesses, context.getRequestCurrentHeaders());
         return callService(context,serviceCode,paramInObj);
     }
@@ -66,6 +67,7 @@ public class ApiBaseBMO implements IApiBaseBMO{
 
         //将 rest header 信息传递到下层服务中去
         HttpHeaders header = new HttpHeaders();
+
         freshHttpHeader(header, context.getRequestCurrentHeaders());
 
         ResponseEntity responseEntity = null;

Api/src/main/java/com/java110/api/bmo/room/IRoomBMO.java

@@ -1,6 +1,10 @@
 package com.java110.api.bmo.room;
 
+import com.alibaba.fastjson.JSONObject;
 import com.java110.api.bmo.IApiBaseBMO;
+import com.java110.core.context.DataFlowContext;
+import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.constant.CommonConstant;
 
 /**
  * @ClassName IRoomBMO
@@ -11,4 +15,13 @@ import com.java110.api.bmo.IApiBaseBMO;
  * add by wuxw 2020/3/9
  **/
 public interface IRoomBMO extends IApiBaseBMO {
+
+    /**
+     *  修改房屋
+     *
+     * @param paramInJson     接口调用放传入入参
+     * @param dataFlowContext 数据上下文
+     * @return 订单服务能够接受的报文
+     */
+     JSONObject updateRoom(JSONObject paramInJson, DataFlowContext dataFlowContext);
 }

Api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java

@@ -1,9 +1,20 @@
 package com.java110.api.bmo.room.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.room.IRoomBMO;
+import com.java110.core.context.DataFlowContext;
+import com.java110.core.smo.room.IRoomInnerServiceSMO;
+import com.java110.dto.RoomDto;
+import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @ClassName RoomBMOImpl
  * @Description TODO
@@ -15,4 +26,36 @@ import org.springframework.stereotype.Service;
 
 @Service("roomBMOImpl")
 public class RoomBMOImpl extends ApiBaseBMO implements IRoomBMO {
+
+    @Autowired
+    private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
+    /**
+     * 修改房屋
+     *
+     * @param paramInJson     接口调用放传入入参
+     * @param dataFlowContext 数据上下文
+     * @return 订单服务能够接受的报文
+     */
+    public JSONObject updateRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
+        RoomDto roomDto = new RoomDto();
+        roomDto.setCommunityId(paramInJson.getString("communityId"));
+        roomDto.setRoomId(paramInJson.getString("roomId"));
+        List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+
+        Assert.listOnlyOne(roomDtos, "存在" + roomDtos.size() + "条房屋信息");
+
+        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_ROOM_INFO);
+        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
+        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+        JSONObject businessUnit = new JSONObject();
+        businessUnit.putAll(BeanConvertUtil.beanCovertMap(roomDtos.get(0)));
+        businessUnit.putAll(paramInJson);
+        businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
+        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessRoom", businessUnit);
+
+        return business;
+    }
 }

Api/src/main/java/com/java110/api/listener/inspectionPoint/ListInspectionPointsListener.java

@@ -78,6 +78,53 @@ public class ListInspectionPointsListener extends AbstractServiceApiListener {
     @Override
     protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
 
+        if(reqJson.containsKey("relationship")){
+            queryRelationship(event,context,reqJson);
+        }else{
+            queryCommon(event,context,reqJson);
+        }
+
+    }
+
+    /**
+     * 关系查询
+     * @param event
+     * @param context
+     * @param reqJson
+     */
+    private void queryRelationship(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+        InspectionDto inspectionPointDto = BeanConvertUtil.covertBean(reqJson, InspectionDto.class);
+
+        int count = inspectionPointInnerServiceSMOImpl.queryInspectionsRelationShipCount(inspectionPointDto);
+
+        List<ApiInspectionPointDataVo> inspectionPoints = null;
+
+        if (count > 0) {
+            inspectionPoints = BeanConvertUtil.covertBeanList(inspectionPointInnerServiceSMOImpl.getInspectionRelationShip(inspectionPointDto), ApiInspectionPointDataVo.class);
+            // 刷新 位置信息
+            refreshMachines(inspectionPoints);
+        } else {
+            inspectionPoints = new ArrayList<>();
+        }
+
+        ApiInspectionPointVo apiInspectionPointVo = new ApiInspectionPointVo();
+
+        apiInspectionPointVo.setTotal(count);
+        apiInspectionPointVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
+        apiInspectionPointVo.setInspectionPoints(inspectionPoints);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiInspectionPointVo), HttpStatus.OK);
+
+        context.setResponseEntity(responseEntity);
+    }
+
+    /**
+     * 普通查询
+     * @param event
+     * @param context
+     * @param reqJson
+     */
+    private void queryCommon(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
         InspectionDto inspectionPointDto = BeanConvertUtil.covertBean(reqJson, InspectionDto.class);
 
         int count = inspectionPointInnerServiceSMOImpl.queryInspectionsCount(inspectionPointDto);
@@ -101,7 +148,6 @@ public class ListInspectionPointsListener extends AbstractServiceApiListener {
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiInspectionPointVo), HttpStatus.OK);
 
         context.setResponseEntity(responseEntity);
-
     }
 
 
@@ -187,7 +233,6 @@ public class ListInspectionPointsListener extends AbstractServiceApiListener {
 
     /**
      * 获取批量单元
-     *
      */
     private void refreshRooms(List<ApiInspectionPointDataVo> inspectionPoints) {
         List<String> roomIds = new ArrayList<String>();
@@ -210,7 +255,7 @@ public class ListInspectionPointsListener extends AbstractServiceApiListener {
         //根据 userId 查询用户信息
         List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
 
-        for (ApiInspectionPointDataVo inspectionPointDataVo: tmpInspectionPoint) {
+        for (ApiInspectionPointDataVo inspectionPointDataVo : tmpInspectionPoint) {
             for (RoomDto tmpRoomDto : roomDtos) {
                 if (inspectionPointDataVo.getLocationObjId().equals(tmpRoomDto.getRoomId())) {
                     inspectionPointDataVo.setLocationObjName(tmpRoomDto.getFloorNum() + "栋" + tmpRoomDto.getUnitNum() + "单元" + tmpRoomDto.getRoomNum() + "室");

Api/src/main/java/com/java110/api/listener/machineTranslate/MachineGetFreeParkingSpaceListener.java

@@ -103,7 +103,9 @@ public class MachineGetFreeParkingSpaceListener extends BaseMachineListener {
         }
         OwnerCarDto ownerCarDto = new OwnerCarDto();
         ownerCarDto.setCommunityId(communityId);
-        ownerCarDto.setCarNums(carNums.toArray(new String[carNums.size()]));
+        if(!carNums.isEmpty()) {
+            ownerCarDto.setCarNums(carNums.toArray(new String[carNums.size()]));
+        }
         List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
 
         List<String> psIds = new ArrayList<>();

Api/src/main/java/com/java110/api/listener/room/ExitRoomListener.java

@@ -84,6 +84,9 @@ public class ExitRoomListener extends AbstractServiceApiDataFlowListener {
         //添加单元信息
         businesses.add(exitRoom(paramObj, dataFlowContext));
 
+        paramObj.put("state","2002");
+        //修改房屋状态
+        businesses.add(roomBMOImpl.updateRoom(paramObj,dataFlowContext));
 
         //删除费用信息
         businesses.add(exitPropertyFee(paramObj, dataFlowContext));
@@ -127,6 +130,8 @@ public class ExitRoomListener extends AbstractServiceApiDataFlowListener {
         return business;
     }
 
+
+
     /**
      * 删除物业费用信息
      *

CommunityService/src/main/java/com/java110/community/dao/IInspectionServiceDao.java

@@ -78,4 +78,18 @@ public interface IInspectionServiceDao {
      */
     int queryInspectionsCount(Map info);
 
+    /**
+     * 查询巡检点数量
+     * @param info 巡检点信息
+     * @return 巡检点数量
+     */
+    public int queryInspectionsRelationShipCount(Map info);
+    /**
+     * 查询巡检点信息（instance）
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    public List<Map> getInspectionRelationShipInfo(Map info) throws DAOException ;
+
 }

CommunityService/src/main/java/com/java110/community/dao/impl/InspectionServiceDaoImpl.java

@@ -125,5 +125,37 @@ public class InspectionServiceDaoImpl extends BaseServiceDao implements IInspect
         return Integer.parseInt(businessInspectionInfos.get(0).get("count").toString());
     }
 
+    /**
+     * 查询巡检点数量
+     * @param info 巡检点信息
+     * @return 巡检点数量
+     */
+    @Override
+    public int queryInspectionsRelationShipCount(Map info) {
+        logger.debug("查询巡检点数据 入参 info : {}",info);
+
+        List<Map> businessInspectionInfos = sqlSessionTemplate.selectList("inspectionServiceDaoImpl.queryInspectionsRelationShipCount", info);
+        if (businessInspectionInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessInspectionInfos.get(0).get("count").toString());
+    }
+
+    /**
+     * 查询巡检点信息（instance）
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getInspectionRelationShipInfo(Map info) throws DAOException {
+        logger.debug("查询巡检点信息 入参 info : {}",info);
+
+        List<Map> businessInspectionInfos = sqlSessionTemplate.selectList("inspectionServiceDaoImpl.getInspectionRelationShipInfo",info);
+
+        return businessInspectionInfos;
+    }
+
 
 }

CommunityService/src/main/java/com/java110/community/smo/impl/InspectionInnerServiceSMOImpl.java

@@ -54,6 +54,27 @@ public class InspectionInnerServiceSMOImpl extends BaseServiceSMO implements IIn
     public int queryInspectionsCount(@RequestBody InspectionDto inspectionDto) {
         return inspectionServiceDaoImpl.queryInspectionsCount(BeanConvertUtil.beanCovertMap(inspectionDto));    }
 
+    @Override
+    public List<InspectionDto> getInspectionRelationShip(@RequestBody  InspectionDto inspectionDto) {
+
+        //校验是否传了 分页信息
+
+        int page = inspectionDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            inspectionDto.setPage((page - 1) * inspectionDto.getRow());
+        }
+
+        List<InspectionDto> inspections = BeanConvertUtil.covertBeanList(inspectionServiceDaoImpl.getInspectionRelationShipInfo(BeanConvertUtil.beanCovertMap(inspectionDto)), InspectionDto.class);
+
+        return inspections;
+    }
+
+
+    @Override
+    public int queryInspectionsRelationShipCount(@RequestBody InspectionDto inspectionDto) {
+        return inspectionServiceDaoImpl.queryInspectionsRelationShipCount(BeanConvertUtil.beanCovertMap(inspectionDto));    }
+
     public IInspectionServiceDao getInspectionServiceDaoImpl() {
         return inspectionServiceDaoImpl;
     }

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;

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 @@ public class PayFeeManageComponent {
 
     /**
      * 查询费用类型
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> listFeeType(IPageData pd){
+    public ResponseEntity<String> listFeeType(IPageData pd) {
         return feeTypeSMOImpl.list(pd);
     }
 

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;

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 @@ public class TempCarInoutFeeManageComponent {
 
     /**
      * 查询费用类型
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> listFeeType(IPageData pd){
+    public ResponseEntity<String> listFeeType(IPageData pd) {
         return feeTypeSMOImpl.list(pd);
     }
 

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;

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;

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;

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;

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 @@ public class ListFeeSummarySMOImpl extends AbstractComponentSMO implements IList
         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 = "";

ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListPayFeeSMOImpl.java

@@ -1,24 +1,20 @@
-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 @@ public class ListPayFeeSMOImpl extends AbstractComponentSMO implements IListPayF
             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);
         }
 

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;

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;

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;

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 @@ public class FeeTypeSMOImpl extends BaseComponentSMO implements IFeeTypeSMO {
     private RestTemplate restTemplate;
 
 
-
     @Override
     public ResponseEntity<String> list(IPageData pd) {
         validate(pd);
@@ -39,8 +37,8 @@ public class FeeTypeSMOImpl extends BaseComponentSMO implements IFeeTypeSMO {
         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;
     }
 

ReportComponent/pom.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <artifactId>MicroCommunity</artifactId>
-    <groupId>com.java110</groupId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>ReportComponent</artifactId>
-  <packaging>jar</packaging>
-
-  <name>ReportComponent</name>
-  <url>http://maven.apache.org</url>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.java110</groupId>
-      <artifactId>java110-service</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>java110-db</artifactId>
-          <groupId>com.java110</groupId>
-        </exclusion>
-      </exclusions>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-
-</project>

ReportComponent/src/main/resources/components/feePackage/fee-manage/payFeeManage.html

@@ -1,103 +0,0 @@
-<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox ">
-                <div class="ibox-title">
-                    <h5>查询条件</h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
-                                v-on:click="_moreCondition()">{{payFeeManageInfo.moreCondition == true?'隐藏':'更多'}}
-                        </button>
-                    </div>
-                </div>
-                <div class="ibox-content">
-                    <div class="row">
-                        <div class="col-sm-4">
-                            <select class="custom-select" v-model="payFeeManageInfo.conditions.payObjType">
-                                <option v-for="(item,index) in payFeeManageInfo.payObjTypes" :key="index" v-bind:value="item.statusCd">{{item.name}}</option>
-                            </select>
-                        </div>
-                        <div class="col-sm-4">
-                            <div class="form-group">
-                                <input size="16" type="text" placeholder="请选择开始时间"   readonly class="form-control  start_time">
-                            </div>
-                        </div>
-                        <div class="col-sm-3">
-                            <div class="form-group">
-                                <input size="16" type="text" placeholder="请选择结束时间"  readonly class="form-control  end_time">
-                            </div>
-                        </div>
-                        <div class="col-sm-1">
-                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryPayFeeMethod()">
-                                <i class="glyphicon glyphicon-search"></i>
-                            </button>
-                        </div>
-                    </div>
-                    <div class="row" v-if="payFeeManageInfo.moreCondition == true">
-                        <div class="col-sm-4">
-                            <input size="16" type="text" placeholder="请填写员工编码"  v-model="payFeeManageInfo.conditions.userCode" class="form-control">
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox">
-                <div class="ibox-title">
-                    <h5>缴费清单</h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportExcel()">
-                            <i class="glyphicon glyphicon-plus"></i>
-                            导出
-                        </button>
-                    </div>
-                </div>
-                <div class="ibox-content">
-
-                    <table class="footable table table-stripped toggle-arrow-tiny"
-                           data-page-size="15"
-                    >
-                        <thead>
-                        <tr>
-                            <th class="text-center">费用类型</th>
-                            <th class="text-center">费用项目</th>
-                            <th class="text-center">付费方</th>
-                            <th class="text-center">缴费ID</th>
-                            <th class="text-center">付费周期</th>
-                            <th class="text-center">应付金额</th>
-                            <td class="text-center">实付金额</td>
-                            <td class="text-center">操作员工</td>
-                            <td class="text-center">缴费时间</td>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr v-for="payFee in payFeeManageInfo.payFees">
-                            <td class="text-center">{{payFee.feeTypeCdName}}</td>
-                            <td class="text-center">{{payFee.feeName}}</td>
-                            <td class="text-center">{{payFee.payObjName}}</td>
-                            <td class="text-center">{{payFee.detailId}}</td>
-                            <td class="text-center">{{payFee.cycles}}个月</td>
-                            <td class="text-center">{{payFee.receivableAmount}}</td>
-                            <td class="text-center">{{payFee.receivedAmount}}</td>
-                            <td class="text-center">{{payFee.userName}}</td>
-                            <td class="text-center">{{payFee.createTime}}</td>
-
-                        </tr>
-                        </tbody>
-                        <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
-                        </tfoot>
-                    </table>
-                    <!-- 分页 -->
-                    <vc:create name="pagination"></vc:create>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

ReportComponent/src/main/resources/components/feePackage/fee-manage/payFeeManage.js

@@ -1,129 +0,0 @@
-/**
- 入驻小区
- **/
-(function (vc) {
-    var DEFAULT_PAGE = 1;
-    var DEFAULT_ROWS = 30;
-    vc.extends({
-        data: {
-            payFeeManageInfo: {
-                payFees: [],
-                payObjTypes:[],
-                total: 0,
-                records: 1,
-                moreCondition: false,
-                name: '',
-                conditions: {
-                    communityId: vc.getCurrentCommunity().communityId,
-                    payObjType: '3333',
-                    startTime: '',
-                    endTime: '',
-                    userCode:''
-                }
-            }
-        },
-        _initMethod: function () {
-            vc.component._initDate();
-            vc.component._listpayFees(DEFAULT_PAGE, DEFAULT_ROWS);
-            //vc.component._listFeeType();
-            vc.getDict('pay_fee',"payer_obj_type",function(_data){
-                vc.component.payFeeManageInfo.payObjTypes = _data;
-            });
-        },
-        _initEvent: function () {
-            vc.on('pagination', 'page_event', function (_currentPage) {
-                vc.component._listpayFees(_currentPage, DEFAULT_ROWS);
-            });
-        },
-        methods: {
-            _initDate:function(){
-                $(".start_time").datetimepicker({
-                    language: 'zh-CN',
-                    format: 'yyyy-mm-dd',
-                    minView: "month",
-                    initialDate: new Date(),
-                    autoClose: 1,
-                    todayBtn: true
-                });
-                $(".end_time").datetimepicker({
-                    language: 'zh-CN',
-                    format: 'yyyy-mm-dd',
-                    minView: "month",
-                    initialDate: new Date(),
-                    autoClose: 1,
-                    todayBtn: true
-                });
-                $('.start_time').datetimepicker()
-                    .on('changeDate', function (ev) {
-                        var value = $(".start_time").val();
-                        vc.component.payFeeManageInfo.conditions.startTime = value ;
-                    });
-                $('.end_time').datetimepicker()
-                    .on('changeDate', function (ev) {
-                        var value = $(".end_time").val();
-                        vc.component.payFeeManageInfo.conditions.endTime = value ;
-                    });
-            },
-            _listpayFees: function (_page, _rows) {
-
-                vc.component.payFeeManageInfo.conditions.page = _page;
-                vc.component.payFeeManageInfo.conditions.row = _rows;
-                var param = {
-                    params: vc.component.payFeeManageInfo.conditions
-                };
-
-                //发送get请求
-                vc.http.get('payFeeManage',
-                    'list',
-                    param,
-                    function (json, res) {
-                        var _payFeeManageInfo = JSON.parse(json);
-                        vc.component.payFeeManageInfo.total = _payFeeManageInfo.total;
-                        vc.component.payFeeManageInfo.records = parseInt(_payFeeManageInfo.total/_rows +1);
-                        vc.component.payFeeManageInfo.payFees = _payFeeManageInfo.payFees;
-                        vc.emit('pagination', 'init', {
-                            total: vc.component.payFeeManageInfo.records,
-                            currentPage: _page
-                        });
-                    }, function (errInfo, error) {
-                        console.log('请求失败处理');
-                    }
-                );
-            },
-            _queryPayFeeMethod: function () {
-                vc.component._listpayFees(DEFAULT_PAGE, DEFAULT_ROWS);
-
-            },
-            _moreCondition: function () {
-                if (vc.component.payFeeManageInfo.moreCondition) {
-                    vc.component.payFeeManageInfo.moreCondition = false;
-                } else {
-                    vc.component.payFeeManageInfo.moreCondition = true;
-                }
-            },
-            _exportExcel:function () {
-
-            },
-            _listFeeType: function () {
-                var param = {
-                    params:{
-                        "hc":"cc@cc"
-                    }
-                };
-
-                //发送get请求
-                vc.http.get('payFeeManage',
-                    'listFeeType',
-                    param,
-                    function (json, res) {
-                        var _feeTypesInfo = JSON.parse(json);
-                        vc.component.payFeeManageInfo.payFeeTypes = _feeTypesInfo;
-
-                    }, function (errInfo, error) {
-                        console.log('请求失败处理');
-                    }
-                );
-            },
-        }
-    });
-})(window.vc);

ReportComponent/src/main/resources/components/feePackage/feeSummary/feeSummary.html

@@ -1,64 +0,0 @@
-<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox">
-                <div class="ibox-title">
-                    <h5>缴费汇总表</h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <div class="btn-group" role="group" aria-label="Basic example">
-                            <button type="button"
-                                    class="btn btn-light btn-sm"
-                                    v-bind:class="{'btn-primary': feeSummaryInfo.feeSummaryType == 1001}"
-                                    v-on:click="_switchFeeSummaryType(1001)"
-                            >日</button>
-                            <button type="button"
-                                    class="btn btn-light btn-sm"
-                                    v-bind:class="{'btn-primary': feeSummaryInfo.feeSummaryType == 1101}"
-                                    v-on:click="_switchFeeSummaryType(1101)"
-                            >月</button>
-                            <button type="button"
-                                    class="btn btn-light btn-sm"
-                                    v-bind:class="{'btn-primary': feeSummaryInfo.feeSummaryType == 1111}"
-                                    v-on:click="_switchFeeSummaryType(1111)"
-                            >年</button>
-                        </div>
-                    </div>
-                </div>
-                <div class="ibox-content">
-
-                    <table class="footable table table-stripped toggle-arrow-tiny"
-                           data-page-size="15"
-                    >
-                        <thead>
-                        <tr>
-                            <th class="text-center">时间</th>
-                            <th class="text-center">费用项ID</th>
-                            <th class="text-center">费用项名称</th>
-                            <th class="text-center">应收金额</th>
-                            <th class="text-center">实收金额</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr v-for="fee in feeSummaryInfo.fees">
-                            <td class="text-center">{{fee.createTime}}</td>
-                            <td class="text-center">{{fee.configId}}</td>
-                            <td class="text-center">{{fee.feeName}}</td>
-                            <td class="text-center">{{fee.receivableAmounts}}</td>
-                            <td class="text-center">{{fee.receivedAmounts}}</td>
-                        </tr>
-                        </tbody>
-                        <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
-                        </tfoot>
-                    </table>
-                    <!-- 分页 -->
-                    <vc:create name="pagination"></vc:create>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

ReportComponent/src/main/resources/components/feePackage/feeSummary/feeSummary.js

@@ -1,64 +0,0 @@
-/**
- 入驻小区
- **/
-(function (vc) {
-    var DEFAULT_PAGE = 1;
-    var DEFAULT_ROWS = 10;
-    vc.extends({
-        data: {
-            feeSummaryInfo: {
-                fees: [],
-                feeSummaryType:'1001',
-                total: 0,
-                records: 1,
-                moreCondition: false,
-                name: '',
-            }
-        },
-        _initMethod: function () {
-            vc.component._listFeeSummarys(DEFAULT_PAGE, DEFAULT_ROWS);
-        },
-        _initEvent: function () {
-            vc.on('pagination', 'page_event', function (_currentPage) {
-                vc.component._listFeeSummarys(_currentPage, DEFAULT_ROWS);
-            });
-        },
-        methods: {
-            _listFeeSummarys: function (_page, _rows) {
-                var param = {
-                    params: {
-                        page: _page,
-                        row:_rows,
-                        feeSummaryType:vc.component.feeSummaryInfo.feeSummaryType,
-                        communityId:vc.getCurrentCommunity().communityId
-                    }
-                };
-
-                //发送get请求
-                vc.http.get('feeSummary',
-                    'list',
-                    param,
-                    function (json, res) {
-                        var _feeSummaryInfo = JSON.parse(json);
-                        vc.component.feeSummaryInfo.total = _feeSummaryInfo.total;
-                        vc.component.feeSummaryInfo.records = parseInt(_feeSummaryInfo.total/_rows +1);
-                        vc.component.feeSummaryInfo.fees = _feeSummaryInfo.fees;
-                        vc.emit('pagination', 'init', {
-                            total: vc.component.feeSummaryInfo.records,
-                            currentPage: _page
-                        });
-                    }, function (errInfo, error) {
-                        console.log('请求失败处理');
-                    }
-                );
-            },
-            _exportExcel:function () {
-
-            },
-            _switchFeeSummaryType:function(_feeSummaryType){
-                vc.component.feeSummaryInfo.feeSummaryType = _feeSummaryType;
-                vc.component._listFeeSummarys(DEFAULT_PAGE,DEFAULT_ROWS);
-            }
-        }
-    });
-})(window.vc);

ReportComponent/src/main/resources/components/feePackage/staffFeeManage/staffFeeManage.html

@@ -1,88 +0,0 @@
-<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox ">
-                <div class="ibox-title">
-                    <h5>查询条件</h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <!-- <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
-                                 v-on:click="_moreCondition()">{{staffFeeManageInfo.moreCondition == true?'隐藏':'更多'}}
-                         </button>-->
-                    </div>
-                </div>
-                <div class="ibox-content">
-                    <div class="row">
-                        <div class="col-sm-4">
-                            <input size="16" type="text" placeholder="请填写员工编码"
-                                   v-model="staffFeeManageInfo.conditions.userCode" class="form-control">
-                        </div>
-                        <div class="col-sm-4">
-                            <div class="form-group">
-                                <input size="16" type="text" placeholder="请选择开始时间" readonly
-                                       class="form-control  start_time">
-                            </div>
-                        </div>
-                        <div class="col-sm-3">
-                            <div class="form-group">
-                                <input size="16" type="text" placeholder="请选择结束时间" readonly
-                                       class="form-control  end_time">
-                            </div>
-                        </div>
-                        <div class="col-sm-1">
-                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_querystaffFeeMethod()">
-                                <i class="glyphicon glyphicon-search"></i>
-                            </button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox">
-                <div class="ibox-title">
-                    <h5>员工收费</h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportExcel()">
-                            <i class="glyphicon glyphicon-plus"></i>
-                            导出
-                        </button>
-                    </div>
-                </div>
-                <div class="ibox-content">
-
-                    <table class="footable table table-stripped toggle-arrow-tiny"
-                           data-page-size="15"
-                    >
-                        <thead>
-                        <tr>
-                            <th class="text-center">员工名称</th>
-                            <th class="text-center">员工编码</th>
-                            <th class="text-center">应收金额</th>
-                            <th class="text-center">实收金额</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr v-for="staffFee in staffFeeManageInfo.staffFees">
-                            <td class="text-center">{{staffFee.userName}}</td>
-                            <td class="text-center">{{staffFee.userId}}</td>
-                            <td class="text-center">{{staffFee.receivableAmount}}元</td>
-                            <td class="text-center">{{staffFee.receivedAmount}}元</td>
-                        </tr>
-                        </tbody>
-                        <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
-                        </tfoot>
-                    </table>
-                    <!-- 分页 -->
-                    <vc:create name="pagination"></vc:create>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

ReportComponent/src/main/resources/components/feePackage/staffFeeManage/staffFeeManage.js

@@ -1,104 +0,0 @@
-/**
- 入驻小区
- **/
-(function (vc) {
-    var DEFAULT_PAGE = 1;
-    var DEFAULT_ROWS = 30;
-    vc.extends({
-        data: {
-            staffFeeManageInfo: {
-                staffFees: [],
-                staffFeeTypes:[],
-                total: 0,
-                records: 1,
-                moreCondition: false,
-                name: '',
-                conditions: {
-                    communityId: vc.getCurrentCommunity().communityId,
-                    startTime: '',
-                    endTime: '',
-                    userCode:''
-                }
-            }
-        },
-        _initMethod: function () {
-            vc.component._initDate();
-            vc.component._liststaffFees(DEFAULT_PAGE, DEFAULT_ROWS);
-        },
-        _initEvent: function () {
-            vc.on('pagination', 'page_event', function (_currentPage) {
-                vc.component._liststaffFees(_currentPage, DEFAULT_ROWS);
-            });
-        },
-        methods: {
-            _initDate:function(){
-                $(".start_time").datetimepicker({
-                    language: 'zh-CN',
-                    format: 'yyyy-mm-dd',
-                    minView: "month",
-                    initialDate: new Date(),
-                    autoClose: 1,
-                    todayBtn: true
-                });
-                $(".end_time").datetimepicker({
-                    language: 'zh-CN',
-                    format: 'yyyy-mm-dd',
-                    minView: "month",
-                    initialDate: new Date(),
-                    autoClose: 1,
-                    todayBtn: true
-                });
-                $('.start_time').datetimepicker()
-                    .on('changeDate', function (ev) {
-                        var value = $(".start_time").val();
-                        vc.component.staffFeeManageInfo.conditions.startTime = value ;
-                    });
-                $('.end_time').datetimepicker()
-                    .on('changeDate', function (ev) {
-                        var value = $(".end_time").val();
-                        vc.component.staffFeeManageInfo.conditions.endTime = value ;
-                    });
-            },
-            _liststaffFees: function (_page, _rows) {
-
-                vc.component.staffFeeManageInfo.conditions.page = _page;
-                vc.component.staffFeeManageInfo.conditions.row = _rows;
-                var param = {
-                    params: vc.component.staffFeeManageInfo.conditions
-                };
-
-                //发送get请求
-                vc.http.get('staffFeeManage',
-                    'list',
-                    param,
-                    function (json, res) {
-                        var _staffFeeManageInfo = JSON.parse(json);
-                        vc.component.staffFeeManageInfo.total = _staffFeeManageInfo.total;
-                        vc.component.staffFeeManageInfo.records = parseInt(_staffFeeManageInfo.total/_rows +1);
-                        vc.component.staffFeeManageInfo.staffFees = _staffFeeManageInfo.staffFees;
-                        vc.emit('pagination', 'init', {
-                            total: vc.component.staffFeeManageInfo.records,
-                            currentPage: _page
-                        });
-                    }, function (errInfo, error) {
-                        console.log('请求失败处理');
-                    }
-                );
-            },
-            _querystaffFeeMethod: function () {
-                vc.component._liststaffFees(DEFAULT_PAGE, DEFAULT_ROWS);
-
-            },
-            _moreCondition: function () {
-                if (vc.component.staffFeeManageInfo.moreCondition) {
-                    vc.component.staffFeeManageInfo.moreCondition = false;
-                } else {
-                    vc.component.staffFeeManageInfo.moreCondition = true;
-                }
-            },
-            _exportExcel:function () {
-
-            }
-        }
-    });
-})(window.vc);

ReportComponent/src/main/resources/components/feePackage/tempCarInoutfee-manage/tempCarInoutFeeManage.html

@@ -1,108 +0,0 @@
-<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox ">
-                <div class="ibox-title">
-                    <h5>查询条件</h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <!-- <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
-                                 v-on:click="_moreCondition()">{{tempCarInoutFeeManageInfo.moreCondition == true?'隐藏':'更多'}}
-                         </button>-->
-                    </div>
-                </div>
-                <div class="ibox-content">
-                    <div class="row">
-                        <div class="col-sm-4">
-                            <div class="form-group">
-                                <input size="16" type="text" placeholder="请填写车牌号"
-                                       v-model="tempCarInoutFeeManageInfo.conditions.carNum" class="form-control">
-                            </div>
-                        </div>
-                        <div class="col-sm-4">
-                            <div class="form-group">
-                                <input size="16" type="text" placeholder="请选择开始时间" readonly
-                                       class="form-control  start_time">
-                            </div>
-                        </div>
-                        <div class="col-sm-3">
-                            <div class="form-group">
-                                <input size="16" type="text" placeholder="请选择结束时间" readonly
-                                       class="form-control  end_time">
-                            </div>
-                        </div>
-                        <div class="col-sm-1">
-                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryPayFeeMethod()">
-                                <i class="glyphicon glyphicon-search"></i>
-                            </button>
-                        </div>
-                    </div>
-                    <!--<div class="row" v-if="tempCarInoutFeeManageInfo.moreCondition == true">
-                        <div class="col-sm-4">
-                            <input size="16" type="text" placeholder="请填写员工编码"  v-model="tempCarInoutFeeManageInfo.conditions.userCode" class="form-control">
-                        </div>
-                    </div>-->
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox">
-                <div class="ibox-title">
-                    <h5>临时车缴费清单</h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportExcel()">
-                            <i class="glyphicon glyphicon-plus"></i>
-                            导出
-                        </button>
-                    </div>
-                </div>
-                <div class="ibox-content">
-
-                    <table class="footable table table-stripped toggle-arrow-tiny"
-                           data-page-size="15"
-                    >
-                        <thead>
-                        <tr>
-                            <th class="text-center">订单ID</th>
-                            <th class="text-center">缴费ID</th>
-                            <th class="text-center">进场ID</th>
-                            <th class="text-center">车牌号</th>
-                            <th class="text-center">应付金额</th>
-                            <td class="text-center">实付金额</td>
-                            <td class="text-center">开始时间</td>
-                            <td class="text-center">结束时间</td>
-<!--                            <td class="text-center">操作员工</td>-->
-                            <td class="text-center">缴费时间</td>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr v-for="payFee in tempCarInoutFeeManageInfo.payFees">
-                            <td class="text-center">{{payFee.oId}}</td>
-                            <td class="text-center">{{payFee.feeId}}</td>
-                            <td class="text-center">{{payFee.inoutId}}</td>
-                            <td class="text-center">{{payFee.carNum}}</td>
-                            <td class="text-center">{{payFee.receivableAmount}}元</td>
-                            <td class="text-center">{{payFee.receivedAmount}}元</td>
-                            <td class="text-center">{{payFee.startTime}}</td>
-                            <td class="text-center">{{payFee.endTime}}</td>
-<!--                            <td class="text-center">{{payFee.userName}}</td>-->
-                            <td class="text-center">{{payFee.payTime}}</td>
-
-                        </tr>
-                        </tbody>
-                        <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
-                        </tfoot>
-                    </table>
-                    <!-- 分页 -->
-                    <vc:create name="pagination"></vc:create>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

ReportComponent/src/main/resources/components/feePackage/tempCarInoutfee-manage/tempCarInoutFeeManage.js

@@ -1,104 +0,0 @@
-/**
- 入驻小区
- **/
-(function (vc) {
-    var DEFAULT_PAGE = 1;
-    var DEFAULT_ROWS = 30;
-    vc.extends({
-        data: {
-            tempCarInoutFeeManageInfo: {
-                payFees: [],
-                total: 0,
-                records: 1,
-                moreCondition: false,
-                name: '',
-                conditions: {
-                    communityId: vc.getCurrentCommunity().communityId,
-                    feeTypeCd: '888800010007',
-                    startTime: '',
-                    endTime: '',
-                    carNum:''
-                }
-            }
-        },
-        _initMethod: function () {
-            vc.component._initDate();
-            vc.component._listpayFees(DEFAULT_PAGE, DEFAULT_ROWS);
-        },
-        _initEvent: function () {
-            vc.on('pagination', 'page_event', function (_currentPage) {
-                vc.component._listpayFees(_currentPage, DEFAULT_ROWS);
-            });
-        },
-        methods: {
-            _initDate:function(){
-                $(".start_time").datetimepicker({
-                    language: 'zh-CN',
-                    format: 'yyyy-mm-dd',
-                    minView: "month",
-                    initialDate: new Date(),
-                    autoClose: 1,
-                    todayBtn: true
-                });
-                $(".end_time").datetimepicker({
-                    language: 'zh-CN',
-                    format: 'yyyy-mm-dd',
-                    minView: "month",
-                    initialDate: new Date(),
-                    autoClose: 1,
-                    todayBtn: true
-                });
-                $('.start_time').datetimepicker()
-                    .on('changeDate', function (ev) {
-                        var value = $(".start_time").val();
-                        vc.component.tempCarInoutFeeManageInfo.conditions.startTime = value ;
-                    });
-                $('.end_time').datetimepicker()
-                    .on('changeDate', function (ev) {
-                        var value = $(".end_time").val();
-                        vc.component.tempCarInoutFeeManageInfo.conditions.endTime = value ;
-                    });
-            },
-            _listpayFees: function (_page, _rows) {
-
-                vc.component.tempCarInoutFeeManageInfo.conditions.page = _page;
-                vc.component.tempCarInoutFeeManageInfo.conditions.row = _rows;
-                var param = {
-                    params: vc.component.tempCarInoutFeeManageInfo.conditions
-                };
-
-                //发送get请求
-                vc.http.get('tempCarInoutFeeManage',
-                    'list',
-                    param,
-                    function (json, res) {
-                        var _tempCarInoutFeeManageInfo = JSON.parse(json);
-                        vc.component.tempCarInoutFeeManageInfo.total = _tempCarInoutFeeManageInfo.total;
-                        vc.component.tempCarInoutFeeManageInfo.records = parseInt(_tempCarInoutFeeManageInfo.total/_rows +1);
-                        vc.component.tempCarInoutFeeManageInfo.payFees = _tempCarInoutFeeManageInfo.tempCarInoutFees;
-                        vc.emit('pagination', 'init', {
-                            total: vc.component.tempCarInoutFeeManageInfo.records,
-                            currentPage: _page
-                        });
-                    }, function (errInfo, error) {
-                        console.log('请求失败处理');
-                    }
-                );
-            },
-            _queryPayFeeMethod: function () {
-                vc.component._listpayFees(DEFAULT_PAGE, DEFAULT_ROWS);
-
-            },
-            _moreCondition: function () {
-                if (vc.component.tempCarInoutFeeManageInfo.moreCondition) {
-                    vc.component.tempCarInoutFeeManageInfo.moreCondition = false;
-                } else {
-                    vc.component.tempCarInoutFeeManageInfo.moreCondition = true;
-                }
-            },
-            _exportExcel:function () {
-
-            }
-        }
-    });
-})(window.vc);

ReportComponent/src/main/resources/views/feeSummaryFlow.html

@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html lang="en"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:vc="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>费用汇总表|java110</title>
-    <vc:create name="commonTop"></vc:create>
-    <link href="/css/jquery.step.css" rel="stylesheet"/>
-    <script src="/js/jquery.step.min.js" ></script>
-</head>
-<body>
-<vc:create name="bodyTop"></vc:create>
-<div id="wrapper">
-    <vc:create name="menu"></vc:create>
-
-
-    <div id="page-wrapper" class="gray-bg dashbard-1">
-        <div class="row border-bottom">
-            <vc:create name="nav"></vc:create>
-        </div>
-        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
-            <vc:create name="breadcrumb"></vc:create>
-        </div>
-        <!-- id="component" -->
-        <div class="wrapper wrapper-content animated fadeInRight">
-            <vc:create name="feeSummary"></vc:create>
-        </div>
-
-        <vc:create name="copyright"></vc:create>
-
-    </div>
-</div>
-
-<vc:create name="commonBottom"></vc:create>
-</body>
-</html>

ReportComponent/src/main/resources/views/payFeeFlow.html

@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html lang="en"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:vc="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>缴费清单|java110</title>
-    <vc:create name="commonTop"></vc:create>
-    <link href="/css/jquery.step.css" rel="stylesheet"/>
-    <script src="/js/jquery.step.min.js" ></script>
-</head>
-<body>
-<vc:create name="bodyTop"></vc:create>
-<div id="wrapper">
-    <vc:create name="menu"></vc:create>
-
-
-    <div id="page-wrapper" class="gray-bg dashbard-1">
-        <div class="row border-bottom">
-            <vc:create name="nav"></vc:create>
-        </div>
-        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
-            <vc:create name="breadcrumb"></vc:create>
-        </div>
-        <!-- id="component" -->
-        <div class="wrapper wrapper-content animated fadeInRight">
-            <vc:create name="payFeeManage"></vc:create>
-        </div>
-
-        <vc:create name="copyright"></vc:create>
-
-    </div>
-</div>
-
-<vc:create name="commonBottom"></vc:create>
-</body>
-</html>

ReportComponent/src/main/resources/views/staffFeeFlow.html

@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html lang="en"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:vc="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>员工收费|java110</title>
-    <vc:create name="commonTop"></vc:create>
-    <link href="/css/jquery.step.css" rel="stylesheet"/>
-    <script src="/js/jquery.step.min.js" ></script>
-</head>
-<body>
-<vc:create name="bodyTop"></vc:create>
-<div id="wrapper">
-    <vc:create name="menu"></vc:create>
-
-
-    <div id="page-wrapper" class="gray-bg dashbard-1">
-        <div class="row border-bottom">
-            <vc:create name="nav"></vc:create>
-        </div>
-        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
-            <vc:create name="breadcrumb"></vc:create>
-        </div>
-        <!-- id="component" -->
-        <div class="wrapper wrapper-content animated fadeInRight">
-            <vc:create name="staffFeeManage"></vc:create>
-        </div>
-
-        <vc:create name="copyright"></vc:create>
-
-    </div>
-</div>
-
-<vc:create name="commonBottom"></vc:create>
-</body>
-</html>

ReportComponent/src/main/resources/views/tempCarInoutFeeFlow.html

@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html lang="en"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:vc="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>临时车缴费清单|java110</title>
-    <vc:create name="commonTop"></vc:create>
-    <link href="/css/jquery.step.css" rel="stylesheet"/>
-    <script src="/js/jquery.step.min.js" ></script>
-</head>
-<body>
-<vc:create name="bodyTop"></vc:create>
-<div id="wrapper">
-    <vc:create name="menu"></vc:create>
-
-
-    <div id="page-wrapper" class="gray-bg dashbard-1">
-        <div class="row border-bottom">
-            <vc:create name="nav"></vc:create>
-        </div>
-        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
-            <vc:create name="breadcrumb"></vc:create>
-        </div>
-        <!-- id="component" -->
-        <div class="wrapper wrapper-content animated fadeInRight">
-            <vc:create name="tempCarInoutFeeManage"></vc:create>
-        </div>
-
-        <vc:create name="copyright"></vc:create>
-
-    </div>
-</div>
-
-<vc:create name="commonBottom"></vc:create>
-</body>
-</html>

java110-bean/src/main/java/com/java110/dto/inspectionPoint/InspectionDto.java

@@ -27,6 +27,7 @@ public class InspectionDto extends PageDto implements Serializable {
     private String machineId;
     private String communityId;
     private String inspectionRouteId;
+    private String relationship; //1 查询关联的巡检点 0 还未关联巡检点
 
 
     private Date createTime;
@@ -147,4 +148,12 @@ public class InspectionDto extends PageDto implements Serializable {
     public void setInspectionRouteId(String inspectionRouteId) {
         this.inspectionRouteId = inspectionRouteId;
     }
+
+    public String getRelationship() {
+        return relationship;
+    }
+
+    public void setRelationship(String relationship) {
+        this.relationship = relationship;
+    }
 }

java110-core/src/main/java/com/java110/core/smo/inspectionPoint/IInspectionInnerServiceSMO.java

@@ -1,7 +1,9 @@
 package com.java110.core.smo.inspectionPoint;
 
 import com.java110.core.feign.FeignConfiguration;
+import com.java110.dto.PageDto;
 import com.java110.dto.inspectionPoint.InspectionDto;
+import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,4 +41,10 @@ public interface IInspectionInnerServiceSMO {
      */
     @RequestMapping(value = "/queryInspectionsCount", method = RequestMethod.POST)
     int queryInspectionsCount(@RequestBody InspectionDto inspectionDto);
+
+    @RequestMapping(value = "/getInspectionRelationShip", method = RequestMethod.POST)
+    public List<InspectionDto> getInspectionRelationShip(@RequestBody  InspectionDto inspectionDto);
+
+    @RequestMapping(value = "/queryInspectionsRelationShipCount", method = RequestMethod.POST)
+    public int queryInspectionsRelationShipCount(@RequestBody InspectionDto inspectionDto);
 }

java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml

@@ -339,6 +339,7 @@
         <if test="communityName != null and communityName != '' and needCommunityInfo == true">
             and sc.name like concat('%',#{communityName},'%')
         </if>
+        group by ms.community_id
         order by ms.create_time desc
         <if test="page != -1 and page != null">
             limit #{page},#{row}
@@ -366,7 +367,7 @@
 
     <!-- 查询小区成员  add by wuxw 2018-07-03 -->
     <select id="getCommunityMemberCount" parameterType="Map" resultType="Map">
-        select count(1) count
+        select ms.community_id,count(1) count
         from s_community_member ms
         <if test="needCommunityInfo == true">
             ,s_community sc,
@@ -424,6 +425,7 @@
         <if test="communityName != null and communityName != '' and needCommunityInfo == true">
             and sc.name like concat('%',#{communityName},'%')
         </if>
+        group by ms.community_id
     </select>
 
     <!-- 查询小区信息 add by wuxw 2018-07-03 -->

java110-db/src/main/resources/mapper/community/InspectionServiceDaoImplMapper.xml

@@ -7,10 +7,10 @@
     <!-- 保存巡检点信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessInspectionInfo" parameterType="Map">
         insert into business_inspection_point
-                (inspection_id,machine_id,operate,remark,inspection_name,community_id,b_id)
-            values
-                (#{inspectionId},#{machineId},#{operate},#{remark},#{inspectionName},#{communityId},#{bId})
-       </insert>
+        (inspection_id,machine_id,operate,remark,inspection_name,community_id,b_id)
+        values
+        (#{inspectionId},#{machineId},#{operate},#{remark},#{inspectionName},#{communityId},#{bId})
+    </insert>
 
 
     <!-- 查询巡检点信息（Business） add by wuxw 2018-07-03 -->
@@ -48,10 +48,10 @@
     <!-- 保存巡检点信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveInspectionInfoInstance" parameterType="Map">
         insert into
-            inspection_point(
-                inspection_id,machine_id,remark,status_cd,inspection_name,community_id,b_id
-            ) select t.inspection_id,t.machine_id,t.remark,'0',t.inspection_name,t.community_id,t.b_id from
-            business_inspection_point t where 1=1
+        inspection_point(
+        inspection_id,machine_id,remark,status_cd,inspection_name,community_id,b_id
+        ) select t.inspection_id,t.machine_id,t.remark,'0',t.inspection_name,t.community_id,t.b_id from
+        business_inspection_point t where 1=1
         <if test="inspectionId !=null and inspectionId != ''">
             and t.inspection_id= #{inspectionId}
         </if>
@@ -78,19 +78,20 @@
     <!-- 查询巡检点信息 add by wuxw 2018-07-03 -->
     <select id="getInspectionInfo" parameterType="Map" resultType="Map">
         select
-            t.inspection_id,t.inspection_id inspectionId,t.machine_id,
-            t.machine_id machineId,t.remark,t.status_cd,t.status_cd statusCd,
-            t.inspection_name,t.inspection_name inspectionName,t.community_id,
-            t.community_id communityId,t.b_id,t.b_id bId,
-            m.machine_code machineCode,m.machine_name machineName,location_type_cd locationTypeCd,location_obj_id locationObjId,m.machine_id machineId,
-            d.name locationTypeName
+        t.inspection_id,t.inspection_id inspectionId,t.machine_id,
+        t.machine_id machineId,t.remark,t.status_cd,t.status_cd statusCd,
+        t.inspection_name,t.inspection_name inspectionName,t.community_id,
+        t.community_id communityId,t.b_id,t.b_id bId,
+        m.machine_code machineCode,m.machine_name machineName,location_type_cd locationTypeCd,location_obj_id
+        locationObjId,m.machine_id machineId,
+        d.name locationTypeName
         from inspection_point t
         inner join machine m on t.machine_id = m.machine_id and m.status_cd = 0
         inner join t_dict d on d.status_cd = m.location_type_cd
         <if test="inspectionRouteId != null  and  inspectionRouteId != ''">
             left join inspection_route_point_rel c on t.inspection_id = c.inspection_id
-            and t.status_cd = '0'
-            and t.inspection_route_id is null
+            and c.status_cd = '0'
+            and c.inspection_route_id is null
         </if>
         where 1 =1
         <if test="inspectionId !=null and inspectionId != ''">
@@ -157,8 +158,8 @@
         from inspection_point t
         <if test="inspectionRouteId != null  and  inspectionRouteId != ''">
             left join inspection_route_point_rel c on t.inspection_id = c.inspection_id
-            and t.status_cd = '0'
-            and t.inspection_route_id is null
+            and c.status_cd = '0'
+            and c.inspection_route_id is null
         </if>
         where 1 =1
         <if test="inspectionId !=null and inspectionId != ''">
@@ -186,4 +187,98 @@
 
     </select>
 
+
+    <!-- 查询巡检点信息 add by wuxw 2018-07-03 -->
+    <select id="getInspectionRelationShipInfo" parameterType="Map" resultType="Map">
+        select
+        t.inspection_id,t.inspection_id inspectionId,t.machine_id,
+        t.machine_id machineId,t.remark,t.status_cd,t.status_cd statusCd,
+        t.inspection_name,t.inspection_name inspectionName,t.community_id,
+        t.community_id communityId,t.b_id,t.b_id bId,
+        m.machine_code machineCode,m.machine_name machineName,location_type_cd locationTypeCd,location_obj_id
+        locationObjId,m.machine_id machineId,
+        d.name locationTypeName
+        from inspection_point t
+        inner join machine m on t.machine_id = m.machine_id and m.status_cd = 0
+        inner join t_dict d on d.status_cd = m.location_type_cd
+        left join inspection_route_point_rel c on t.inspection_id = c.inspection_id
+        where 1 =1
+        <if test="relationship != null  and  relationship == '1'">
+            and c.status_cd = '0'
+            and c.inspection_route_id = #{inspectionRouteId}
+            and c.inspection_id is not null
+        </if>
+        <if test="relationship != null  and  relationship == '0'">
+            and c.inspection_route_id = #{inspectionRouteId}
+            and c.inspection_id is null
+        </if>
+        <if test="inspectionId !=null and inspectionId != ''">
+            and t.inspection_id= #{inspectionId}
+        </if>
+        <if test="machineCode !=null and machineCode != ''">
+            and m.machine_code= #{machineCode}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="inspectionName !=null and inspectionName != ''">
+            and t.inspection_name like concat('%',#{inspectionName},'%')
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        group by t.inspection_id
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+    </select>
+
+    <!-- 查询巡检点数量 add by wuxw 2018-07-03 -->
+    <select id="queryInspectionsRelationShipCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from inspection_point t
+        inner join machine m on t.machine_id = m.machine_id and m.status_cd = 0
+        inner join t_dict d on d.status_cd = m.location_type_cd
+        left join inspection_route_point_rel c on t.inspection_id = c.inspection_id
+        where 1 =1
+
+        <if test="relationship != null  and  relationship == '1'">
+            and c.status_cd = '0'
+            and c.inspection_route_id = #{inspectionRouteId}
+            and c.inspection_id is not null
+        </if>
+        <if test="relationship != null  and  relationship == '0'">
+            and c.inspection_route_id = #{inspectionRouteId}
+            and c.inspection_id is null
+        </if>
+        <if test="inspectionId !=null and inspectionId != ''">
+            and t.inspection_id= #{inspectionId}
+        </if>
+        <if test="machineId !=null and machineId != ''">
+            and t.machine_id= #{machineId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="inspectionName !=null and inspectionName != ''">
+            and t.inspection_name= #{inspectionName}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+    </select>
+
 </mapper>

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>