合并

CODE/smart-community-word/.idea/workspace.xml

@@ -2,8 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="051ae1e0-ece1-4622-91c0-3f05ac339943" name="Default Changelist" comment="">
-      <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" />
-      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/message/messageIndex.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/message/messageIndex.vue" afterDir="false" />
+      <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" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java" afterDir="false" />
+      <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" />
+      <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" />
     </list>
     <ignored path="$PROJECT_DIR$/../smart-community/eureka-sever/target/" />
     <ignored path="$PROJECT_DIR$/../smart-community/app-api/target/" />
@@ -24,101 +26,28 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpTicketService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-3970">
-              <caret line="316" column="9" selection-start-line="316" selection-start-column="9" selection-end-line="316" selection-end-column="9" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/Message.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-2411">
-              <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/ToCommunitiesMapper.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="227">
-              <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="406">
-              <caret line="721" column="5" lean-forward="true" selection-start-line="721" selection-start-column="5" selection-end-line="721" selection-end-column="5" />
-              <folding>
-                <element signature="e#19092#19093#0" expanded="true" />
-                <element signature="e#19153#19154#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="297">
-              <caret line="77" column="53" selection-start-line="77" selection-start-column="53" selection-end-line="77" selection-end-column="53" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="jar://F:/maven3.5/maven/serverRepository/org/springframework/spring-core/5.0.8.RELEASE/spring-core-5.0.8.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="104" selection-start-line="104" selection-end-line="104" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/MessageMapper.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="315">
-              <caret line="59" column="19" selection-start-line="59" selection-start-column="19" selection-end-line="59" selection-end-column="19" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="378">
+              <caret line="48" column="23" lean-forward="true" selection-start-line="48" selection-start-column="17" selection-end-line="48" selection-end-column="26" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml">
+        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="472">
-              <caret line="136" column="29" lean-forward="true" selection-start-line="136" selection-start-column="12" selection-end-line="136" selection-end-column="29" />
+            <state relative-caret-position="585">
+              <caret line="249" column="46" lean-forward="true" selection-start-line="249" selection-start-column="46" selection-end-line="249" selection-end-column="46" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TransactionController.java">
+        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTicket.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="324">
-              <caret line="32" column="13" lean-forward="true" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="453">
-              <caret line="321" column="51" selection-start-line="321" selection-start-column="47" selection-end-line="321" selection-end-column="64" />
+            <state relative-caret-position="55">
+              <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
             </state>
           </provider>
         </entry>
@@ -151,6 +80,10 @@
       <find>举报</find>
       <find>ReadStatus</find>
       <find>ORDER BY create_date</find>
+      <find>活动</find>
+      <find>TpTicket::getId</find>
+      <find>QueryWrapper&lt;</find>
+      <find>QueryWrapper&lt;</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -185,16 +118,17 @@
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/MessageMapper.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TaSysUserRoleMapper.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TaSysUserRoleMapper.xml" />
-        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketMapper.xml" />
-        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java" />
-        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/ToCommunitiesMapper.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/ToCommunitiesMapper.xml" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java" />
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/Message.java" />
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -216,11 +150,10 @@
     <option name="jreName" value="1.8" />
     <option name="vmOptions" value="-DarchetypeCatalog=internal" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="88" />
-    <option name="y" value="143" />
-    <option name="width" value="1345" />
-    <option name="height" value="906" />
+  <component name="ProjectFrameBounds" extendedState="7">
+    <option name="x" value="953" />
+    <option name="width" value="974" />
+    <option name="height" value="1047" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -235,6 +168,11 @@
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
@@ -331,7 +269,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1551939462303" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1551951295521" />
     <property name="last_opened_file_path" value="D:/java/workspace/heishi/wx_project" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -495,13 +433,13 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="143359000" />
+    <option name="totallyTimeSpent" value="149388000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18443497" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.12846482" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -512,7 +450,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.6998934" weight="0.3530067" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.8544776" visible="true" weight="0.084632516" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.8544776" visible="true" weight="0.06013363" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -629,37 +567,10 @@
           <properties />
           <option name="timeStamp" value="5" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java</url>
-          <line>90</line>
-          <properties />
-          <option name="timeStamp" value="14" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/SysMenuMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="54">
-          <caret line="2" column="43" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://F:/maven3.5/maven/serverRepository/com/baomidou/mybatis-plus-core/3.0.6/mybatis-plus-core-3.0.6-sources.jar!/com/baomidou/mybatisplus/core/metadata/IPage.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="132" column="16" selection-start-line="132" selection-start-column="16" selection-end-line="132" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TpTicketMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="81">
-          <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/BillStatementMapper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="351">
@@ -746,13 +657,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpAnnouncementService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="480">
-          <caret line="26" column="27" lean-forward="true" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/ImageController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="231">
@@ -838,34 +742,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://F:/maven3.5/maven/serverRepository/com/baomidou/mybatis-plus-core/3.0.6/mybatis-plus-core-3.0.6-sources.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="159" column="6" selection-start-line="159" selection-start-column="6" selection-end-line="159" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTicket.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
-          <caret line="156" column="79" lean-forward="true" selection-start-line="153" selection-start-column="12" selection-end-line="156" selection-end-column="79" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpTicketService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="48" column="21" lean-forward="true" selection-start-line="48" selection-start-column="17" selection-end-line="48" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="446">
@@ -880,20 +756,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/ITicketService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="72" column="18" lean-forward="true" selection-start-line="72" selection-start-column="17" selection-end-line="72" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1199">
-          <caret line="236" column="30" selection-start-line="236" selection-start-column="24" selection-end-line="236" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/MessageController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="264">
@@ -915,13 +777,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3970">
-          <caret line="316" column="9" selection-start-line="316" selection-start-column="9" selection-end-line="316" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpTransaction.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="588">
@@ -982,30 +837,107 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/MessageMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="297">
-          <caret line="77" column="53" selection-start-line="77" selection-start-column="53" selection-end-line="77" selection-end-column="53" />
+        <state relative-caret-position="315">
+          <caret line="59" column="19" selection-start-line="59" selection-start-column="19" selection-end-line="59" selection-end-column="19" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/MessageMapper.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="59" column="19" selection-start-line="59" selection-start-column="19" selection-end-line="59" selection-end-column="19" />
+        <state relative-caret-position="1849">
+          <caret line="136" column="29" lean-forward="true" selection-start-line="136" selection-start-column="12" selection-end-line="136" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpAnnouncementService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="480">
+          <caret line="26" column="23" lean-forward="true" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/ISysRoleService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="324">
+          <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="121">
+          <caret line="120" column="48" lean-forward="true" selection-start-line="120" selection-start-column="48" selection-end-line="120" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/ITpActivityService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="345">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="17" selection-end-line="33" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="266" column="43" lean-forward="true" selection-start-line="266" selection-start-column="43" selection-end-line="266" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="159">
+          <caret line="90" selection-start-line="90" selection-end-line="90" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml">
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/ITicketService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="136" column="29" lean-forward="true" selection-start-line="136" selection-start-column="12" selection-end-line="136" selection-end-column="29" />
+        <state relative-caret-position="837">
+          <caret line="49" column="23" lean-forward="true" selection-start-line="49" selection-start-column="17" selection-end-line="49" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="292">
+          <caret line="311" column="7" selection-start-line="311" selection-start-column="7" selection-end-line="311" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpTicketService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="378">
+          <caret line="48" column="23" lean-forward="true" selection-start-line="48" selection-start-column="17" selection-end-line="48" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTicket.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="55">
+          <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://F:/maven3.5/maven/serverRepository/com/baomidou/mybatis-plus-core/3.0.6/mybatis-plus-core-3.0.6-sources.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="188">
+          <caret line="186" column="6" selection-start-line="186" selection-start-column="6" selection-end-line="186" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="585">
+          <caret line="249" column="46" lean-forward="true" selection-start-line="249" selection-start-column="46" selection-end-line="249" selection-end-column="46" />
         </state>
       </provider>
     </entry>

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java

@@ -304,14 +304,15 @@ public class TicketServiceImpl implements ITicketService {
 
 
         // 把工单信息添加到消息表
-        insertTicketMessage(tpTicket, userId);
+//        insertTicketMessage(tpTicket, userId);
         //1.5版本维护消息推送
         TpMessage message = new TpMessage();
         message.setCommunityId(user.getCommunityId());
+        message.setTicketId(tpTicket.getId());
         message.setModelType("1");
-        message.setMessageType("5");
+        message.setMessageType(tpTicket.getType());
         message.setAdviceType("4");
-        message.setUuidType("2");
+        message.setUuidType("1");
         message.setSource("2");
         //当前插入为超级管理员
          Integer uuserID= toCommunitiesMapper.selectAndmin(user.getCommunityId());

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java

@@ -171,6 +171,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
                     message.setSource("2");
                     message.setMessageContent("活动“{" + tpActivity.getActivityTitle() + "}”还未发布，点击发布");
                     message.setStatus("1");
+                    message.setActivityId(tpActivity.getId());
                     message.setCreateDate(LocalDateTime.now());
                     message.setCreateUser(userElement.getId());
 
@@ -264,6 +265,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
             queryWrapper.eq("model_type", "2");
             queryWrapper.eq("source", "2");
             queryWrapper.eq("status", "1");
+            queryWrapper.eq("activity_id",tpActivity.getId());
             Message message = messageMapper.selectOne(queryWrapper);
             if (null != message) {
                 message.setStatus("0");

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java

@@ -121,6 +121,7 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
                 Message message = new Message();
                 message.setCommunityId(communityId);
                 message.setMessageType("5");
+                message.setModelType("2");
                 message.setAdviceType("4");
                 message.setUuid(userId);
                 message.setUuidType("2");

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java

@@ -199,7 +199,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
     }
 
     @Override
-    public ResponseBean addRecord(String parameter, Integer id, Integer communityId) {
+    public ResponseBean addRecord(String parameter, Integer user, Integer communityId) {
         ResponseBean response=new ResponseBean();
 
         JSONObject object= JSONObject.parseObject(parameter);
@@ -221,18 +221,19 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         tpTicketRecord.setTicketId(ticketId);
         tpTicketRecord.setContent("您的联系单已经分配给物业处理人员" + userName.getUserName()+",联系方式:" + userName.getLoginName());
         tpTicketRecord.setStatus("3");
-        tpTicketRecord.setCreateUser(id);
+        tpTicketRecord.setCreateUser(user);
         tpTicketRecord.setCreateDate(LocalDateTime.now());
         tpTicketRecordMapper.insert(tpTicketRecord);
 
         //待办模板
-        QueryWrapper<TpTicket> TpTicketWrapper = new QueryWrapper<>();
-        TpTicketWrapper.lambda().eq(TpTicket::getId,ticketId);
-        TpTicketWrapper.lambda().eq(TpTicket::getCommunityId,communityId);
-       TpTicket ticket = tpTicketMapper.selectById(TpTicketWrapper);
+        QueryWrapper<TpTicket> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", ticketId);
+        queryWrapper.eq("community_id", communityId);
+       TpTicket ticket = tpTicketMapper.selectOne(queryWrapper);
         Message message = new Message();
         message.setCommunityId(communityId);
         message.setMessageType(ticket.getType());
+        message.setTicketId(ticket.getId());
         message.setAdviceType("4");
         message.setUuid(userID);
         message.setModelType("2");
@@ -241,13 +242,15 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         message.setMessageContent("工单“" + ticket.getTicketTitle() + "”已被分配给您，点击查看并处理");
         message.setStatus("1");
         message.setReadStatus("0");
-        message.setCreateUser(id);
+        message.setCreateUser(user);
         message.setCreateDate(LocalDateTime.now());
         message.setTicketId(ticketId);
         messageMapper.insert(message);
-        //消息模板
-        message.setModelType("1");
-        messageMapper.insert(message);
+        //如果分配给本人维护消息模板
+        if (null!=userID&userID.equals(user)){
+            message.setModelType("1");
+            messageMapper.insert(message);
+        }
         response.addSuccess("成功");
         return response;
     }

VUECODE/smart-property-manage/src/views/message/index.vue

@@ -50,7 +50,7 @@
         </a>
 
         <a :title="scope.row.messageContent" v-if="scope.row.status==='0'">
-          <span style="color: #666666	" >
+          <span style="color:#AAAAAA" >
            {{ scope.row.messageContent.length>='100'?scope.row.messageContent.substring(0,15)+'..':scope.row.messageContent }}
           </span>
         </a>