胡轶钦 5 år sedan
förälder
incheckning
b73ff6e032

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaBuildingController.java Visa fil

156
             @RequestParam(defaultValue = "1") Integer pageNum,
156
             @RequestParam(defaultValue = "1") Integer pageNum,
157
             @RequestParam(defaultValue = "10")Integer pageSize,
157
             @RequestParam(defaultValue = "10")Integer pageSize,
158
             @RequestParam(defaultValue = "false") Boolean mine,
158
             @RequestParam(defaultValue = "false") Boolean mine,
159
-            @RequestParam(required = false) int cityId,
159
+            @RequestParam(required = false) Integer cityId,
160
             String name,
160
             String name,
161
             HttpServletRequest request
161
             HttpServletRequest request
162
     ){
162
     ){

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Visa fil

63
     public ResponseBean iBuildingDynamicList(@RequestParam("pageNum")Integer pageNum,
63
     public ResponseBean iBuildingDynamicList(@RequestParam("pageNum")Integer pageNum,
64
                                              @RequestParam("pageSize")Integer pageSize,
64
                                              @RequestParam("pageSize")Integer pageSize,
65
                                              @RequestParam(required = false)String name,
65
                                              @RequestParam(required = false)String name,
66
-                                             @RequestParam(required = false)int cityId,
66
+                                             @RequestParam(required = false)Integer cityId,
67
                                              @RequestParam(required = false)String buildingId,
67
                                              @RequestParam(required = false)String buildingId,
68
                                              HttpSession session){
68
                                              HttpSession session){
69
         ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId);
69
         ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId);

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaNewsController.java Visa fil

78
     public ResponseBean wxTaNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
78
     public ResponseBean wxTaNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
79
                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
79
                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
80
                                      @RequestParam(required = false) String buildingId,
80
                                      @RequestParam(required = false) String buildingId,
81
-                                     @RequestParam(required = false) int cityId,
81
+                                     @RequestParam(required = false) Integer cityId,
82
                                      @RequestParam(defaultValue = "false") Boolean mine,
82
                                      @RequestParam(defaultValue = "false") Boolean mine,
83
                                      HttpServletRequest request
83
                                      HttpServletRequest request
84
     ){
84
     ){

+ 3
- 4
src/main/java/com/huiju/estateagents/controller/TdCityController.java Visa fil

116
 
116
 
117
     /**
117
     /**
118
      * 修改对象
118
      * 修改对象
119
-     * @param id  实体ID
120
      * @param tdCity 实体对象
119
      * @param tdCity 实体对象
121
      * @return
120
      * @return
122
      */
121
      */
123
-    @RequestMapping(value="/tdCity/{id}",method= RequestMethod.PUT)
124
-    public ResponseBean tdCityUpdate(@PathVariable Integer id,
122
+    @RequestMapping(value="/edit/tdCity/",method= RequestMethod.PUT)
123
+    public ResponseBean tdCityUpdate(@PathVariable List<TdCity> cities,
125
                                         @RequestBody TdCity tdCity){
124
                                         @RequestBody TdCity tdCity){
126
         ResponseBean responseBean = new ResponseBean();
125
         ResponseBean responseBean = new ResponseBean();
127
         try {
126
         try {
128
-            if (iTdCityService.updateById(tdCity)){
127
+            if (iTdCityService.updateBatchById(cities)){
129
                 responseBean.addSuccess(tdCity);
128
                 responseBean.addSuccess(tdCity);
130
             }else {
129
             }else {
131
                 responseBean.addError("fail");
130
                 responseBean.addError("fail");

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaNewsMapper.java Visa fil

24
      * @param increment
24
      * @param increment
25
      */
25
      */
26
     @Update("UPDATE ta_news  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE news_id = #{newsId}")
26
     @Update("UPDATE ta_news  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE news_id = #{newsId}")
27
-    void setFieldNum(@Param("newsId") String newsId, @Param("field") String field, @Param("increment") int increment);
27
+    void setFieldNum(@Param("newsId") String newsId, @Param("field") String field, @Param("increment") Integer increment);
28
 
28
 
29
 }
29
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TdCityMapper.java Visa fil

18
  */
18
  */
19
 @Mapper
19
 @Mapper
20
 public interface TdCityMapper extends BaseMapper<TdCity> {
20
 public interface TdCityMapper extends BaseMapper<TdCity> {
21
-    List<TdCity> selectCity(@Param("leveltype")String leveltype);
21
+    List<TdCity> selectCity(@Param("leveltype")String leveltype,@Param("status") String status);
22
 
22
 
23
 }
23
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITdCityService.java Visa fil

15
  * @since 2019-08-07
15
  * @since 2019-08-07
16
  */
16
  */
17
 public interface ITdCityService extends IService<TdCity> {
17
 public interface ITdCityService extends IService<TdCity> {
18
-    List<TdCity> selectCity(String leveltype);
18
+    List<TdCity> selectCity(String leveltype,String status);
19
 
19
 
20
 }
20
 }

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TdCityServiceImpl.java Visa fil

22
     @Autowired
22
     @Autowired
23
     TdCityMapper tdCityMapper;
23
     TdCityMapper tdCityMapper;
24
 
24
 
25
-    public List<TdCity> selectCity(String leveltype){
26
-        return tdCityMapper.selectCity(leveltype);
25
+    public List<TdCity> selectCity(String leveltype,String status){
26
+        return tdCityMapper.selectCity(leveltype, status);
27
     }
27
     }
28
 
28
 
29
 }
29
 }

+ 6
- 2
src/main/resources/mapper/TdCityMapper.xml Visa fil

8
 FROM
8
 FROM
9
 	td_city
9
 	td_city
10
 	<where>
10
 	<where>
11
-        <if test="leveltype != '' and leveltype != null">
12
-            leveltype = #{leveltype}
11
+	    1=1
12
+	    <if test="null != status and status != '' ">
13
+         and   status = #{status}
14
+        </if>
15
+        <if test="leveltype != null and leveltype != ''">
16
+        and   leveltype = #{leveltype}
13
         </if>
17
         </if>
14
     </where>
18
     </where>
15
 ORDER BY
19
 ORDER BY