张延森 4 år sedan
förälder
incheckning
21e1dbab77
29 ändrade filer med 376 tillägg och 16 borttagningar
  1. 1
    1
      pom.xml
  2. 3
    0
      src/main/java/com/huiju/estateagents/mapper/TaActivityDynamicEnlistMapper.java
  3. 4
    0
      src/main/java/com/huiju/estateagents/mapper/TaPointsExchangeMapper.java
  4. 108
    10
      src/main/java/com/huiju/estateagents/property/controller/IndexCountController.java
  5. 4
    0
      src/main/java/com/huiju/estateagents/property/dao/TaUserVerifyMapper.java
  6. 3
    0
      src/main/java/com/huiju/estateagents/property/dao/TpBillOrderMapper.java
  7. 4
    0
      src/main/java/com/huiju/estateagents/property/dao/TpBuildingOwnerInfoMapper.java
  8. 2
    0
      src/main/java/com/huiju/estateagents/property/dao/TpRoomNoMapper.java
  9. 6
    0
      src/main/java/com/huiju/estateagents/property/dao/TpTicketMapper.java
  10. 2
    0
      src/main/java/com/huiju/estateagents/property/service/BuildingTreeServiceI.java
  11. 4
    0
      src/main/java/com/huiju/estateagents/property/service/IBillService.java
  12. 5
    0
      src/main/java/com/huiju/estateagents/property/service/IBuildingOwnerInfoService.java
  13. 4
    0
      src/main/java/com/huiju/estateagents/property/service/ITaUserVerifyService.java
  14. 9
    0
      src/main/java/com/huiju/estateagents/property/service/TpTicketService.java
  15. 10
    0
      src/main/java/com/huiju/estateagents/property/service/impl/BillServiceImpl.java
  16. 10
    0
      src/main/java/com/huiju/estateagents/property/service/impl/BuildingOwnerInfoServiceImpl.java
  17. 5
    0
      src/main/java/com/huiju/estateagents/property/service/impl/BuildingTreeServiceImpl.java
  18. 10
    0
      src/main/java/com/huiju/estateagents/property/service/impl/TaUserVerifyServiceImpl.java
  19. 15
    0
      src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java
  20. 3
    0
      src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java
  21. 2
    0
      src/main/java/com/huiju/estateagents/service/ITaPointsExchangeService.java
  22. 6
    4
      src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java
  23. 5
    0
      src/main/java/com/huiju/estateagents/service/impl/TaPointsExchangeServiceImpl.java
  24. 21
    1
      src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml
  25. 33
    0
      src/main/resources/mapper/property/BillOrderMapper.xml
  26. 30
    0
      src/main/resources/mapper/property/TaUserVerifyMapper.xml
  27. 21
    0
      src/main/resources/mapper/property/TpBuildingOwnerInfoMapper.xml
  28. 12
    0
      src/main/resources/mapper/property/TpRoomNoMapper.xml
  29. 34
    0
      src/main/resources/mapper/property/TpTicketMapper.xml

+ 1
- 1
pom.xml Visa fil

@@ -10,7 +10,7 @@
10 10
 	</parent>
11 11
 	<groupId>com.huiju</groupId>
12 12
 	<artifactId>xiangsong</artifactId>
13
-	<version>1.0.56</version>
13
+	<version>1.0.58</version>
14 14
 	<name>xiangsong</name>
15 15
 	<description>香颂</description>
16 16
 

+ 3
- 0
src/main/java/com/huiju/estateagents/mapper/TaActivityDynamicEnlistMapper.java Visa fil

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
8 8
 import org.apache.ibatis.annotations.Param;
9 9
 
10 10
 import java.util.List;
11
+import java.util.Map;
11 12
 
12 13
 /**
13 14
  * <p>
@@ -46,4 +47,6 @@ public interface TaActivityDynamicEnlistMapper extends BaseMapper<TaActivityDyna
46 47
      * @return
47 48
      */
48 49
     List<HelpInitiateRecordSucceed> getTaActivityDynamicEnlistExport(@Param("pageCode") int i, @Param("pageSize") Integer pageSize, @Param("dynamicId") String dynamicId, @Param("isCheckin") String isCheckin, @Param("name") String name, @Param("phone") String phone,@Param("orgId") Integer orgId);
50
+
51
+    Map<String, Integer> getLastActEnlistNum(Integer orgId);
49 52
 }

+ 4
- 0
src/main/java/com/huiju/estateagents/mapper/TaPointsExchangeMapper.java Visa fil

@@ -6,6 +6,7 @@ import com.huiju.estateagents.entity.TaPersonBuilding;
6 6
 import com.huiju.estateagents.entity.TaPointsExchange;
7 7
 import org.apache.ibatis.annotations.Mapper;
8 8
 import org.apache.ibatis.annotations.Param;
9
+import org.apache.ibatis.annotations.Select;
9 10
 
10 11
 import java.util.List;
11 12
 
@@ -21,4 +22,7 @@ import java.util.List;
21 22
 public interface TaPointsExchangeMapper extends BaseMapper<TaPointsExchange> {
22 23
 	
23 24
 	List<TaPointsExchange> selectListByParams(Page page,@Param("taPointsExchange") TaPointsExchange taPointsExchange, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
25
+
26
+	@Select("select count(*) from ta_points_exchange t where t.org_id = #{orgId}")
27
+    int getTotalNum(Integer orgId);
24 28
 }

+ 108
- 10
src/main/java/com/huiju/estateagents/property/controller/IndexCountController.java Visa fil

@@ -3,19 +3,17 @@ package com.huiju.estateagents.property.controller;
3 3
 import com.huiju.estateagents.base.BaseController;
4 4
 import com.huiju.estateagents.base.ResponseBean;
5 5
 import com.huiju.estateagents.center.taUser.entity.TaUser;
6
-import com.huiju.estateagents.property.common.UserElement;
7
-import com.huiju.estateagents.property.service.IndexCountServiceI;
6
+import com.huiju.estateagents.property.service.*;
8 7
 import com.google.common.collect.Maps;
9
-import io.swagger.annotations.ApiImplicitParam;
8
+import com.huiju.estateagents.service.ITaBuildingDynamicService;
9
+import com.huiju.estateagents.service.ITaPointsExchangeService;
10 10
 import io.swagger.annotations.ApiImplicitParams;
11
-import io.swagger.annotations.ApiOperation;
12 11
 import org.springframework.beans.factory.annotation.Autowired;
13
-import org.springframework.web.bind.annotation.RequestMapping;
14
-import org.springframework.web.bind.annotation.RequestMethod;
15
-import org.springframework.web.bind.annotation.RestController;
12
+import org.springframework.web.bind.annotation.*;
16 13
 
17 14
 import javax.servlet.http.HttpServletRequest;
18
-import javax.servlet.http.HttpSession;
15
+import java.util.HashMap;
16
+import java.util.List;
19 17
 import java.util.Map;
20 18
 
21 19
 /**
@@ -23,12 +21,33 @@ import java.util.Map;
23 21
  * @date 2019-05-28
24 22
  */
25 23
 @RestController
26
-@RequestMapping("/")
24
+@RequestMapping("/api")
27 25
 public class IndexCountController extends BaseController {
28 26
 	
29 27
 	@Autowired
30 28
 	private IndexCountServiceI indexCountService;
31
-	
29
+
30
+	@Autowired
31
+	BuildingTreeServiceI buildingTreeService;
32
+
33
+	@Autowired
34
+	IBuildingOwnerInfoService iBuildingOwnerInfoService;
35
+
36
+	@Autowired
37
+	IBillService iBillService;
38
+
39
+	@Autowired
40
+	TpTicketService tpTicketService;
41
+
42
+	@Autowired
43
+	ITaUserVerifyService iTaUserVerifyService;
44
+
45
+	@Autowired
46
+	ITaPointsExchangeService iTaPointsExchangeService;
47
+
48
+	@Autowired
49
+	ITaBuildingDynamicService iTaBuildingDynamicService;
50
+
32 51
 	// @ApiOperation(value = "获取物业端首页所有统计数据", notes = "获取物业端首页所有统计数据")
33 52
 	@ApiImplicitParams({
34 53
 
@@ -47,4 +66,83 @@ public class IndexCountController extends BaseController {
47 66
 		responseBean.addSuccess(indexCountMap);
48 67
 		return responseBean;
49 68
 	}
69
+
70
+	@GetMapping("/admin/dashboard/statis")
71
+	public ResponseBean getDashboardStatis(@RequestParam("startDate") String startDate,
72
+										   @RequestParam("endDate") String endDate,
73
+										   HttpServletRequest request) {
74
+		Integer orgId = getOrgId(request);
75
+
76
+		// 楼栋
77
+		int buildingNum = buildingTreeService.getRoomNum(orgId);
78
+		// 业主
79
+		int propNum = iBuildingOwnerInfoService.getAvailableProp(orgId);
80
+		// 缴费
81
+		int houseNum = iBillService.getBillHouse(orgId, startDate, endDate);
82
+		// 工单
83
+		int ticketNum = tpTicketService.getTicketNum(orgId, startDate, endDate);
84
+
85
+		Map<String, Object> res = new HashMap<>();
86
+		res.put("buildingNum", buildingNum);
87
+		res.put("propNum", propNum);
88
+		res.put("houseNum", houseNum);
89
+		res.put("ticketNum", ticketNum);
90
+
91
+		return ResponseBean.success(res);
92
+	}
93
+
94
+	@GetMapping("/admin/dashboard/dynamic")
95
+	public ResponseBean getDashboardDynamic(@RequestParam("startDate") String startDate,
96
+										   @RequestParam("endDate") String endDate,
97
+										   HttpServletRequest request) {
98
+		Integer orgId = getOrgId(request);
99
+
100
+		// 工单
101
+		List<Map<String, Object>> ticketList = tpTicketService.getTicketMapList(orgId, startDate, endDate);
102
+
103
+		// 业主
104
+		List<Map<String, Object>> propList = iTaUserVerifyService.getVerifyMapList(orgId, startDate, endDate);
105
+
106
+		// 缴费
107
+		List<Map<String, Object>> billList = iBillService.getBillMapList(orgId, startDate, endDate);
108
+
109
+		Map<String, Object> res = new HashMap<>();
110
+		res.put("ticketList", ticketList);
111
+		res.put("propList", propList);
112
+		res.put("billList", billList);
113
+
114
+		return ResponseBean.success(res);
115
+	}
116
+
117
+
118
+	@GetMapping("/admin/dashboard/house-verified")
119
+	public ResponseBean getDashboardHouseVerified(HttpServletRequest request) {
120
+		Integer orgId = getOrgId(request);
121
+
122
+		Map<String, Object> houseList = iBuildingOwnerInfoService.getVerifyNum(orgId);
123
+
124
+		return ResponseBean.success(houseList);
125
+	}
126
+
127
+	@GetMapping("/admin/dashboard/tips")
128
+	public ResponseBean getDashboardTips(HttpServletRequest request) {
129
+		Integer orgId = getOrgId(request);
130
+
131
+		// 待处理工单
132
+		int ticketNum = tpTicketService.getStartNum(orgId);
133
+		// 待审核业主
134
+		int verifyNum = iTaUserVerifyService.getNoVerifyNum(orgId);
135
+		// 兑换列表
136
+		int exchangeNum = iTaPointsExchangeService.getTotalNum(orgId);
137
+		// 近期在进行的活动
138
+		Map<String, Integer> enlistNum = iTaBuildingDynamicService.getLastActEnlistNum(orgId);
139
+
140
+		Map<String, Object> res = new HashMap<>();
141
+		res.put("ticketNum", ticketNum);
142
+		res.put("verifyNum", verifyNum);
143
+		res.put("exchangeNum", exchangeNum);
144
+		res.put("enlistNum", enlistNum);
145
+
146
+		return ResponseBean.success(res);
147
+	}
50 148
 }

+ 4
- 0
src/main/java/com/huiju/estateagents/property/dao/TaUserVerifyMapper.java Visa fil

@@ -167,4 +167,8 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
167 167
     Page<Map<String, String>> getPropUserByPaged(Page<Map<String, String>> page, @Param("orgId") Integer orgId);
168 168
 
169 169
     Page<Map<String, String>> getPropUserByBirday(Page<Map<String, String>> page, @Param("orgId") Integer orgId, @Param("birthday") String birthday);
170
+
171
+    List<Map<String, Object>> getVerifyMapList(@Param("orgId") Integer orgId, @Param("startDate") String startDate,@Param("endDate") String endDate);
172
+
173
+    int getNoVerifyNum(Integer orgId);
170 174
 }

+ 3
- 0
src/main/java/com/huiju/estateagents/property/dao/TpBillOrderMapper.java Visa fil

@@ -84,4 +84,7 @@ public interface TpBillOrderMapper extends BaseMapper<TpBillOrder> {
84 84
     List<TpBillOrder> selectByOrderBumber(@Param("orderNumber") String orderNumber);
85 85
 
86 86
 
87
+    int getBillHouse(@Param("orgId") Integer orgId, @Param("startDate") String startDate, @Param("endDate") String endDate);
88
+
89
+    List<Map<String, Object>> getBillMapList(@Param("orgId") Integer orgId, @Param("startDate") String startDate, @Param("endDate") String endDate);
87 90
 }

+ 4
- 0
src/main/java/com/huiju/estateagents/property/dao/TpBuildingOwnerInfoMapper.java Visa fil

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.ResultType;
10 10
 import org.apache.ibatis.annotations.Select;
11 11
 
12 12
 import java.util.List;
13
+import java.util.Map;
13 14
 
14 15
 /**
15 16
  * <p>
@@ -80,4 +81,7 @@ public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInf
80 81
     TpBuildingOwnerInfo selectCommunityIdAndAddressName(@Param("orgId") Integer orgId, @Param("phaseName") String phaseName, @Param("buildingName") Integer buildingName, @Param("unitName") Integer unitName, @Param("levelName") Integer levelName, @Param("roomNoName") Integer roomNoName, @Param("ownerTel") String ownerTel);
81 82
 
82 83
 
84
+    int getAvailableProp(Integer orgId);
85
+
86
+    Map<String, Object> getVerifyNum(Integer orgId);
83 87
 }

+ 2
- 0
src/main/java/com/huiju/estateagents/property/dao/TpRoomNoMapper.java Visa fil

@@ -84,4 +84,6 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
84 84
 
85 85
     @Update("update tp_room_no set level_name = #{levelName} where org_id=#{orgId} and level_id=#{levelId}")
86 86
     int updateLevelName(@Param("orgId") Integer orgId, @Param("levelId") Integer levelId, @Param("levelName") String levelName);
87
+
88
+    int getRoomNum(Integer orgId);
87 89
 }

+ 6
- 0
src/main/java/com/huiju/estateagents/property/dao/TpTicketMapper.java Visa fil

@@ -35,4 +35,10 @@ public interface TpTicketMapper extends BaseMapper<TpTicket> {
35 35
     TpTicket selectTpTicketName(@Param("orgId")Integer orgId, @Param("type")String type, @Param("ticketTitle")String ticketTitle);
36 36
 
37 37
     void updateTpUserId(@Param("ticketId") Integer ticketId);
38
+
39
+    int getTicketNum(@Param("orgId") Integer orgId, @Param("startDate") String startDate, @Param("endDate") String endDate);
40
+
41
+    List<Map<String, Object>> getTicketMapList(@Param("orgId") Integer orgId, @Param("startDate") String startDate,  @Param("endDate") String endDate);
42
+
43
+    int getStartNum(Integer orgId);
38 44
 }

+ 2
- 0
src/main/java/com/huiju/estateagents/property/service/BuildingTreeServiceI.java Visa fil

@@ -54,4 +54,6 @@ public interface BuildingTreeServiceI {
54 54
 	IPage<TpRoomNo> getRoomList(IPage<TpRoomNo> page, Integer orgId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
55 55
 
56 56
 	ResponseBean editNode(Map<String, Object> parameter, Integer orgId);
57
+
58
+    int getRoomNum(Integer orgId);
57 59
 }

+ 4
- 0
src/main/java/com/huiju/estateagents/property/service/IBillService.java Visa fil

@@ -119,4 +119,8 @@ public interface IBillService extends IService<Bill> {
119 119
 	 * @return
120 120
 	 */
121 121
 	ResponseBean getOrderInfo(String orderNumber);
122
+
123
+    int getBillHouse(Integer orgId, String startDate, String endDate);
124
+
125
+    List<Map<String, Object>> getBillMapList(Integer orgId, String startDate, String endDate);
122 126
 }

+ 5
- 0
src/main/java/com/huiju/estateagents/property/service/IBuildingOwnerInfoService.java Visa fil

@@ -8,6 +8,7 @@ import com.huiju.estateagents.property.model.TpBuildingOwnerInfo;
8 8
 import org.springframework.web.multipart.MultipartFile;
9 9
 
10 10
 import java.util.List;
11
+import java.util.Map;
11 12
 
12 13
 /**
13 14
  * <p>
@@ -181,4 +182,8 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
181 182
      * @return
182 183
      */
183 184
     ResponseBean hasBuild(String personId, Integer orgId ,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
185
+
186
+    int getAvailableProp(Integer orgId);
187
+
188
+    Map<String, Object> getVerifyNum(Integer orgId);
184 189
 }

+ 4
- 0
src/main/java/com/huiju/estateagents/property/service/ITaUserVerifyService.java Visa fil

@@ -6,6 +6,7 @@ import com.huiju.estateagents.base.ResponseBean;
6 6
 import com.huiju.estateagents.center.taUser.entity.TaUser;
7 7
 import com.huiju.estateagents.property.model.TaUserVerify;
8 8
 
9
+import java.util.List;
9 10
 import java.util.Map;
10 11
 
11 12
 /**
@@ -97,4 +98,7 @@ public interface ITaUserVerifyService extends IService<TaUserVerify> {
97 98
      */
98 99
     Page<Map<String, String>> getPropUserByBirday(Page<Map<String, String>> page, Integer orgId, String birthday);
99 100
 
101
+    List<Map<String, Object>> getVerifyMapList(Integer orgId, String startDate, String endDate);
102
+
103
+    int getNoVerifyNum(Integer orgId);
100 104
 }

+ 9
- 0
src/main/java/com/huiju/estateagents/property/service/TpTicketService.java Visa fil

@@ -5,8 +5,11 @@ import com.huiju.estateagents.base.ResponseBean;
5 5
 import com.huiju.estateagents.center.taUser.entity.TaUser;
6 6
 import com.huiju.estateagents.property.model.TpTicket;
7 7
 import com.huiju.estateagents.property.model.TpTicketRecordComment;
8
+import org.apache.ibatis.annotations.Param;
8 9
 
9 10
 import java.io.IOException;
11
+import java.util.List;
12
+import java.util.Map;
10 13
 
11 14
 /**
12 15
  * <p>
@@ -178,4 +181,10 @@ public interface TpTicketService extends IService<TpTicket> {
178 181
      * @return
179 182
      */
180 183
     ResponseBean getWorkerList(Integer pageNum, Integer pageSize, Integer userId, Integer orgId);
184
+
185
+    int getTicketNum(@Param("orgId") Integer orgId,@Param("startDate") String startDate,@Param("endDate") String endDate);
186
+
187
+    List<Map<String, Object>> getTicketMapList(Integer orgId, String startDate, String endDate);
188
+
189
+    int getStartNum(Integer orgId);
181 190
 }

+ 10
- 0
src/main/java/com/huiju/estateagents/property/service/impl/BillServiceImpl.java Visa fil

@@ -806,4 +806,14 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
806 806
         return responseBean;
807 807
     }
808 808
 
809
+    @Override
810
+    public int getBillHouse(Integer orgId, String startDate, String endDate) {
811
+        return tpBillOrderMapper.getBillHouse(orgId, startDate, endDate);
812
+    }
813
+
814
+    @Override
815
+    public List<Map<String, Object>> getBillMapList(Integer orgId, String startDate, String endDate) {
816
+        return tpBillOrderMapper.getBillMapList(orgId, startDate, endDate);
817
+    }
818
+
809 819
 }

+ 10
- 0
src/main/java/com/huiju/estateagents/property/service/impl/BuildingOwnerInfoServiceImpl.java Visa fil

@@ -1268,4 +1268,14 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
1268 1268
         responseBean.addSuccess(result);
1269 1269
         return responseBean;
1270 1270
     }
1271
+
1272
+    @Override
1273
+    public int getAvailableProp(Integer orgId) {
1274
+        return tpBuildingOwnerInfoMapper.getAvailableProp(orgId);
1275
+    }
1276
+
1277
+    @Override
1278
+    public Map<String, Object> getVerifyNum(Integer orgId) {
1279
+        return tpBuildingOwnerInfoMapper.getVerifyNum(orgId);
1280
+    }
1271 1281
 }

+ 5
- 0
src/main/java/com/huiju/estateagents/property/service/impl/BuildingTreeServiceImpl.java Visa fil

@@ -653,6 +653,11 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
653 653
 		return ResponseBean.error("数据类型不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
654 654
 	}
655 655
 
656
+	@Override
657
+	public int getRoomNum(Integer orgId) {
658
+		return tpRoomNoMapper.getRoomNum(orgId);
659
+	}
660
+
656 661
 	private void saveBuildingTreeData(Integer orgId, List<TpBuildingOwnerInfo> list) {
657 662
 		String lastPhaseName = "";
658 663
 		String lastBuildingName = "";

+ 10
- 0
src/main/java/com/huiju/estateagents/property/service/impl/TaUserVerifyServiceImpl.java Visa fil

@@ -500,4 +500,14 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
500 500
     public Page<Map<String, String>> getPropUserByBirday(Page<Map<String, String>> page, Integer orgId, String birthday) {
501 501
         return taUserVerifyMapper.getPropUserByBirday(page, orgId, birthday);
502 502
     }
503
+
504
+    @Override
505
+    public List<Map<String, Object>> getVerifyMapList(Integer orgId, String startDate, String endDate) {
506
+        return taUserVerifyMapper.getVerifyMapList(orgId, startDate, endDate);
507
+    }
508
+
509
+    @Override
510
+    public int getNoVerifyNum(Integer orgId) {
511
+        return taUserVerifyMapper.getNoVerifyNum(orgId);
512
+    }
503 513
 }

+ 15
- 0
src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java Visa fil

@@ -1316,4 +1316,19 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
1316 1316
 
1317 1317
         return ResponseBean.success(map);
1318 1318
     }
1319
+
1320
+    @Override
1321
+    public int getTicketNum(Integer orgId, String startDate, String endDate) {
1322
+        return tpTicketMapper.getTicketNum(orgId, startDate, endDate);
1323
+    }
1324
+
1325
+    @Override
1326
+    public List<Map<String, Object>> getTicketMapList(Integer orgId, String startDate, String endDate) {
1327
+        return tpTicketMapper.getTicketMapList(orgId, startDate, endDate);
1328
+    }
1329
+
1330
+    @Override
1331
+    public int getStartNum(Integer orgId) {
1332
+        return tpTicketMapper.getStartNum(orgId);
1333
+    }
1319 1334
 }

+ 3
- 0
src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java Visa fil

@@ -13,6 +13,7 @@ import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
13 13
 import java.time.LocalDateTime;
14 14
 import java.util.HashMap;
15 15
 import java.util.List;
16
+import java.util.Map;
16 17
 
17 18
 /**
18 19
  * <p>
@@ -140,4 +141,6 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
140 141
      * @return
141 142
      */
142 143
     ResponseBean iBuildingDynamicSelectedList(Integer pageNum, Integer pageSize, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus,List<TaPersonBuilding> personBuildingList);
144
+
145
+    Map<String, Integer> getLastActEnlistNum(Integer orgId);
143 146
 }

+ 2
- 0
src/main/java/com/huiju/estateagents/service/ITaPointsExchangeService.java Visa fil

@@ -19,4 +19,6 @@ import java.util.List;
19 19
 public interface ITaPointsExchangeService extends IService<TaPointsExchange> {
20 20
 	
21 21
 	ResponseBean selectList(Integer pageNum, Integer pageSize, TaPointsExchange taPointsExchange, List<TaPersonBuilding> taPersonBuildingList);
22
+
23
+    int getTotalNum(Integer orgId);
22 24
 }

+ 6
- 4
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java Visa fil

@@ -31,10 +31,7 @@ import java.time.Instant;
31 31
 import java.time.LocalDateTime;
32 32
 import java.time.ZoneId;
33 33
 import java.time.ZoneOffset;
34
-import java.util.ArrayList;
35
-import java.util.Date;
36
-import java.util.HashMap;
37
-import java.util.List;
34
+import java.util.*;
38 35
 
39 36
 /**
40 37
  * <p>
@@ -399,6 +396,11 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
399 396
         return ResponseBean.success(hashMap);
400 397
     }
401 398
 
399
+    @Override
400
+    public Map<String, Integer> getLastActEnlistNum(Integer orgId) {
401
+        return taActivityDynamicEnlistMapper.getLastActEnlistNum(orgId);
402
+    }
403
+
402 404
     /**
403 405
      * 获取我的活动列表
404 406
      * @param pageNumber

+ 5
- 0
src/main/java/com/huiju/estateagents/service/impl/TaPointsExchangeServiceImpl.java Visa fil

@@ -42,4 +42,9 @@ public class TaPointsExchangeServiceImpl extends ServiceImpl<TaPointsExchangeMap
42 42
 		page.setRecords(list);
43 43
 		return ResponseBean.success(page);
44 44
 	}
45
+
46
+	@Override
47
+	public int getTotalNum(Integer orgId) {
48
+		return taPointsExchangeMapper.getTotalNum(orgId);
49
+	}
45 50
 }

+ 21
- 1
src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml Visa fil

@@ -37,7 +37,7 @@
37 37
             select ifnull(sum( attend_num ), 0) from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId} and org_id = #{orgId}
38 38
         </select>
39 39
 
40
-    <select id="getTaActivityDynamicEnlistExport" resultType="com.huiju.estateagents.excel.TaActivityDynamicEnlistExport">
40
+    <select id="getTaActivityDynamicEnlistExport" resultType="com.huiju.estateagents.excel.HelpInitiateRecordSucceed">
41 41
 
42 42
         SELECT
43 43
         tade.*,
@@ -66,4 +66,24 @@
66 66
         group by tade.person_id
67 67
         limit #{pageCode}, #{pageSize}
68 68
     </select>
69
+    <select id="getLastActEnlistNum" resultType="java.util.Map">
70
+        SELECT
71
+            t.dynamic_id as dynamicId,
72
+            t.title,
73
+            count( IFNULL( s.attend_num, 0 ) ) as num
74
+        FROM
75
+            ta_building_dynamic t
76
+            LEFT JOIN ta_activity_dynamic_enlist s ON s.dynamic_id = t.dynamic_id
77
+        WHERE
78
+            t.org_id = #{orgId}
79
+            AND t.end_date &gt;= now( )
80
+            AND t.start_date &lt;= now( )
81
+            AND t.`status` = 1
82
+            AND t.is_enlist = 1
83
+        GROUP BY
84
+            t.dynamic_id
85
+        ORDER BY
86
+            t.end_date DESC
87
+        LIMIT 1
88
+    </select>
69 89
 </mapper>

+ 33
- 0
src/main/resources/mapper/property/BillOrderMapper.xml Visa fil

@@ -42,5 +42,38 @@
42 42
         group by tbo.order_bumber
43 43
         order by tbo.create_date DESC
44 44
     </select>
45
+    <select id="getBillHouse" resultType="java.lang.Integer">
46
+        SELECT
47
+            count( * )
48
+        FROM
49
+            tp_bill_order t
50
+        WHERE
51
+            t.org_id = #{orgId}
52
+            AND t.order_status = 1
53
+        <if test="startDate != null and startDate != ''">
54
+            AND DATE_FORMAT(t.create_date, '%Y-%m-%d') &gt;= #{startDate}
55
+        </if>
56
+        <if test="endDate != null and endDate != ''">
57
+            AND DATE_FORMAT(t.update_date, '%Y-%m-%d') &lt;= #{endDate}
58
+        </if>
59
+    </select>
60
+    <select id="getBillMapList" resultType="java.util.Map">
61
+        SELECT
62
+            t.update_date AS createDate,
63
+            s.nickname,
64
+            '' AS content
65
+        FROM
66
+            tp_bill_order t
67
+            INNER JOIN ta_person s ON t.create_user = s.person_id
68
+        WHERE
69
+            t.org_id = #{orgId}
70
+            AND t.order_status = 1
71
+        <if test="startDate != null and startDate != ''">
72
+            AND DATE_FORMAT(t.create_date, '%Y-%m-%d') &gt;= #{startDate}
73
+        </if>
74
+        <if test="endDate != null and endDate != ''">
75
+            AND DATE_FORMAT(t.update_date, '%Y-%m-%d') &lt;= #{endDate}
76
+        </if>
77
+    </select>
45 78
 
46 79
 </mapper>

+ 30
- 0
src/main/resources/mapper/property/TaUserVerifyMapper.xml Visa fil

@@ -121,4 +121,34 @@
121 121
             AND t.id_card like CONCAT('%', #{birthday},'%')
122 122
             AND t.verify_status = 1
123 123
     </select>
124
+    <select id="getVerifyMapList" resultType="java.util.Map">
125
+        SELECT
126
+            t.create_date AS createDate,
127
+            t.owner_name AS nickname,
128
+            CASE
129
+            t.role_id
130
+            WHEN 1 THEN
131
+            '业主'
132
+            WHEN 3 THEN
133
+            '家属' ELSE '租客'
134
+            END AS content
135
+        FROM
136
+            ta_user_verify t
137
+        WHERE
138
+            t.org_id = #{orgId}
139
+        <if test="startDate != null and startDate != ''">
140
+            AND DATE_FORMAT(t.create_date, '%Y-%m-%d') &gt;= #{startDate}
141
+        </if>
142
+        <if test="endDate != null and endDate != ''">
143
+            AND DATE_FORMAT(t.create_date, '%Y-%m-%d') &lt;= #{endDate}
144
+        </if>
145
+    </select>
146
+    <select id="getNoVerifyNum" resultType="java.lang.Integer">
147
+        SELECT count(*)
148
+        FROM
149
+            ta_user_verify t
150
+        WHERE
151
+            t.org_id = #{orgId}
152
+        AND t.verify_status = '0'
153
+    </select>
124 154
 </mapper>

+ 21
- 0
src/main/resources/mapper/property/TpBuildingOwnerInfoMapper.xml Visa fil

@@ -110,4 +110,25 @@
110 110
         </if>
111 111
         order by u.create_date desc
112 112
     </select>
113
+    <select id="getAvailableProp" resultType="java.lang.Integer">
114
+        select count(*)
115
+        from tp_building_owner_info t
116
+        where t.org_id = #{orgId}
117
+        and t.verify_status = 1
118
+    </select>
119
+    <select id="getVerifyNum" resultType="java.util.Map">
120
+        SELECT
121
+            count( DISTINCT t.id ) AS total,
122
+            count( DISTINCT f.room_no_id ) AS valid
123
+        FROM
124
+            tp_room_no t
125
+            INNER JOIN tp_phase s ON s.id = t.phase_id
126
+            INNER JOIN tp_building m ON m.id = t.building_id
127
+            INNER JOIN tp_unit n ON n.id = t.unit_id
128
+            INNER JOIN tp_level q ON q.id = t.level_id
129
+            LEFT JOIN tp_building_owner_info f ON f.room_no_id = t.id
130
+            AND f.verify_status = 1
131
+        WHERE
132
+            t.org_id = #{orgId}
133
+    </select>
113 134
 </mapper>

+ 12
- 0
src/main/resources/mapper/property/TpRoomNoMapper.xml Visa fil

@@ -118,4 +118,16 @@
118 118
         </if>
119 119
         ORDER BY q.id ASC, n.id ASC, m.id ASC, (s.name - 0) DESC
120 120
     </select>
121
+    <select id="getRoomNum" resultType="java.lang.Integer">
122
+        SELECT
123
+            count(1)
124
+        FROM
125
+            tp_room_no t
126
+            INNER JOIN tp_level s ON s.id = t.level_id
127
+            INNER JOIN tp_unit m ON m.id = t.unit_id
128
+            INNER JOIN tp_building n ON n.id = t.building_id
129
+            INNER JOIN tp_phase q ON q.id = t.phase_id
130
+        WHERE
131
+            t.org_id = #{orgId}
132
+    </select>
121 133
 </mapper>

+ 34
- 0
src/main/resources/mapper/property/TpTicketMapper.xml Visa fil

@@ -98,6 +98,40 @@
98 98
      and ticket_title= #{ticketTitle,jdbcType=INTEGER}
99 99
      and type = #{type,jdbcType=VARCHAR}
100 100
   </select>
101
+    <select id="getTicketNum" resultType="java.lang.Integer">
102
+        select
103
+            count(*)
104
+        from tp_ticket t
105
+        where t.org_id = #{orgId}
106
+        <if test="startDate != null and startDate != ''">
107
+            AND DATE_FORMAT(t.create_date, '%Y-%m-%d') &gt;= #{startDate}
108
+        </if>
109
+        <if test="endDate != null and endDate != ''">
110
+            AND DATE_FORMAT(t.create_date, '%Y-%m-%d') &lt;= #{endDate}
111
+        </if>
112
+    </select>
113
+    <select id="getTicketMapList" resultType="java.util.Map">
114
+        select
115
+            t.create_date AS createDate,
116
+            s.nickname,
117
+            t.ticket_title AS content
118
+        from tp_ticket t
119
+        INNER JOIN ta_person s ON t.create_user = s.person_id
120
+        where t.org_id = #{orgId}
121
+        <if test="startDate != null and startDate != ''">
122
+            AND DATE_FORMAT(t.create_date, '%Y-%m-%d') &gt;= #{startDate}
123
+        </if>
124
+        <if test="endDate != null and endDate != ''">
125
+            AND DATE_FORMAT(t.create_date, '%Y-%m-%d') &lt;= #{endDate}
126
+        </if>
127
+    </select>
128
+    <select id="getStartNum" resultType="java.lang.Integer">
129
+        select
130
+        count(*)
131
+        from tp_ticket t
132
+        where t.org_id = #{orgId}
133
+        and t.status = '0'
134
+    </select>
101 135
 
102 136
     <update id="updateTpUserId" parameterType="int" >
103 137
     update tp_ticket