合并

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

@@ -4,18 +4,18 @@
     <list default="true" id="051ae1e0-ece1-4622-91c0-3f05ac339943" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivityMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivityMapper.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignupMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignupMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionReplyMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionReplyMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpActivity.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpActivitySignup.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpActivitySignup.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java" afterDir="false" />
       <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" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpActivityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpActivityMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpActivitySignupMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpActivitySignupMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfoService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/api/buildingOwnerInfo.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/api/buildingOwnerInfo.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/router/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/store/modules/buildingOwnerInfo.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/store/modules/buildingOwnerInfo.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/building/buildingdata/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/building/buildingdata/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTransactionReplyMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTransactionReplyMapper.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../smart-community/eureka-sever/target/" />
     <ignored path="$PROJECT_DIR$/../smart-community/app-api/target/" />
@@ -39,37 +39,37 @@
   <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/controller/UserController.java">
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="268">
-              <caret line="258" column="51" selection-start-line="258" selection-start-column="51" selection-end-line="258" selection-end-column="51" />
+            <state relative-caret-position="419">
+              <caret line="204" column="14" selection-start-line="204" selection-start-column="14" selection-end-line="204" selection-end-column="14" />
             </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">
+      <file pinned="false" current-in-tab="true">
+        <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="344">
-              <caret line="466" column="56" selection-start-line="466" selection-start-column="56" selection-end-line="466" selection-end-column="56" />
+            <state relative-caret-position="293">
+              <caret line="647" column="8" lean-forward="true" selection-start-line="647" selection-start-column="8" selection-end-line="647" selection-end-column="8" />
             </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/SocialServiceI.java">
+        <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="295">
-              <caret line="201" column="7" selection-start-line="201" selection-start-column="5" selection-end-line="201" selection-end-column="7" />
+            <state relative-caret-position="184">
+              <caret line="105" selection-start-line="105" selection-end-line="105" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignupMapper.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="395">
-              <caret line="643" column="38" lean-forward="true" selection-start-line="643" selection-start-column="38" selection-end-line="643" selection-end-column="38" />
+            <state relative-caret-position="607">
+              <caret line="48" column="167" selection-start-line="48" selection-start-column="167" selection-end-line="48" selection-end-column="167" />
             </state>
           </provider>
         </entry>
@@ -77,17 +77,53 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivityMapper.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="179">
-              <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
+            <state relative-caret-position="607">
+              <caret line="39" column="104" selection-start-line="39" selection-start-column="93" selection-end-line="39" selection-end-column="104" />
             </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/TpActivitySignupMapper.java">
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpActivityMapper.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="580">
+              <caret line="290" column="31" lean-forward="true" selection-start-line="290" selection-start-column="31" selection-end-line="290" selection-end-column="31" />
+            </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/TpTransactionReplyMapper.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="607">
+              <caret line="35" column="29" selection-start-line="35" selection-start-column="29" selection-end-line="35" selection-end-column="29" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTransactionReplyMapper.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-3199">
+              <caret line="16" column="35" selection-start-line="15" selection-start-column="4" selection-end-line="16" selection-end-column="35" />
+            </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/TpTransactionMapper.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="400">
-              <caret line="54" column="50" selection-start-line="54" selection-start-column="28" selection-end-line="54" selection-end-column="50" />
+            <state relative-caret-position="607">
+              <caret line="41" column="91" selection-start-line="41" selection-start-column="80" selection-end-line="41" selection-end-column="91" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="729">
+              <caret line="281" column="58" lean-forward="true" selection-start-line="281" selection-start-column="58" selection-end-line="281" selection-end-column="58" />
             </state>
           </provider>
         </entry>
@@ -103,10 +139,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>图片上传</find>
-      <find>selectById</find>
-      <find>ticketId</find>
-      <find>updateTicketsReply</find>
       <find>AddTempBillInvoice</find>
       <find>tpannouncementTelMapper</find>
       <find>addAiTicketService</find>
@@ -133,6 +165,10 @@
       <find>getBuildingInfo</find>
       <find>导入</find>
       <find>·</find>
+      <find>BaseResultMap</find>
+      <find>tpActivitySignupMapper</find>
+      <find>parameter</find>
+      <find>taRoleName</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -141,14 +177,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpTicketRecordComment.java" />
-        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketRecordMapper.java" />
-        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketRecordMapper.xml" />
-        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketRecordCommentMapper.xml" />
-        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java" />
-        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/ITicketService.java" />
-        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java" />
-        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TpTicketMapper.xml" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/AppApplication.java" />
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTicket.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpMessageMapper.java" />
@@ -186,11 +214,19 @@
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java" />
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/WxLoginServiceImpl.java" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpActivitySignup.java" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpActivity.java" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionReplyMapper.java" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTransactionReplyMapper.xml" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionMapper.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpActivitySignupMapper.xml" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignupMapper.java" />
-        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpActivitySignup.java" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivityMapper.java" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpActivityMapper.xml" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java" />
       </list>
     </option>
@@ -205,7 +241,23 @@
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand />
+      <expand>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="app-api" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+        </path>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="app-api" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
+        </path>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="app-api" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
+          <item name="install" type="36feed69:MavenProjectsStructure$PluginNode" />
+        </path>
+      </expand>
       <select />
     </treeState>
   </component>
@@ -213,11 +265,10 @@
     <option name="jreName" value="1.8" />
     <option name="vmOptions" value="-DarchetypeCatalog=internal" />
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="624" />
-    <option name="y" value="24" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="493" />
     <option name="width" value="1940" />
-    <option name="height" value="940" />
+    <option name="height" value="950" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -315,7 +366,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="1554085811301" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1554117603515" />
     <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" />
@@ -354,7 +405,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.ZuulApplication">
+  <component name="RunManager" selected="Spring Boot.AppApplication">
     <configuration default="true" type="Applet">
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
       <method v="2">
@@ -480,18 +531,18 @@
       <workItem from="1551834513428" duration="31209000" />
       <workItem from="1551920868695" duration="9458000" />
       <workItem from="1553821766053" duration="18204000" />
-      <workItem from="1554081715307" duration="4074000" />
+      <workItem from="1554081715307" duration="21935000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="190355000" />
+    <option name="totallyTimeSpent" value="208216000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="114" y="32" width="1940" height="940" extended-state="0" />
+    <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.08138298" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.04424307" />
       <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" />
@@ -501,23 +552,23 @@
       <window_info id="Web" order="7" side_tool="true" />
       <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.100222714" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.8544776" visible="true" weight="0.24296676" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.6998934" weight="0.29419193" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.85287845" visible="true" weight="0.0545657" />
       <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" />
       <window_info anchor="bottom" id="Spring" order="7" sideWeight="0.5698294" weight="0.32962137" />
       <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49946696" weight="0.32962137" />
       <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.14552239" side_tool="true" weight="0.37750557" />
-      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49969268" weight="0.5077951" />
+      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.14712153" side_tool="true" weight="0.21937639" />
+      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49840087" weight="0.27282852" />
       <window_info anchor="bottom" id="Java Enterprise" order="12" sideWeight="0.49946696" weight="0.32962137" />
       <window_info anchor="bottom" id="Database Changes" order="13" />
       <window_info anchor="bottom" id="Version Control" order="14" sideWeight="0.49946696" weight="0.32850778" />
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.025806451" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.20478724" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Database" order="6" />
@@ -635,123 +686,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <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>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpTransactionLike.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="656">
-          <caret line="112" column="5" selection-start-line="112" selection-start-column="5" selection-end-line="112" selection-end-column="5" />
-          <folding>
-            <element signature="e#550#551#0" expanded="true" />
-            <element signature="e#576#577#0" expanded="true" />
-            <element signature="e#615#616#0" expanded="true" />
-            <element signature="e#645#646#0" expanded="true" />
-            <element signature="e#696#697#0" expanded="true" />
-            <element signature="e#738#739#0" expanded="true" />
-            <element signature="e#793#794#0" expanded="true" />
-            <element signature="e#839#840#0" expanded="true" />
-            <element signature="e#876#877#0" expanded="true" />
-            <element signature="e#908#909#0" expanded="true" />
-            <element signature="e#947#948#0" expanded="true" />
-            <element signature="e#981#982#0" expanded="true" />
-            <element signature="e#1011#1012#0" expanded="true" />
-            <element signature="e#1036#1037#0" expanded="true" />
-            <element signature="e#1073#1074#0" expanded="true" />
-            <element signature="e#1101#1102#0" expanded="true" />
-            <element signature="e#1140#1141#0" expanded="true" />
-            <element signature="e#1174#1175#0" expanded="true" />
-            <element signature="e#1229#1230#0" expanded="true" />
-            <element signature="e#1275#1276#0" expanded="true" />
-            <element signature="e#1311#1312#0" expanded="true" />
-            <element signature="e#1342#1343#0" expanded="true" />
-            <element signature="e#1391#1392#0" expanded="true" />
-            <element signature="e#1431#1432#0" expanded="true" />
-            <element signature="e#1472#1473#0" expanded="true" />
-            <element signature="e#1508#1509#0" expanded="true" />
-            <element signature="e#1567#1568#0" expanded="true" />
-            <element signature="e#1617#1618#0" expanded="true" />
-            <element signature="e#1654#1655#0" expanded="true" />
-            <element signature="e#1687#1688#0" expanded="true" />
-            <element signature="e#1739#1740#0" expanded="true" />
-            <element signature="e#1818#1819#0" expanded="true" />
-            <element signature="e#1853#1854#0" expanded="true" />
-            <element signature="e#1886#1887#0" expanded="true" />
-            <element signature="e#1936#1937#0" expanded="true" />
-            <element signature="e#1980#1981#0" expanded="true" />
-            <element signature="e#2015#2016#0" expanded="true" />
-            <element signature="e#2048#2049#0" expanded="true" />
-            <element signature="e#2098#2099#0" expanded="true" />
-            <element signature="e#2142#2143#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTransactionLikeMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionLikeMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="81">
-          <caret line="4" column="43" selection-start-line="4" selection-start-column="43" selection-end-line="4" selection-end-column="43" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TaUserMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="458">
-          <caret line="360" column="32" selection-start-line="360" selection-start-column="14" selection-end-line="360" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-19">
-          <caret line="47" column="14" lean-forward="true" selection-start-line="47" selection-start-column="14" selection-end-line="47" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TaUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="351">
-          <caret line="73" column="53" selection-start-line="73" selection-start-column="53" selection-end-line="73" selection-end-column="53" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1169#1170#0" expanded="true" />
-            <element signature="e#1211#1212#0" expanded="true" />
-            <element signature="e#1298#1299#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://F:/maven3.5/maven/serverRepository/org/springframework/spring-core/5.0.8.RELEASE/spring-core-5.0.8.RELEASE-sources.jar!/org/springframework/util/ReflectionUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="402">
-          <caret line="225" selection-start-line="225" selection-end-line="225" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://F:/maven3.5/maven/serverRepository/org/apache/tomcat/embed/tomcat-embed-core/8.5.32/tomcat-embed-core-8.5.32-sources.jar!/javax/servlet/http/HttpSession.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="157" column="18" selection-start-line="157" selection-start-column="18" selection-end-line="157" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/CommunityServiceI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/HkController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="405">
@@ -780,13 +714,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="116">
-          <caret line="454" column="24" selection-start-line="454" selection-start-column="24" selection-end-line="454" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="432">
@@ -1001,66 +928,143 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/WxLoginServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="162">
+          <caret line="7" column="39" lean-forward="true" selection-start-line="7" selection-start-column="39" selection-end-line="7" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpActivitySignup.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="324">
+          <caret line="16" column="26" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://D:/Program Files/Java/jdk1.8.0_121/src.zip!/java/util/ArrayList.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="177">
+          <caret line="105" column="13" selection-start-line="105" selection-start-column="13" selection-end-line="105" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="108">
+          <caret line="6" column="24" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="326">
+          <caret line="982" column="24" selection-start-line="982" selection-start-column="24" selection-end-line="982" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="268">
-          <caret line="258" column="51" selection-start-line="258" selection-start-column="51" selection-end-line="258" selection-end-column="51" />
+        <state relative-caret-position="411">
+          <caret line="258" column="53" selection-start-line="258" selection-start-column="50" selection-end-line="258" selection-end-column="63" />
+        </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="242">
+          <caret line="154" column="19" selection-start-line="154" selection-start-column="19" selection-end-line="154" selection-end-column="19" />
+          <folding>
+            <element signature="e#3037#3038#0" expanded="true" />
+            <element signature="e#3070#3071#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <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="344">
-          <caret line="466" column="56" selection-start-line="466" selection-start-column="56" selection-end-line="466" selection-end-column="56" />
+        <state relative-caret-position="339">
+          <caret line="470" column="67" selection-start-line="470" selection-start-column="67" selection-end-line="470" selection-end-column="67" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="201" column="7" selection-start-line="201" selection-start-column="5" selection-end-line="201" selection-end-column="7" />
+        <state relative-caret-position="419">
+          <caret line="204" column="14" selection-start-line="204" selection-start-column="14" selection-end-line="204" selection-end-column="14" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpActivitySignupMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="215">
-          <caret line="140" column="2" selection-start-line="140" selection-start-column="2" selection-end-line="140" selection-end-column="2" />
+        <state relative-caret-position="527">
+          <caret line="138" column="11" selection-start-line="138" selection-start-column="11" selection-end-line="138" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignupMapper.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="400">
-          <caret line="54" column="50" selection-start-line="54" selection-start-column="28" selection-end-line="54" selection-end-column="50" />
+        <state relative-caret-position="729">
+          <caret line="281" column="58" lean-forward="true" selection-start-line="281" selection-start-column="58" selection-end-line="281" selection-end-column="58" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpActivitySignup.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#409#410#0" expanded="true" />
-            <element signature="e#461#462#0" expanded="true" />
-            <element signature="e#512#513#0" expanded="true" />
-            <element signature="e#549#550#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="607">
+          <caret line="41" column="91" selection-start-line="41" selection-start-column="80" selection-end-line="41" selection-end-column="91" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTransactionReplyMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3199">
+          <caret line="16" column="35" selection-start-line="15" selection-start-column="4" selection-end-line="16" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionReplyMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="607">
+          <caret line="35" column="29" selection-start-line="35" selection-start-column="29" selection-end-line="35" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpActivityMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="580">
+          <caret line="290" column="31" lean-forward="true" selection-start-line="290" selection-start-column="31" selection-end-line="290" selection-end-column="31" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivityMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="179">
-          <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
+        <state relative-caret-position="607">
+          <caret line="39" column="104" selection-start-line="39" selection-start-column="93" selection-end-line="39" selection-end-column="104" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignupMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="607">
+          <caret line="48" column="167" selection-start-line="48" selection-start-column="167" selection-end-line="48" selection-end-column="167" />
+        </state>
+      </provider>
+    </entry>
+    <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="184">
+          <caret line="105" selection-start-line="105" selection-end-line="105" />
         </state>
       </provider>
     </entry>
     <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="395">
-          <caret line="643" column="38" lean-forward="true" selection-start-line="643" selection-start-column="38" selection-end-line="643" selection-end-column="38" />
+        <state relative-caret-position="293">
+          <caret line="647" column="8" lean-forward="true" selection-start-line="647" selection-start-column="8" selection-end-line="647" selection-end-column="8" />
         </state>
       </provider>
     </entry>

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -459,12 +459,31 @@ public class SocialController extends BaseController {
 
     @ApiOperation(value = "我参加的所有活动", notes = "我参加的所有活动")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
+    })
+    @RequestMapping(value = "/user/activitlist", method = RequestMethod.GET)
+    public ResponseBean  userActivityList(HttpSession session,
+                                          @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean response = socialServiceI.userActivityList(userElement,pageNum,pageSize);
+        return response;
+    }
+
+    @ApiOperation(value = "我参加的话题", notes = "我参加的话题")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
     })
-    @RequestMapping(value = "/user/activitlist", method = RequestMethod.POST)
-    public ResponseBean  userActivityList(HttpSession session, @RequestBody String paramets) {
+    @RequestMapping(value = "/user/transactionList", method = RequestMethod.GET)
+    public ResponseBean  userTransactionList(HttpSession session,
+                                             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        ResponseBean response = socialServiceI.userActivityList(userElement);
+        ResponseBean response = socialServiceI.userTransactionList(userElement,pageNum,pageSize);
         return response;
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivityMapper.java

@@ -31,4 +31,11 @@ public interface TpActivityMapper {
      * @return
      */
     List<TpActivity> getActivity(@Param("communityId")Integer communityId, @Param("num")Integer num);
+
+    /**
+     * 根据活动ID查询我参与过的活动
+     * @param communityId
+     * @return
+     */
+    List<TpActivity> selecttpActivity(@Param("id") Integer id, @Param("communityId") Integer communityId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignupMapper.java

@@ -47,10 +47,4 @@ public interface TpActivitySignupMapper {
      * @return
      */
     TpActivitySignup selectTpActivetitySignByUserId(@Param("activityId") Integer activityId, @Param("communityId")Integer communityId, @Param("userId")Integer userId);
-
-    /**
-     *根据小区id，用户id查询当前所有的活动
-     * @return
-     */
-     List<TpActivitySignup> selectUserActivityList(@Param("communityId")Integer communityId,@Param("userId")Integer userId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionMapper.java

@@ -32,4 +32,12 @@ public interface TpTransactionMapper {
 	List<Map<String, Object>> getReportReasons();
     
     int saveReportReason(@Param("userId") Integer userId,@Param("communityId") Integer communityId,@Param("transactionId") Integer transactionId,@Param("reportReasonId") String reportReasonId);
+
+    /**
+     * 查询的当前用户自己的所有帖子
+     * @param id
+     * @param communityId
+     * @return
+     */
+    List<TpTransaction> getUserTransactionList(@Param("id") Integer id, @Param("communityId")Integer communityId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionReplyMapper.java

@@ -27,4 +27,11 @@ public interface TpTransactionReplyMapper {
      * @return
      */
     List<TpTransactionReply> getCommunityIdAndTransactionId(@Param("communityId") Integer communityId, @Param("transactionId") Integer transactionId);
+
+    /**
+     * 查询我回复别人的帖子
+     * @param id
+     * @return
+     */
+    List<TpTransactionReply> selectUserTransactionReply(Integer id);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpActivity.java

@@ -1,5 +1,6 @@
 package com.community.huiju.model;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpActivitySignup.java

@@ -16,16 +16,6 @@ public class TpActivitySignup {
 
     private String remark;
 
-    private List<TpActivity> tpActivityList;
-
-    public void setTpActivityList(List<TpActivity> tpActivityList) {
-        this.tpActivityList = tpActivityList;
-    }
-
-    public List<TpActivity> getTpActivityList() {
-        return tpActivityList;
-    }
-
     public Integer getId() {
         return id;
     }

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

@@ -197,8 +197,13 @@ public interface SocialServiceI {
 
 	/**
 	 * 获取我的活动列表
-	 * @param userElement
 	 * @return
 	 */
-    ResponseBean userActivityList( UserElement userElement);
+    ResponseBean userActivityList( UserElement userElementm,Integer pageNum,Integer paeSize);
+
+	/**
+	 * 我参与过的话题
+	 * @return
+	 */
+	ResponseBean userTransactionList(UserElement userElement,Integer pageNum,Integer paeSize);
 }

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

@@ -91,9 +91,6 @@ public class SocialServiceImpl implements SocialServiceI {
     @Autowired
     private  TpTransactionLikeMapper tpTransactionLikeMapper;
 
-    @Autowired
-    private  TpActivitySignupMapper tpActivitySignupMapper;
-
     @Override
     @Transactional
     public TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId, Integer userId) {
@@ -630,18 +627,28 @@ public class SocialServiceImpl implements SocialServiceI {
     }
 
     @Override
-    public ResponseBean userActivityList( UserElement userElement) {
+    public ResponseBean userActivityList( UserElement userElement,Integer pageNum,Integer paeSize) {
         ResponseBean responseBean= new ResponseBean();
-         ArrayList tpActivityList= new ArrayList<TpActivity>();
-
-         List<TpActivitySignup> tpActivitySignupList= tpActivitySignupMapper.selectUserActivityList(userElement.getCommunityId(),userElement.getId());
+        Map<String, Object> parameter = Maps.newHashMap();
+            Page<TpActivity> pageList= PageHelper.startPage(pageNum, paeSize);
+            List<TpActivity> tpActivity= tpActivityMapper.selecttpActivity(userElement.getId(),userElement.getCommunityId());
+        parameter.put("list",tpActivity);
+        parameter.put("total",pageList.getTotal());
+        responseBean.addSuccess(parameter);
+        return responseBean;
+    }
 
-         for (TpActivitySignup tpActivitySignup:tpActivitySignupList){
-            TpActivity tpActivity= tpActivityMapper.selectByPrimaryKey(tpActivitySignup.getActivityId(),userElement.getCommunityId());
-             tpActivityList.add(tpActivity);
-             tpActivitySignup.setTpActivityList(tpActivityList);
-         }
-        responseBean.addSuccess("成功");
+    @Override
+    public ResponseBean userTransactionList(UserElement userElement,Integer pageNum,Integer paeSize) {
+        ResponseBean responseBean= new ResponseBean();
+        //拿到我自己所有的帖子
+        Map<String, Object> parameter = Maps.newHashMap();
+        Page<TpTransaction> pageList=PageHelper.startPage(pageNum, paeSize);
+        List<TpTransaction> tpTransactionList = tpTransactionMapper.getUserTransactionList(userElement.getId(),userElement.getCommunityId());
+        
+        parameter.put("list",tpTransactionList);
+        parameter.put("total",pageList.getTotal());
+        responseBean.addSuccess(parameter);
         return responseBean;
     }
 

CODE/smart-community/app-api/src/main/resources/mapper/TpActivityMapper.xml

@@ -281,4 +281,13 @@
     from tp_activity
     where community_id = #{communityId,jdbcType=INTEGER}  and status=1  order by create_date DESC limit  #{num,jdbcType=INTEGER}
   </select>
+
+  <select id="selecttpActivity" resultMap="BaseResultMap">
+    SELECT * FROM
+    tp_activity a
+    LEFT JOIN tp_activity_sign_up tr ON tr.activity_id = a.id
+    WHERE tr.ta_user_id = #{id}
+    AND tr.community_id =#{communityId}
+    order by a.create_date desc
+  </select>
 </mapper>

CODE/smart-community/app-api/src/main/resources/mapper/TpActivitySignupMapper.xml

@@ -137,11 +137,4 @@
     from tp_activity_sign_up
     where activity_id = #{activityId} and community_id = #{communityId} and ta_user_id = #{userId}
   </select>
-
-  <select id="selectUserActivityList" resultType="com.community.huiju.model.TpActivitySignup">
-    select
-    <include refid="Base_Column_List"/>
-    from tp_activity_sign_up
-    where community_id = #{communityId} and ta_user_id = #{userId}
-  </select>
 </mapper>

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml

@@ -246,6 +246,7 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     <include refid="Base_Column_List" />
     from tp_transaction
     where id = #{id,jdbcType=INTEGER} and status = 1
+    order by create_date DESC
   </select>
 
   <select id="getReportReasons" resultType="java.util.Map">
@@ -258,4 +259,30 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     values (#{communityId,jdbcType=INTEGER}, #{transactionId,jdbcType=INTEGER},
       #{reportReasonId,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER})
   </insert>
+  <select id="getUserTransactionList" resultMap="BaseResultMap">
+
+SELECT
+    <include refid="Base_Column_List" />
+    FROM
+      tp_transaction t
+    WHERE t.create_user=#{id,jdbcType=INTEGER}
+    AND t.community_id=#{communityId,jdbcType=INTEGER}
+    UNION ALL
+    SELECT
+        <include refid="Base_Column_List" />
+    FROM
+      tp_transaction t
+    INNER JOIN(SELECT
+      y.transaction_id
+    FROM
+      tp_transaction_reply y
+      LEFT JOIN tp_transaction t ON y.transaction_id = t.id
+    WHERE
+      y.ta_user_id = #{id,jdbcType=INTEGER}
+      AND y.community_id = #{communityId,jdbcType=INTEGER}
+      AND y.transaction_id NOT IN ( SELECT t.id FROM tp_transaction t WHERE t.create_user = #{id,jdbcType=INTEGER} AND t.community_id = #{communityId,jdbcType=INTEGER}  )
+    GROUP BY
+      y.transaction_id) a ON a.transaction_id = t.id
+    order by create_date DESC
+  </select>
 </mapper>

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionReplyMapper.xml

@@ -147,4 +147,11 @@
     from tp_transaction_reply tr
     where tr.community_id = #{communityId,jdbcType=INTEGER} and tr.transaction_id = #{transactionId,jdbcType=INTEGER}
   </select>
+   <select id="selectUserTransactionReply" resultMap="BaseResultMap">
+     select
+     <include refid="Base_Column_List" />
+     from tp_transaction_reply
+     where  ta_user_id = #{id}
+     GROUP BY transaction_id
+   </select>
 </mapper>