7/10 缴费分析，人员分析 数据对接

src/api/system/Decoration/type.ts

@@ -13,7 +13,8 @@ export interface DecorationVO {
    * 所属房屋id
    */
   houseId: string | number;
-
+  buildingId: string;
+  unitNoId: string;
   /**
    * 申请人姓名
    */

src/api/system/Payment/index.ts

@@ -40,3 +40,110 @@ export const income_statsApi = (datetime?: string): AxiosPromise<IncomeStatsResp
     }
   });
 };
+
+export interface sourceType {
+  'totalPayable': string;
+  'totalReceived': string;
+  'totalPending': string;
+  'parkingFee': string;
+  'parkingFeePercent': string;
+  'propertyFee': string;
+  'propertyFeePercent': string;
+  'utilityFee': string;
+  'utilityFeePercent': string;
+  'shopRent': string;
+  'shopRentPercent': string;
+  'repairFee': string;
+  'repairFeePercent': string;
+  'garbageFee': string;
+  'garbageFeePercent': string;
+}
+// 收入来源 --₧╬.╬
+export const income_scourcApi = (datetime?: string): AxiosPromise<sourceType> => {
+  return request({
+    url: '/api/analysis/income/source',
+    method: 'get',
+    params: {
+      date: datetime
+    }
+  });
+};
+
+
+export interface PayMentMethod {
+  'wechatAmount': string;
+  'wechatPercent': string;
+  'alipayAmount': string;
+  'alipayPercent': string;
+  'offlineAmount': string;
+  'offlinePercent': string;
+}
+// 缴费方式
+export const payment_methodApi = (datetime?: string): AxiosPromise<PayMentMethod> => {
+  return request({
+    url: '/api/analysis/income/payment_method',
+    method: 'get',
+    params: {
+      date: datetime
+    }
+  });
+};
+
+
+export interface Arrears_distrubution {
+  month: number;
+  amount: string;
+}
+// 欠费分布
+export const arrears_distributionApi = (
+  datetime?: string
+): AxiosPromise<{
+  items: Arrears_distrubution[];
+}> => {
+  return request({
+    url: '/api/analysis/income/arrears_distribution',
+    method: 'get',
+    params: {
+      date: datetime
+    }
+  });
+};
+export interface payment_sourceType {
+  'miniProgramAmount': string;
+  'miniProgramPercent': string;
+  'mobileAppAmount': string;
+  'mobileAppPercent': string;
+  'offlineAmount': string;
+  'offlinePercent': string;
+}
+// 缴费来源分析
+export const payment_sourceApi = (datetime?: string): AxiosPromise<payment_sourceType> => {
+  return request({
+    url: '/api/analysis/income/payment_source',
+    method: 'get',
+    params: {
+      date: datetime
+    }
+  });
+};
+
+export interface payment_trendType {
+  'date': string;
+  'paidAmount': string;
+  'unpaidAmount': string;
+}
+
+
+// 缴费走势分析
+export const payment_trendApi = (startDate?: string, endDate?: string): AxiosPromise<{
+  items:payment_trendType[]
+}> => {
+  return request({
+    url: '/api/analysis/income/payment_trend',
+    method: 'get',
+    params: {
+      startDate,
+      endDate,
+    }
+  });
+};

src/api/system/Personnel/index.ts

@@ -8,7 +8,7 @@ import { AxiosPromise } from 'axios';
  */
 
 export const user_movein_list = (query?: {
-  datetime: string;
+  dateTime: string;
 }): AxiosPromise<{
   'villageId': string;
   'villageName': string;
@@ -31,7 +31,7 @@ export const user_movein_list = (query?: {
  */
 
 export const get_movein_user_type = (query?: {
-  datetime: string;
+  dateTime: string;
 }): Promise<{
   'owner': string;
   'ownerRate': string;
@@ -56,7 +56,7 @@ export const get_movein_user_type = (query?: {
  */
 
 export const get_movein_user_sex = (query?: {
-  datetime: string;
+  dateTime: string;
 }): Promise<{
   'man': number;
   'woman': number;
@@ -92,3 +92,22 @@ export const get_movein_moveout_list = (query?: {
     params: query
   });
 };
+
+
+
+export const get_person_age = (query?: {
+  dateTime: string;
+}): AxiosPromise<
+  {
+    'date': string;
+    'moveInCount': number;
+    'moveOutCount': number;
+    'totalCount': number;
+  }[]
+> => {
+  return request({
+    url: '/gender/personAge',
+    method: 'get',
+    params: query
+  });
+};

src/api/system/oss/index.ts

@@ -12,7 +12,7 @@ export function listOss(query: OssQuery): AxiosPromise<OssVO[]> {
 }
 
 // 查询OSS对象基于id串
-export function listByIds(ossId: string | number): AxiosPromise<OssVO[]> {
+export function listByIds(ossId: string): AxiosPromise<OssVO[]> {
   return request({
     url: '/resource/oss/listByIds/' + ossId,
     method: 'get'

src/api/system/resident/type.ts

@@ -4,6 +4,7 @@ export interface ResidentVO {
    */
   userId: string;
   id: string;
+  unitNoId: string;
   /**
    * 住户编号
    */
@@ -79,6 +80,7 @@ export interface ResidentForm extends BaseEntity {
    * 主键  住户管理id
    */
   userId?: string;
+  unitNoId: string;
 
   /**
    * 住户编号