同步

src/api/system/InspectionPoint/index.ts

@@ -8,7 +8,7 @@ import { PointVO, PointForm, PointQuery } from '@/api/system/InspectionPoint/typ
  * @returns {*}
  */
 
-export const listPoint = (query?: PointQuery): AxiosPromise<PointVO[]> => {
+export const listPoint = (query?: PointQuery | {}): AxiosPromise<PointVO[]> => {
   return request({
     url: '/inspection/point/list',
     method: 'get',

src/api/system/InspectionRoute/index.ts

@@ -61,3 +61,11 @@ export const delRoute = (id: string | number | Array<string | number>) => {
     method: 'delete'
   });
 };
+
+export const changeStatusRoute = (id: string, status: string) => {
+  return request({
+    url: '/inspection/route/changeStatus',
+    method: 'put',
+    params: { id, status }
+  });
+};

src/api/system/Notification/index.ts

@@ -1,17 +1,40 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { NoticeVO, NoticeForm, NoticeQuery } from '@/api/system/NoticePc/type';
 
+export interface NotificationVo {
+  'id': 'string';
+  'title': 'string';
+  'item': 'string';
+  'content': 'string';
+  'manageIsCheck': 'string';
+  'repairIsCheck': 'string';
+}
 /**
  * 查询消息通知列表
  * @param query
  * @returns {*}
  */
 
-export const getNotificationList = (query?: NoticeQuery): AxiosPromise<NoticeVO[]> => {
+export const getNotificationList = (query): AxiosPromise<NoticeVO[]> => {
   return request({
     url: '/notification/list',
     method: 'get',
     params: query
   });
 };
+
+/**
+ * 消息通知 已读
+ * @param query
+ * @returns {*}
+ */
+
+export const ReadNotificationByID = (id: string) => {
+  return request({
+    url: '/notification/read',
+    method: 'POST',
+    data: {
+      id
+    }
+  });
+};

src/api/system/Payment/index.ts

@@ -0,0 +1,27 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+
+/**
+ * 获取缴费方式，种类占比
+ * @param query
+ * @returns {*}
+ */
+
+export const income_statsApi = (
+  datetime?: string
+): Promise<{
+  'totalResident': number;
+  'totalHouse': number;
+  'totalParking': number;
+  'totalDevice': number;
+  'totalMaterial': number;
+  'totalComplaint': number;
+}> => {
+  return request({
+    url: '/api/analysis/income/stats',
+    method: 'get',
+    params: {
+      datetime: datetime
+    }
+  });
+};

src/api/system/Personnel/index.ts

@@ -0,0 +1,93 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+
+/**
+ * 查询入住情况
+ * @param query
+ * @returns {*}
+ */
+
+export const user_movein_list = (query?: {
+  datetime: string;
+}): Promise<{
+  'totalResident': number;
+  'totalHouse': number;
+  'totalParking': number;
+  'totalDevice': number;
+  'totalMaterial': number;
+  'totalComplaint': number;
+}> => {
+  return request({
+    url: '/workSpace/totalList',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询居住人类型列表
+ * @param query
+ * @returns {*}
+ */
+
+export const get_movein_user_type = (query?: {
+  datetime: string;
+}): Promise<{
+  'owner': string;
+  'ownerRate': string;
+  'tenant': string;
+  'tenantRate': string;
+  'relatives': string;
+  'relativeRate': string;
+  'other': string;
+  'otherRate': string;
+  'totalResident': string;
+}> => {
+  return request({
+    url: '/residentType/selectTotal',
+    method: 'get',
+    params: query
+  });
+};
+/**
+ * 查询住户性别比例
+ * @param query
+ * @returns {*}
+ */
+
+export const get_movein_user_sex = (query?: {
+  datetime: string;
+}): Promise<{
+  'man': number;
+  'woman': number;
+  'total': number;
+  'manRate': string;
+  'womanRate': string;
+}> => {
+  return request({
+    url: '/gender/overview',
+    method: 'get',
+    params: query
+  });
+};
+/**
+ * 获取迁入迁出趋势图
+ * @param query
+ * @returns {*}
+ */
+
+export const get_movein_moveout_list = (query?: {
+  datetime: string;
+}): Promise<
+  {
+    'date': string;
+    'inCount': number;
+    'outCount': number;
+  }[]
+> => {
+  return request({
+    url: '/residentDailyStat/selectTotal',
+    method: 'get',
+    params: query
+  });
+};

src/api/system/Repair/type.ts

@@ -22,7 +22,7 @@ export interface RepairVO {
   /**
    * 报修人id(住户表id)
    */
-  residentId: string | number;
+  residentId: string;
 
   /**
    * 手机号码
@@ -86,7 +86,7 @@ export interface RepairForm extends BaseEntity {
   /**
    * 报修人id(住户表id)
    */
-  residentId?: string | number;
+  residentId?: string;
 
   /**
    * 手机号码
@@ -163,7 +163,7 @@ export interface RepairQuery extends PageQuery {
   /**
    * 报修人id(住户表id)
    */
-  residentId?: string | number;
+  residentId?: string;
 
   /**
    * 手机号码

src/api/system/SdbBill/index.ts

@@ -106,3 +106,16 @@ export const queryResidentList_holder = (query: { pageNum: number; pageSize: num
     params: query
   });
 };
+
+/**
+ * 查询车位业主列表
+ * @param data
+ * @returns {*}
+ */
+export const queryResidentList_Cars = (query: { pageNum: number; pageSize: number }): AxiosPromise<BillUserlist[]> => {
+  return request({
+    url: '/bill/getParkingList',
+    method: 'GET',
+    params: query
+  });
+};

src/api/system/SdbBill/type.ts

@@ -13,6 +13,7 @@ export interface BillVO {
    * 收费项目id
    */
   chargeItemId: string;
+  residentIds: string[];
 
   /**
    * 收费范围 0全体业主 1部分业主

src/api/system/SdbCashier/index.ts

@@ -13,7 +13,7 @@ export type cashlist = {
  * @param post
  * @returns {*}
  */
-export const cashQuery = (data: { residentName?: string }): AxiosPromise<cashlist[]> => {
+export const cashQuery = (data: { residentName?: string; queryType: number }): AxiosPromise<cashlist[]> => {
   return request({
     url: '/cash/residentList',
     method: 'post',
@@ -38,6 +38,7 @@ export type billlistType = {
   'endDate': string;
   'money': string;
   'payStatus': string;
+  amount: string;
 };
 /**
  * 查询账单列表
@@ -51,3 +52,10 @@ export const billQuery = (data: { residentId?: string; payStatus: '0' | '1' }):
     data: data
   });
 };
+export const billEdit = (data: { 'detailsId': string[]; 'payType': string; 'payStatus': string }): AxiosPromise<billlistType[]> => {
+  return request({
+    url: '/cash/billEdit',
+    method: 'post',
+    data: data
+  });
+};

src/api/system/SdbChargeItem/index.ts

@@ -8,7 +8,7 @@ import { ChargeItemVO, ChargeItemForm, ChargeItemQuery } from './type';
  * @returns {*}
  */
 
-export const listChargeItem = (query?: ChargeItemQuery): AxiosPromise<ChargeItemVO[]> => {
+export const listChargeItem = (query?: ChargeItemQuery | {}): AxiosPromise<ChargeItemVO[]> => {
   return request({
     url: '/chargeItem/list',
     method: 'get',

src/api/system/SdbTopupRecord/index.ts

@@ -61,3 +61,39 @@ export const delTopupRecord = (id: string | number | Array<string | number>) =>
     method: 'delete'
   });
 };
+
+export type TopupRecordList = {
+  'id': string;
+  'rechargeTime': string;
+  'villageName': string;
+  'residentName': string;
+  'houseName': string;
+  'fixedPriceUnit': string;
+  'fixedPrice': string;
+  'unit': string;
+  'deviceCode': string;
+  'orderId': string;
+  'rechargeAmount': string;
+  'topUpType': string;
+};
+/** 查询所有设备充值记录 */
+export const getTopupRecordByDate = (query: {
+  startTime?: string;
+  endTime?: string;
+  pageSize: number;
+  pageNum: number;
+}): AxiosPromise<TopupRecordList[]> => {
+  return request({
+    url: '/topupRecord/water/list',
+    method: 'get',
+    params: query
+  });
+};
+/** 导出 所有设备的 充值记录 */
+export const exportTopupRecordByDate = (query: { startTime?: string; endTime?: string }): AxiosPromise<TopupRecordList[]> => {
+  return request({
+    url: '/topupRecord/water/export',
+    method: 'get',
+    params: query
+  });
+};

src/api/system/carArea/index.ts

@@ -8,7 +8,7 @@ import { AreaVO, AreaForm, AreaQuery } from '@/api/system/carArea/type';
  * @returns {*}
  */
 
-export const listArea = (query?: AreaQuery): AxiosPromise<AreaVO[]> => {
+export const listArea = (query: AreaQuery | {} = {}): AxiosPromise<AreaVO[]> => {
   return request({
     url: '/area/list',
     method: 'get',

src/api/system/cars/type.ts

@@ -2,17 +2,17 @@ export interface CarVO {
   /**
    * 车辆管理表id
    */
-  id: string | number;
+  id: string;
 
   /**
    * 区域id
    */
-  areaId: string | number;
+  areaId: string;
 
   /**
    * 车位id
    */
-  parkingId: string | number;
+  parkingId: string;
 
   /**
    * 持有人id(住户表id)

src/api/system/house/index.ts

@@ -13,10 +13,11 @@ export function getBuildinglistAPI(): AxiosPromise<BuildingVo[]> {
   });
 }
 /** 获取所有楼栋 */
-export function getBuildinglists(): AxiosPromise<BuildingVo[]> {
+export function getBuildinglists(query = {}): AxiosPromise<BuildingVo[]> {
   return request({
     url: '/building/list',
-    method: 'get'
+    method: 'get',
+    params: query
   });
 }
 /** 获取单一楼栋 */
@@ -162,6 +163,8 @@ export interface Storeroom {
   shareArea: string;
   storeroomId: number;
   storeroomNo: string;
+  remark: string;
+  unitNoId: string;
   unitNo: number;
 }
 

src/api/system/houseRental/index.ts

@@ -81,3 +81,9 @@ export const uploadHouseImage = (formdata: FormData): AxiosPromise<uploadHouseIm
     data: formdata
   });
 };
+export const getHouseOwnUser = (houseId: string): AxiosPromise<uploadHouseImagetype> => {
+  return request({
+    url: `/houseRental/ownerName/${houseId}`,
+    method: 'GET'
+  });
+};

src/api/system/houseUse/index.ts

@@ -15,6 +15,13 @@ export const listHouseUseType = (query?: HouseUseTypeQuery): AxiosPromise<HouseU
     params: query
   });
 };
+export const listHouseUseType_add_house = (query?: HouseUseTypeQuery): AxiosPromise<HouseUseTypeVO[]> => {
+  return request({
+    url: '/houseUseType/getList',
+    method: 'get',
+    params: query
+  });
+};
 
 /**
  * 查询房屋类型详细

src/api/system/resident/type.ts

@@ -90,9 +90,12 @@ export interface ResidentForm extends BaseEntity {
   name?: string;
 
   /**
-   * 0业主  1租户
+   * 0业主
+   * 1亲属
+   * 2租户
+   * 3朋友
    */
-  type?: string;
+  ownerRelationship?: string;
 
   /**
    * 0 男性 1女性
@@ -152,10 +155,12 @@ export interface ResidentQuery extends PageQuery {
   date?: any;
 
   /**
-   * 住户类型
-   * 0业主  1租户
+   * 0业主
+   * 1亲属
+   * 2租户
+   * 3朋友
    */
-  type?: string;
+  ownerRelationship?: string;
   /**
    * 住户状态
    * 0审核中 1 已认证
@@ -165,5 +170,5 @@ export interface ResidentQuery extends PageQuery {
   houseId?: number;
   villageId?: string;
   buildingId?: number;
-  unitNo?: number;
+  unitNoId?: number;
 }

src/api/system/storeroom/index.ts

@@ -68,11 +68,11 @@ export const delStoreroom = (id: string | number | Array<string | number>) => {
  */
 
 export const GetVillagelistStoreroom = (
-  data: { villageid: string; unitNo: string; houseId?: string; buildingId: string } = {
+  data: { villageid: string; unitNoId: string; houseId?: string; buildingId: string } = {
     villageid: null,
     buildingId: null,
     houseId: null,
-    unitNo: null
+    unitNoId: null
   }
 ): AxiosPromise<StoreroomVO[]> => {
   return request({
@@ -81,7 +81,7 @@ export const GetVillagelistStoreroom = (
     data: {
       villageId: data.villageid,
       buildingId: data.buildingId,
-      unitNo: data.unitNo,
+      unitNoId: data.unitNoId,
       houseId: data.houseId
     }
   });

src/api/system/storeroom/types.ts

@@ -12,7 +12,8 @@ export interface StoreroomVO {
   /**
    * 单元号
    */
-  unitNo: string | number;
+  unitNoId: string | number;
+  unitName: string;
 
   /**
    * 储藏室号