weiximei hace 6 años
padre
commit
74d1dbbffe

+ 3
- 3
CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java Ver fichero

@@ -55,11 +55,11 @@ public class TicketController {
55 55
             @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId", value = "小区编号"),
56 56
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum", value = "第几页"),
57 57
             @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "pageSize", value = "一页多少数据"),
58
-            @ApiImplicitParam(paramType = "path",dataType = "String",name = "type", value = "工单类型 (报修/投诉/联系单)"),
58
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "type", value = "工单类型 (0报修/1投诉/2联系单)"),
59 59
     })
60 60
     public ResponseBean getServiceList(@PathVariable(value = "communityId") String communityId,
61
-                                       @RequestParam(value = "pageNum") Integer pageNum,
62
-                                       @RequestParam(value = "pageSize") Integer pageSize,
61
+                                       @RequestParam(value = "pageNum",defaultValue = "1") Integer pageNum,
62
+                                       @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
63 63
                                        @RequestParam(value = "type") String type,
64 64
                                        HttpSession session) {
65 65
         ResponseBean responseBean = new ResponseBean();

+ 0
- 50
CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpTicket.java Ver fichero

@@ -19,16 +19,6 @@ public class TpTicket {
19 19
 
20 20
     private String repairType;
21 21
 
22
-    private String ticketMatchImg1;
23
-
24
-    private String ticketMatchImg2;
25
-
26
-    private String ticketMatchImg3;
27
-
28
-    private String ticketMatchImg4;
29
-
30
-    private String ticketMatchImg5;
31
-
32 22
     private Integer tpUserId;
33 23
 
34 24
     private String score;
@@ -107,46 +97,6 @@ public class TpTicket {
107 97
         this.repairType = repairType == null ? null : repairType.trim();
108 98
     }
109 99
 
110
-    public String getTicketMatchImg1() {
111
-        return ticketMatchImg1;
112
-    }
113
-
114
-    public void setTicketMatchImg1(String ticketMatchImg1) {
115
-        this.ticketMatchImg1 = ticketMatchImg1 == null ? null : ticketMatchImg1.trim();
116
-    }
117
-
118
-    public String getTicketMatchImg2() {
119
-        return ticketMatchImg2;
120
-    }
121
-
122
-    public void setTicketMatchImg2(String ticketMatchImg2) {
123
-        this.ticketMatchImg2 = ticketMatchImg2 == null ? null : ticketMatchImg2.trim();
124
-    }
125
-
126
-    public String getTicketMatchImg3() {
127
-        return ticketMatchImg3;
128
-    }
129
-
130
-    public void setTicketMatchImg3(String ticketMatchImg3) {
131
-        this.ticketMatchImg3 = ticketMatchImg3 == null ? null : ticketMatchImg3.trim();
132
-    }
133
-
134
-    public String getTicketMatchImg4() {
135
-        return ticketMatchImg4;
136
-    }
137
-
138
-    public void setTicketMatchImg4(String ticketMatchImg4) {
139
-        this.ticketMatchImg4 = ticketMatchImg4 == null ? null : ticketMatchImg4.trim();
140
-    }
141
-
142
-    public String getTicketMatchImg5() {
143
-        return ticketMatchImg5;
144
-    }
145
-
146
-    public void setTicketMatchImg5(String ticketMatchImg5) {
147
-        this.ticketMatchImg5 = ticketMatchImg5 == null ? null : ticketMatchImg5.trim();
148
-    }
149
-
150 100
     public Integer getTpUserId() {
151 101
         return tpUserId;
152 102
     }

+ 3
- 63
CODE/smart-community/app-api/src/main/resources/mapper/TpTicketMapper.xml Ver fichero

@@ -10,11 +10,6 @@
10 10
     <result column="status" property="status" jdbcType="CHAR" />
11 11
     <result column="type" property="type" jdbcType="CHAR" />
12 12
     <result column="repair_type" property="repairType" jdbcType="CHAR" />
13
-    <result column="ticket_match_img1" property="ticketMatchImg1" jdbcType="VARCHAR" />
14
-    <result column="ticket_match_img2" property="ticketMatchImg2" jdbcType="VARCHAR" />
15
-    <result column="ticket_match_img3" property="ticketMatchImg3" jdbcType="VARCHAR" />
16
-    <result column="ticket_match_img4" property="ticketMatchImg4" jdbcType="VARCHAR" />
17
-    <result column="ticket_match_img5" property="ticketMatchImg5" jdbcType="VARCHAR" />
18 13
     <result column="tp_user_id" property="tpUserId" jdbcType="INTEGER" />
19 14
     <result column="score" property="score" jdbcType="VARCHAR" />
20 15
     <result column="comment" property="comment" jdbcType="VARCHAR" />
@@ -24,8 +19,7 @@
24 19
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
25 20
   </resultMap>
26 21
   <sql id="Base_Column_List" >
27
-    id, community_id, ta_user_id, ticket_title, ticket_content, status, type, repair_type, 
28
-    ticket_match_img1, ticket_match_img2, ticket_match_img3, ticket_match_img4, ticket_match_img5, 
22
+    id, community_id, ta_user_id, ticket_title, ticket_content, status, type, repair_type,
29 23
     tp_user_id, score, comment, create_user, create_date, update_user, update_date
30 24
   </sql>
31 25
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -41,16 +35,12 @@
41 35
   <insert id="insert" parameterType="com.community.huiju.model.TpTicket" >
42 36
     insert into tp_ticket (id, community_id, ta_user_id, 
43 37
       ticket_title, ticket_content, status, 
44
-      type, repair_type, ticket_match_img1, 
45
-      ticket_match_img2, ticket_match_img3, ticket_match_img4, 
46
-      ticket_match_img5, tp_user_id, score, 
38
+      type, repair_type, tp_user_id, score,
47 39
       comment, create_user, create_date, 
48 40
       update_user, update_date)
49 41
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER}, 
50 42
       #{ticketTitle,jdbcType=VARCHAR}, #{ticketContent,jdbcType=VARCHAR}, #{status,jdbcType=CHAR}, 
51
-      #{type,jdbcType=CHAR}, #{repairType,jdbcType=CHAR}, #{ticketMatchImg1,jdbcType=VARCHAR}, 
52
-      #{ticketMatchImg2,jdbcType=VARCHAR}, #{ticketMatchImg3,jdbcType=VARCHAR}, #{ticketMatchImg4,jdbcType=VARCHAR}, 
53
-      #{ticketMatchImg5,jdbcType=VARCHAR}, #{tpUserId,jdbcType=INTEGER}, #{score,jdbcType=VARCHAR}, 
43
+      #{type,jdbcType=CHAR}, #{repairType,jdbcType=CHAR}, #{tpUserId,jdbcType=INTEGER}, #{score,jdbcType=VARCHAR},
54 44
       #{comment,jdbcType=VARCHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
55 45
       #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
56 46
   </insert>
@@ -81,21 +71,6 @@
81 71
       <if test="repairType != null" >
82 72
         repair_type,
83 73
       </if>
84
-      <if test="ticketMatchImg1 != null" >
85
-        ticket_match_img1,
86
-      </if>
87
-      <if test="ticketMatchImg2 != null" >
88
-        ticket_match_img2,
89
-      </if>
90
-      <if test="ticketMatchImg3 != null" >
91
-        ticket_match_img3,
92
-      </if>
93
-      <if test="ticketMatchImg4 != null" >
94
-        ticket_match_img4,
95
-      </if>
96
-      <if test="ticketMatchImg5 != null" >
97
-        ticket_match_img5,
98
-      </if>
99 74
       <if test="tpUserId != null" >
100 75
         tp_user_id,
101 76
       </if>
@@ -143,21 +118,6 @@
143 118
       <if test="repairType != null" >
144 119
         #{repairType,jdbcType=CHAR},
145 120
       </if>
146
-      <if test="ticketMatchImg1 != null" >
147
-        #{ticketMatchImg1,jdbcType=VARCHAR},
148
-      </if>
149
-      <if test="ticketMatchImg2 != null" >
150
-        #{ticketMatchImg2,jdbcType=VARCHAR},
151
-      </if>
152
-      <if test="ticketMatchImg3 != null" >
153
-        #{ticketMatchImg3,jdbcType=VARCHAR},
154
-      </if>
155
-      <if test="ticketMatchImg4 != null" >
156
-        #{ticketMatchImg4,jdbcType=VARCHAR},
157
-      </if>
158
-      <if test="ticketMatchImg5 != null" >
159
-        #{ticketMatchImg5,jdbcType=VARCHAR},
160
-      </if>
161 121
       <if test="tpUserId != null" >
162 122
         #{tpUserId,jdbcType=INTEGER},
163 123
       </if>
@@ -205,21 +165,6 @@
205 165
       <if test="repairType != null" >
206 166
         repair_type = #{repairType,jdbcType=CHAR},
207 167
       </if>
208
-      <if test="ticketMatchImg1 != null" >
209
-        ticket_match_img1 = #{ticketMatchImg1,jdbcType=VARCHAR},
210
-      </if>
211
-      <if test="ticketMatchImg2 != null" >
212
-        ticket_match_img2 = #{ticketMatchImg2,jdbcType=VARCHAR},
213
-      </if>
214
-      <if test="ticketMatchImg3 != null" >
215
-        ticket_match_img3 = #{ticketMatchImg3,jdbcType=VARCHAR},
216
-      </if>
217
-      <if test="ticketMatchImg4 != null" >
218
-        ticket_match_img4 = #{ticketMatchImg4,jdbcType=VARCHAR},
219
-      </if>
220
-      <if test="ticketMatchImg5 != null" >
221
-        ticket_match_img5 = #{ticketMatchImg5,jdbcType=VARCHAR},
222
-      </if>
223 168
       <if test="tpUserId != null" >
224 169
         tp_user_id = #{tpUserId,jdbcType=INTEGER},
225 170
       </if>
@@ -253,11 +198,6 @@
253 198
       status = #{status,jdbcType=CHAR},
254 199
       type = #{type,jdbcType=CHAR},
255 200
       repair_type = #{repairType,jdbcType=CHAR},
256
-      ticket_match_img1 = #{ticketMatchImg1,jdbcType=VARCHAR},
257
-      ticket_match_img2 = #{ticketMatchImg2,jdbcType=VARCHAR},
258
-      ticket_match_img3 = #{ticketMatchImg3,jdbcType=VARCHAR},
259
-      ticket_match_img4 = #{ticketMatchImg4,jdbcType=VARCHAR},
260
-      ticket_match_img5 = #{ticketMatchImg5,jdbcType=VARCHAR},
261 201
       tp_user_id = #{tpUserId,jdbcType=INTEGER},
262 202
       score = #{score,jdbcType=VARCHAR},
263 203
       comment = #{comment,jdbcType=VARCHAR},

BIN
文档/需求/app接口需求-第二版.xlsx Ver fichero