dingxin преди 6 години
родител
ревизия
f22ec0855b

+ 13
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpTicketRecordComment.java Целия файл

@@ -30,6 +30,19 @@ public class TpTicketRecordComment {
30 30
 
31 31
     private List<TdImages> imgURL;
32 32
 
33
+    /**
34
+     * 对话图片
35
+     */
36
+    private List<String> recordCommentURL;
37
+
38
+    public void setRecordCommentURL(List<String> recordCommentURL) {
39
+        this.recordCommentURL = recordCommentURL;
40
+    }
41
+
42
+    public List<String> getRecordCommentURL() {
43
+        return recordCommentURL;
44
+    }
45
+
33 46
     public List<TdImages> getImgURL() {
34 47
         return imgURL;
35 48
     }

+ 13
- 2
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java Целия файл

@@ -1204,8 +1204,14 @@ public class SocialServiceImpl implements SocialServiceI {
1204 1204
         ticketVO.setTpUserNmae(tpUserMapper.selectByIdUserName(ticketVO.getTpUserId()));
1205 1205
         /*查询所有物业的人员,并排除自身*/
1206 1206
         ticketVO.setTpUsersList(tpUserMapper.getUser(tpUser.getId(), communityId));
1207
-        /*本人*/
1207
+        /*本人id,为受理人为自己时准备*/
1208 1208
         ticketVO.setCurrentUserName(tpUser.getId()+"");
1209
+        /*当前工单发起人房产*/
1210
+        ticketVO.setHouseProperty(taUserVerify.getPhaseName()+taUserVerify.getBuildingName()+taUserVerify.getUnitName()+taUserVerify.getLevelName()+taUserVerify.getRoomNoName());
1211
+
1212
+
1213
+
1214
+
1209 1215
 
1210 1216
 
1211 1217
         /*查询工单类容的图片*/
@@ -1228,7 +1234,12 @@ public class SocialServiceImpl implements SocialServiceI {
1228 1234
             for (TpTicketRecordComment tpTicketRecordComment : tpTicketRecordCommentList) {
1229 1235
                 /*注意reply用于标记工单回复类的图片*/
1230 1236
                 List<TdImages> ticketRecordCommentImages = tdImagesMapper.selectImages(tpTicketRecordComment.getId(),"reply");
1231
-                tpTicketRecordComment.setImgURL(ticketRecordCommentImages);
1237
+                /*图片List*/
1238
+                List<String> imgList= new ArrayList<>();
1239
+                for (TdImages img:ticketRecordCommentImages) {
1240
+                    imgList.add(img.getImageUrl());
1241
+                }
1242
+                tpTicketRecordComment.setRecordCommentURL(imgList);
1232 1243
             }
1233 1244
         }
1234 1245
         /*根据状态得到相应的步骤名称*/

+ 5
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TpTicketVO.java Целия файл

@@ -116,4 +116,9 @@ public class TpTicketVO extends TpTicket {
116 116
      * 工单流程
117 117
      */
118 118
     private List<TpTicketRecord> recordList;
119
+
120
+    /**
121
+     * 工单创建人房产
122
+     */
123
+    private  String houseProperty;
119 124
 }

+ 7
- 7
CODE/smart-community/app-api/src/main/resources/mapper/TpUserMapper.xml Целия файл

@@ -200,13 +200,13 @@
200 200
 
201 201
   <select id="getUser" resultType="com.community.huiju.model.TpUser">
202 202
         SELECT
203
-        tu.create_user,
204
-        tu.create_date,
205
-        tu.update_date,
206
-        tu.user_name,
207
-        tu.remark,
208
-        tu.login_name,
209
-        tu.status,
203
+        tu.create_user as createUser,
204
+        tu.create_date as createDate,
205
+        tu.update_date as updateDate,
206
+        tu.user_name as userName,
207
+        tu.remark as remark,
208
+        tu.login_name as loginName,
209
+        tu.status as status,
210 210
         tu.id
211 211
         FROM
212 212
          tp_user tu

+ 12
- 11
VUECODE/smart-property-manage/src/views/shop/shopReplay/index.vue Целия файл

@@ -225,15 +225,15 @@ export default {
225 225
       return value
226 226
     },
227 227
     enditandAdd(state){
228
-      const ids = this.deleteIds
229
-      if (ids.length < 1) {
230
-        this.$message.error('请选择一行数据进行修改!')
231
-        return
232
-      }
233
-      if (ids.length > 1 ) {
234
-        this.$message.error('只能选择一行数据进行修改!')
235
-        return
236
-      }  
228
+      // const ids = this.deleteIds
229
+      // if (ids.length < 1) {
230
+      //   this.$message.error('请选择一行数据进行修改!')
231
+      //   return
232
+      // }
233
+      // if (ids.length > 1 ) {
234
+      //   this.$message.error('只能选择一行数据进行修改!')
235
+      //   return
236
+      // }  
237 237
       this.shopAppraisalStatus(state)
238 238
    
239 239
     },
@@ -325,6 +325,7 @@ export default {
325 325
                   message: '请先回复当前评价内容',
326 326
                   type: 'warning'
327 327
                 });
328
+                this.listQuery.content = ''
328 329
                 return                
329 330
              }
330 331
               this.listQuery.replayContent = res.data.shopAppraisalReplay.replayContent
@@ -354,11 +355,11 @@ export default {
354 355
           inputPattern: /^[0-9]*$/,
355 356
           inputErrorMessage: '请输入数字'
356 357
         }).then(({ value }) => {
357
-          this.shopAppraisalStatus(value,id)
358
+          this.ShopAppraisalSort(value,id)
358 359
         }).catch(() => {   
359 360
         });
360 361
       },
361
-      shopAppraisalStatus(sort,id){
362
+      ShopAppraisalSort(sort,id){
362 363
         this.listQuery.sort = sort
363 364
         this.listQuery.id = id
364 365
       this.$store.dispatch('shopType/ShopAppraisalSort', this.listQuery).then((res) => {