fuxingfan
/
smartCommunity
Watch 1
Star 0
Fork 0
Code Issues 1 Pull Requests 0 Releases 4 Activity
Browse Source

修复 bug

weiximei 6 years ago
parent
ed250bc065 b41ac09169
commit
a4dea00507
4 changed files with 131 additions and 157 deletions
Split View Show Diff Stats
  1. 122
    154
      CODE/smart-community-word/.idea/workspace.xml
  2. 4
    0
      CODE/smart-community/property-api/src/main/java/com/community/huiju/model/Message.java
  3. 2
    1
      CODE/smart-community/property-api/src/main/resources/mapper/MessageMapper.xml
  4. 3
    2
      VUECODE/smart-property-manage/src/views/message/messageIndex.vue

+ 122
- 154
CODE/smart-community-word/.idea/workspace.xml View File 

@@ -2,15 +2,7 @@
2 2 
 <project version="4">
3 3 
   <component name="ChangeListManager">
4 4 
     <list default="true" id="051ae1e0-ece1-4622-91c0-3f05ac339943" name="Default Changelist" comment="">
5 
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/ToCommunitiesMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/ToCommunitiesMapper.java" afterDir="false" />
7 
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java" afterDir="false" />
8 
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java" afterDir="false" />
9 
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java" afterDir="false" />
10 
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/ToCommunitiesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/ToCommunitiesMapper.xml" afterDir="false" />
11 
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketMapper.xml" afterDir="false" />
12 
-      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java" afterDir="false" />
13 
-      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" afterDir="false" />
5 
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/Message.java" afterDir="false" />
14 6 
       <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml" afterDir="false" />
15 7 
     </list>
16 8 
     <ignored path="$PROJECT_DIR$/../smart-community/eureka-sever/target/" />
 
@@ -31,6 +23,24 @@
31 23 
   </component>
32 24 
   <component name="FileEditorManager">
33 25 
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
26 
+      <file pinned="false" current-in-tab="false">
27 
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
28 
+          <provider selected="true" editor-type-id="text-editor">
29 
+            <state relative-caret-position="-3970">
30 
+              <caret line="316" column="9" selection-start-line="316" selection-start-column="9" selection-end-line="316" selection-end-column="9" />
31 
+            </state>
32 
+          </provider>
33 
+        </entry>
34 
+      </file>
35 
+      <file pinned="false" current-in-tab="false">
36 
+        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/Message.java">
37 
+          <provider selected="true" editor-type-id="text-editor">
38 
+            <state relative-caret-position="-2411">
39 
+              <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
40 
+            </state>
41 
+          </provider>
42 
+        </entry>
43 
+      </file>
34 44 
       <file pinned="false" current-in-tab="false">
35 45 
         <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/ToCommunitiesMapper.java">
36 46 
           <provider selected="true" editor-type-id="text-editor">
 
@@ -40,11 +50,48 @@
40 50 
           </provider>
41 51 
         </entry>
42 52 
       </file>
43 
-      <file pinned="false" current-in-tab="true">
53 
+      <file pinned="false" current-in-tab="false">
44 54 
         <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java">
45 55 
           <provider selected="true" editor-type-id="text-editor">
46 
-            <state relative-caret-position="338">
47 
-              <caret line="526" column="37" selection-start-line="526" selection-start-column="12" selection-end-line="526" selection-end-column="37" />
56 
+            <state relative-caret-position="82">
57 
+              <caret line="721" selection-start-line="721" selection-end-line="722" />
58 
+              <folding>
59 
+                <element signature="e#19092#19093#0" expanded="true" />
60 
+                <element signature="e#19153#19154#0" expanded="true" />
61 
+              </folding>
62 
+            </state>
63 
+          </provider>
64 
+        </entry>
65 
+      </file>
66 
+      <file pinned="false" current-in-tab="true">
67 
+        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java">
68 
+          <provider selected="true" editor-type-id="text-editor">
69 
+            <state relative-caret-position="352">
70 
+              <caret line="78" column="2" selection-start-line="78" selection-start-column="2" selection-end-line="78" selection-end-column="2" />
71 
+              <folding>
72 
+                <element signature="imports" expanded="true" />
73 
+              </folding>
74 
+            </state>
75 
+          </provider>
76 
+        </entry>
77 
+      </file>
78 
+      <file pinned="false" current-in-tab="false">
79 
+        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/MessageMapper.java">
80 
+          <provider selected="true" editor-type-id="text-editor">
81 
+            <state relative-caret-position="532">
82 
+              <caret line="59" column="19" selection-start-line="59" selection-start-column="19" selection-end-line="59" selection-end-column="19" />
83 
+              <folding>
84 
+                <element signature="imports" expanded="true" />
85 
+              </folding>
86 
+            </state>
87 
+          </provider>
88 
+        </entry>
89 
+      </file>
90 
+      <file pinned="false" current-in-tab="false">
91 
+        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml">
92 
+          <provider selected="true" editor-type-id="text-editor">
93 
+            <state relative-caret-position="153">
94 
+              <caret line="88" column="74" selection-start-line="88" selection-start-column="74" selection-end-line="88" selection-end-column="74" />
48 95 
             </state>
49 96 
           </provider>
50 97 
         </entry>
 
@@ -93,6 +140,7 @@
93 140 
       <find>评价</find>
94 141 
       <find>终止</find>
95 142 
       <find>举报</find>
143 
+      <find>ReadStatus</find>
96 144 
     </findStrings>
97 145 
   </component>
98 146 
   <component name="Git.Settings">
 
@@ -122,7 +170,6 @@
122 170 
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpMessageMapper.java" />
123 171 
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpMessageMapper.xml" />
124 172 
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/IMessageService.java" />
125 
-        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/Message.java" />
126 173 
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java" />
127 174 
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/MessageController.java" />
128 175 
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/MessageMapper.java" />
 
@@ -132,11 +179,12 @@
132 179 
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketMapper.xml" />
133 180 
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" />
134 181 
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java" />
135 
-        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml" />
136 182 
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java" />
137 183 
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/ToCommunitiesMapper.java" />
138 184 
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/ToCommunitiesMapper.xml" />
139 185 
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java" />
186 
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/Message.java" />
187 
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml" />
140 188 
       </list>
141 189 
     </option>
142 190 
   </component>
 
@@ -180,87 +228,63 @@
180 228 
             <path>
181 229 
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
182 230 
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
183 
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
184 
-            </path>
185 
-            <path>
186 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
187 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
188 
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
189 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
190 
-            </path>
191 
-            <path>
192 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
193 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
194 
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
195 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
196 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
231 
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
197 232 
             </path>
198 233 
             <path>
199 234 
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
200 235 
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
201 
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
236 
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
202 237 
               <item name="src" type="462c0819:PsiDirectoryNode" />
203 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
204 
-              <item name="java" type="462c0819:PsiDirectoryNode" />
205 238 
             </path>
206 239 
             <path>
207 240 
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
208 241 
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
209 
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
242 
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
210 243 
               <item name="src" type="462c0819:PsiDirectoryNode" />
211 244 
               <item name="main" type="462c0819:PsiDirectoryNode" />
212 
-              <item name="java" type="462c0819:PsiDirectoryNode" />
213 
-              <item name="com" type="462c0819:PsiDirectoryNode" />
214 245 
             </path>
215 246 
             <path>
216 247 
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
217 248 
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
218 
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
249 
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
219 250 
               <item name="src" type="462c0819:PsiDirectoryNode" />
220 251 
               <item name="main" type="462c0819:PsiDirectoryNode" />
221 252 
               <item name="java" type="462c0819:PsiDirectoryNode" />
222 
-              <item name="com" type="462c0819:PsiDirectoryNode" />
223 
-              <item name="community" type="462c0819:PsiDirectoryNode" />
224 253 
             </path>
225 254 
             <path>
226 255 
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
227 256 
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
228 
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
257 
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
229 258 
               <item name="src" type="462c0819:PsiDirectoryNode" />
230 259 
               <item name="main" type="462c0819:PsiDirectoryNode" />
231 260 
               <item name="java" type="462c0819:PsiDirectoryNode" />
232 261 
               <item name="com" type="462c0819:PsiDirectoryNode" />
233 
-              <item name="community" type="462c0819:PsiDirectoryNode" />
234 
-              <item name="huiju" type="462c0819:PsiDirectoryNode" />
235 262 
             </path>
236 263 
             <path>
237 264 
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
238 265 
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
239 
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
266 
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
240 267 
               <item name="src" type="462c0819:PsiDirectoryNode" />
241 268 
               <item name="main" type="462c0819:PsiDirectoryNode" />
242 269 
               <item name="java" type="462c0819:PsiDirectoryNode" />
243 270 
               <item name="com" type="462c0819:PsiDirectoryNode" />
244 271 
               <item name="community" type="462c0819:PsiDirectoryNode" />
245 
-              <item name="huiju" type="462c0819:PsiDirectoryNode" />
246 
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
247 272 
             </path>
248 273 
             <path>
249 274 
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
250 275 
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
251 
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
276 
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
252 277 
               <item name="src" type="462c0819:PsiDirectoryNode" />
253 278 
               <item name="main" type="462c0819:PsiDirectoryNode" />
254 279 
               <item name="java" type="462c0819:PsiDirectoryNode" />
255 280 
               <item name="com" type="462c0819:PsiDirectoryNode" />
256 281 
               <item name="community" type="462c0819:PsiDirectoryNode" />
257 282 
               <item name="huiju" type="462c0819:PsiDirectoryNode" />
258 
-              <item name="dao" type="462c0819:PsiDirectoryNode" />
259 283 
             </path>
260 284 
             <path>
261 285 
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
262 286 
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
263 
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
287 
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
264 288 
               <item name="src" type="462c0819:PsiDirectoryNode" />
265 289 
               <item name="main" type="462c0819:PsiDirectoryNode" />
266 290 
               <item name="java" type="462c0819:PsiDirectoryNode" />
 
@@ -269,68 +293,6 @@
269 293 
               <item name="huiju" type="462c0819:PsiDirectoryNode" />
270 294 
               <item name="service" type="462c0819:PsiDirectoryNode" />
271 295 
             </path>
272 
-            <path>
273 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
274 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
275 
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
276 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
277 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
278 
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
279 
-            </path>
280 
-            <path>
281 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
282 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
283 
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
284 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
285 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
286 
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
287 
-              <item name="mapper" type="462c0819:PsiDirectoryNode" />
288 
-            </path>
289 
-            <path>
290 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
291 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
292 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
293 
-            </path>
294 
-            <path>
295 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
296 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
297 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
298 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
299 
-            </path>
300 
-            <path>
301 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
302 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
303 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
304 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
305 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
306 
-            </path>
307 
-            <path>
308 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
309 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
310 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
311 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
312 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
313 
-              <item name="java" type="462c0819:PsiDirectoryNode" />
314 
-            </path>
315 
-            <path>
316 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
317 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
318 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
319 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
320 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
321 
-              <item name="java" type="462c0819:PsiDirectoryNode" />
322 
-              <item name="com" type="462c0819:PsiDirectoryNode" />
323 
-            </path>
324 
-            <path>
325 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
326 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
327 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
328 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
329 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
330 
-              <item name="java" type="462c0819:PsiDirectoryNode" />
331 
-              <item name="com" type="462c0819:PsiDirectoryNode" />
332 
-              <item name="community" type="462c0819:PsiDirectoryNode" />
333 
-            </path>
334 296 
             <path>
335 297 
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
336 298 
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
 
@@ -341,6 +303,8 @@
341 303 
               <item name="com" type="462c0819:PsiDirectoryNode" />
342 304 
               <item name="community" type="462c0819:PsiDirectoryNode" />
343 305 
               <item name="huiju" type="462c0819:PsiDirectoryNode" />
306 
+              <item name="service" type="462c0819:PsiDirectoryNode" />
307 
+              <item name="impl" type="462c0819:PsiDirectoryNode" />
344 308 
             </path>
345 309 
           </expand>
346 310 
           <select />
 
@@ -521,13 +485,13 @@
521 485 
     <servers />
522 486 
   </component>
523 487 
   <component name="TimeTrackingManager">
524 
-    <option name="totallyTimeSpent" value="140080000" />
488 
+    <option name="totallyTimeSpent" value="141408000" />
525 489 
   </component>
526 490 
   <component name="ToolWindowManager">
527 
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
491 
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
528 492 
     <editor active="true" />
529 493 
     <layout>
530 
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.34168443" />
494 
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.03997868" />
531 495 
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
532 496 
       <window_info id="Designer" order="2" />
533 497 
       <window_info id="Image Layers" order="3" />
 
@@ -538,7 +502,7 @@
538 502 
       <window_info anchor="bottom" id="Message" order="0" />
539 503 
       <window_info anchor="bottom" id="Find" order="1" />
540 504 
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.6998934" weight="0.3530067" />
541 
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.8544776" visible="true" weight="0.08351893" />
505 
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.8544776" visible="true" weight="0.2962138" />
542 506 
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
543 507 
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
544 508 
       <window_info anchor="bottom" id="TODO" order="6" />
 
@@ -825,13 +789,6 @@
825 789 
         </state>
826 790 
       </provider>
827 791 
     </entry>
828 
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/Message.java">
829 
-      <provider selected="true" editor-type-id="text-editor">
830 
-        <state relative-caret-position="331">
831 
-          <caret line="74" column="25" selection-start-line="74" selection-start-column="19" selection-end-line="74" selection-end-column="25" />
832 
-        </state>
833 
-      </provider>
834 
-    </entry>
835 792 
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserMapper.java">
836 793 
       <provider selected="true" editor-type-id="text-editor">
837 794 
         <state relative-caret-position="324">
 
@@ -921,23 +878,6 @@
921 878 
         </state>
922 879 
       </provider>
923 880 
     </entry>
924 
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml">
925 
-      <provider selected="true" editor-type-id="text-editor">
926 
-        <state relative-caret-position="473">
927 
-          <caret line="131" column="17" lean-forward="true" selection-start-line="131" selection-start-column="17" selection-end-line="131" selection-end-column="17" />
928 
-        </state>
929 
-      </provider>
930 
-    </entry>
931 
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/MessageMapper.java">
932 
-      <provider selected="true" editor-type-id="text-editor">
933 
-        <state relative-caret-position="564">
934 
-          <caret line="59" column="19" selection-start-line="59" selection-start-column="19" selection-end-line="59" selection-end-column="19" />
935 
-          <folding>
936 
-            <element signature="imports" expanded="true" />
937 
-          </folding>
938 
-        </state>
939 
-      </provider>
940 
-    </entry>
941 881 
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java">
942 882 
       <provider selected="true" editor-type-id="text-editor">
943 883 
         <state relative-caret-position="1199">
 
@@ -945,16 +885,6 @@
945 885 
         </state>
946 886 
       </provider>
947 887 
     </entry>
948 
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java">
949 
-      <provider selected="true" editor-type-id="text-editor">
950 
-        <state relative-caret-position="1593">
951 
-          <caret line="77" column="54" selection-start-line="77" selection-start-column="54" selection-end-line="77" selection-end-column="54" />
952 
-          <folding>
953 
-            <element signature="imports" expanded="true" />
954 
-          </folding>
955 
-        </state>
956 
-      </provider>
957 
-    </entry>
958 888 
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/MessageController.java">
959 889 
       <provider selected="true" editor-type-id="text-editor">
960 890 
         <state relative-caret-position="264">
 
@@ -978,8 +908,8 @@
978 908 
     </entry>
979 909 
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
980 910 
       <provider selected="true" editor-type-id="text-editor">
981 
-        <state relative-caret-position="242">
982 
-          <caret line="295" column="29" lean-forward="true" selection-start-line="295" selection-start-column="29" selection-end-line="295" selection-end-column="29" />
911 
+        <state relative-caret-position="-3970">
912 
+          <caret line="316" column="9" selection-start-line="316" selection-start-column="9" selection-end-line="316" selection-end-column="9" />
983 913 
         </state>
984 914 
       </provider>
985 915 
     </entry>
 
@@ -1004,6 +934,13 @@
1004 934 
         </state>
1005 935 
       </provider>
1006 936 
     </entry>
937 
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java">
938 
+      <provider selected="true" editor-type-id="text-editor">
939 
+        <state relative-caret-position="453">
940 
+          <caret line="321" column="51" selection-start-line="321" selection-start-column="47" selection-end-line="321" selection-end-column="64" />
941 
+        </state>
942 
+      </provider>
943 
+    </entry>
1007 944 
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TransactionController.java">
1008 945 
       <provider selected="true" editor-type-id="text-editor">
1009 946 
         <state relative-caret-position="324">
 
@@ -1011,17 +948,48 @@
1011 948 
         </state>
1012 949 
       </provider>
1013 950 
     </entry>
1014 
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java">
951 
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java">
1015 952 
       <provider selected="true" editor-type-id="text-editor">
1016 
-        <state relative-caret-position="453">
1017 
-          <caret line="321" column="51" selection-start-line="321" selection-start-column="47" selection-end-line="321" selection-end-column="64" />
953 
+        <state relative-caret-position="82">
954 
+          <caret line="721" selection-start-line="721" selection-end-line="722" />
955 
+          <folding>
956 
+            <element signature="e#19092#19093#0" expanded="true" />
957 
+            <element signature="e#19153#19154#0" expanded="true" />
958 
+          </folding>
1018 959 
         </state>
1019 960 
       </provider>
1020 961 
     </entry>
1021 
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java">
962 
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml">
1022 963 
       <provider selected="true" editor-type-id="text-editor">
1023 
-        <state relative-caret-position="338">
1024 
-          <caret line="526" column="37" selection-start-line="526" selection-start-column="12" selection-end-line="526" selection-end-column="37" />
964 
+        <state relative-caret-position="153">
965 
+          <caret line="88" column="74" selection-start-line="88" selection-start-column="74" selection-end-line="88" selection-end-column="74" />
966 
+        </state>
967 
+      </provider>
968 
+    </entry>
969 
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/Message.java">
970 
+      <provider selected="true" editor-type-id="text-editor">
971 
+        <state relative-caret-position="-2411">
972 
+          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
973 
+        </state>
974 
+      </provider>
975 
+    </entry>
976 
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/MessageMapper.java">
977 
+      <provider selected="true" editor-type-id="text-editor">
978 
+        <state relative-caret-position="532">
979 
+          <caret line="59" column="19" selection-start-line="59" selection-start-column="19" selection-end-line="59" selection-end-column="19" />
980 
+          <folding>
981 
+            <element signature="imports" expanded="true" />
982 
+          </folding>
983 
+        </state>
984 
+      </provider>
985 
+    </entry>
986 
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java">
987 
+      <provider selected="true" editor-type-id="text-editor">
988 
+        <state relative-caret-position="352">
989 
+          <caret line="78" column="2" selection-start-line="78" selection-start-column="2" selection-end-line="78" selection-end-column="2" />
990 
+          <folding>
991 
+            <element signature="imports" expanded="true" />
992 
+          </folding>
1025 993 
         </state>
1026 994 
       </provider>
1027 995 
     </entry>

+ 4
- 0
CODE/smart-community/property-api/src/main/java/com/community/huiju/model/Message.java View File 

@@ -124,5 +124,9 @@ public class Message implements Serializable {
124 124 
      */
125 125 
     private Integer announcementId;
126 126
127 
+    /**
128 
+     *二手租赁Id
129 
+     */
130 
+    private Integer transactionId;
127 131
128 132 
 }

+ 2
- 1
CODE/smart-community/property-api/src/main/resources/mapper/MessageMapper.xml View File 

@@ -108,7 +108,8 @@
108 108 
         update_date,
109 109 
         bill_id,
110 110 
         activity_id,
111 
-        announcement_id
111 
+        announcement_id,
112 
+        transaction_id
112 113 
         FROM
113 114 
         tp_message
114 115 
         <where>

+ 3
- 2
VUECODE/smart-property-manage/src/views/message/messageIndex.vue View File 

@@ -69,7 +69,7 @@
69 69 
           <!--活动标题-->
70 70 
           <a><span v-if="scope.row.messageType==='8'" @click="activityDetails(scope.row.activityId,scope.row.id)">{{'查看帖子详情'}}</span></a>
71 71 
           <!--二手租赁-->
72 
-          <a><span v-if="scope.row.messageType==='9'">{{'查看帖子详情'}}</span></a>
72 
+          <a><span v-if="scope.row.messageType==='9'" @click="handleLook(scope.row.transactionId,scope.row.id)">{{'查看帖子详情'}}</span></a>
73 73 
           <!--投诉-->
74 74 
           <a><span v-if="scope.row.messageType==='1'" @click="ticketDetails(scope.row.ticketId,scope.row.id)">{{'查看工单详情'}}</span></a>
75 75 
           <!--报修-->
 
@@ -86,7 +86,7 @@
86 86 
           <!--活动标题-->
87 87 
           <a><span v-if="scope.row.messageType==='8'" @click="activityDetails(scope.row.activityId,scope.row.id)">{{'查看帖子详情'}}</span></a>
88 88 
           <!--二手租赁-->
89 
-          <a><span v-if="scope.row.messageType==='9'" @click="handleLook(scope.row.activityId,scope.row.id)">{{'查看帖子详情'}}</span></a>
89 
+          <a><span v-if="scope.row.messageType==='9'" @click="handleLook(scope.row.transactionId,scope.row.id)">{{'查看帖子详情'}}</span></a>
90 90 
           <!--投诉-->
91 91 
           <a><span v-if="scope.row.messageType==='1'" @click="ticketDetails(scope.row.ticketId,scope.row.id)">{{'查看工单详情'}}</span></a>
92 92 
           <!--报修-->
 
@@ -226,6 +226,7 @@ export default {
226 226 
     },
227 227 
     // 二手租赁
228 228 
     handleLook(id,ide) {
229 
+      console.log('id',id)
229 230 
       this.$router.push({ name: 'transaction-info', params: { id: id }})
230 231 
        this.already(ide)
231 232 
     },