傅行帆 5 年前
父节点
当前提交
d945ad91d8

+ 4
- 1
src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java 查看文件

184
             return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
184
             return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
185
         }
185
         }
186
         taUser.setLoginPassword("");
186
         taUser.setLoginPassword("");
187
-        String token = JWTUtils.newToken(taUser.getUserId().toString());
187
+        Map map = new HashMap();
188
+        map.put("userId",taUser.getUserId().toString());
189
+        map.put("orgId",taUser.getOrgId().toString());
190
+        String token = JWTUtils.newTokenByMap(map);
188
     
191
     
189
         //保存token
192
         //保存token
190
         saveToken(token);
193
         saveToken(token);

+ 2
- 1
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java 查看文件

74
                                              @RequestParam(required = false)String name,
74
                                              @RequestParam(required = false)String name,
75
                                              @RequestParam(required = false)Integer cityId,
75
                                              @RequestParam(required = false)Integer cityId,
76
                                              @RequestParam(required = false)String buildingId,
76
                                              @RequestParam(required = false)String buildingId,
77
+                                             @RequestParam(required = false)String title,
77
                                              @RequestParam(required = false)String isEnlist,
78
                                              @RequestParam(required = false)String isEnlist,
78
                                              @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time){
79
                                              @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time){
79
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time);
80
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title);
80
         return responseBean;
81
         return responseBean;
81
     }
82
     }
82
 
83
 

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaBuildingDynamicMapper.java 查看文件

27
      * @param page
27
      * @param page
28
      * @return
28
      * @return
29
      */
29
      */
30
-    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId,@Param("isEnlist") String isEnlist,@Param("time")LocalDateTime time);
30
+    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId,@Param("isEnlist") String isEnlist,@Param("time")LocalDateTime time,@Param("title") String title);
31
 
31
 
32
     /**
32
     /**
33
      * 详情
33
      * 详情

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java 查看文件

25
      * 项目动态管理列表
25
      * 项目动态管理列表
26
      * @return
26
      * @return
27
      */
27
      */
28
-    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time);
28
+    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title);
29
 
29
 
30
     /**
30
     /**
31
      * 项目详情
31
      * 项目详情

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java 查看文件

64
         binder.registerCustomEditor(Date.class, editor);
64
         binder.registerCustomEditor(Date.class, editor);
65
     }
65
     }
66
     @Override
66
     @Override
67
-    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time) {
67
+    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title) {
68
         Page<TaBuildingDynamic> page = new Page<>();
68
         Page<TaBuildingDynamic> page = new Page<>();
69
         page.setSize(pageSize == null ? 10 : pageSize);
69
         page.setSize(pageSize == null ? 10 : pageSize);
70
         page.setCurrent(pageNum == null ? 1 : pageNum);
70
         page.setCurrent(pageNum == null ? 1 : pageNum);
71
 
71
 
72
-        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time);
72
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title);
73
         List<TaBuildingDynamic> buildingDynamicList = buildingDynamic.getRecords();
73
         List<TaBuildingDynamic> buildingDynamicList = buildingDynamic.getRecords();
74
         for (TaBuildingDynamic taBuildingDynamic:buildingDynamicList){
74
         for (TaBuildingDynamic taBuildingDynamic:buildingDynamicList){
75
             QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist= new QueryWrapper<>();
75
             QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist= new QueryWrapper<>();

+ 3
- 0
src/main/resources/mapper/TaBuildingDynamicMapper.xml 查看文件

30
         <if test="cityId != 0 and cityId != null">
30
         <if test="cityId != 0 and cityId != null">
31
             and city_id = #{cityId}
31
             and city_id = #{cityId}
32
         </if>
32
         </if>
33
+        <if test="title != null and title != ''">
34
+            and title = #{title}
35
+        </if>
33
         <if test="time != null">
36
         <if test="time != null">
34
             and TO_DAYS(create_date) = TO_DAYS(#{time})
37
             and TO_DAYS(create_date) = TO_DAYS(#{time})
35
         </if>
38
         </if>