合并

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

@@ -0,0 +1,502 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="8242fb4e-eadf-4769-b4c9-e866954fc164" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TransactionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TransactionController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TpTransactionMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TpTransactionMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TransactionReportMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TransactionReportMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTransaction.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTransaction.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/ITransactionService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/ITransactionService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TransactionServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TransactionServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TpTransactionMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TpTransactionMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TransactionReportMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TransactionReportMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/api/transaction.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/api/transaction.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/transaction.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/store/modules/transaction.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/social/transaction/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/social/transaction/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/social/transaction/info/transactionInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/social/transaction/info/transactionInfo.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/social/transaction/transactionAdd.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/social/transaction/transactionAdd.vue" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="CoverageDataManager">
+    <SUITE FILE_PATH="coverage/smart_community_word$PropertyApplication.ic" NAME="PropertyApplication Coverage Results" MODIFIED="1552024801928" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <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">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="424">
+              <caret line="123" column="72" selection-start-line="123" selection-start-column="63" selection-end-line="123" selection-end-column="83" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TransactionServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="221">
+              <caret line="268" column="23" selection-start-line="268" selection-start-column="23" selection-end-line="268" selection-end-column="23" />
+            </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/TdImages.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="281">
+              <caret line="35" column="27" selection-start-line="35" selection-start-column="19" selection-end-line="35" selection-end-column="27" />
+            </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/TransactionReply.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="254">
+              <caret line="77" column="30" selection-start-line="77" selection-start-column="30" selection-end-line="77" selection-end-column="30" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../.." />
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TpTransactionMapper.xml" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTransaction.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TransactionController.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/ITransactionService.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TpTransactionMapper.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TransactionReportMapper.xml" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TransactionReportMapper.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TransactionReplyMapper.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TransactionReplyMapper.xml" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TransactionReply.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TransactionServiceImpl.java" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <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="property-api" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
+              <item name="dao" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
+              <item name="model" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+              <item name="impl" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="mapper" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="zuul" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="zuul" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="zuul" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="zuul" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="zuul" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="zuul" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="zuul" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1554813564104" />
+  </component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="E:\idesWord\smartCommunity\CODE\smart-community\property-api\src\main\resources\mapper" />
+      <recent name="E:\idesWord\smartCommunity\CODE\smart-community\property-api\src\main\java\com\community\huiju\dao" />
+      <recent name="E:\idesWord\smartCommunity\CODE\smart-community\property-api\src\main\java\com\community\huiju\model" />
+    </key>
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager">
+    <configuration name="PropertyApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
+      <module name="property-api" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.community.huiju.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.community.huiju.PropertyApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Spring Boot.PropertyApplication" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="8242fb4e-eadf-4769-b4c9-e866954fc164" name="Default Changelist" comment="" />
+      <created>1550546576183</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1550546576183</updated>
+      <workItem from="1550546577888" duration="997000" />
+      <workItem from="1550547757316" duration="45000" />
+      <workItem from="1550547903821" duration="17904000" />
+      <workItem from="1550580590425" duration="175000" />
+      <workItem from="1550625046867" duration="10953000" />
+      <workItem from="1550663154868" duration="404000" />
+      <workItem from="1550711362440" duration="16076000" />
+      <workItem from="1550798426456" duration="22840000" />
+      <workItem from="1551057295750" duration="236000" />
+      <workItem from="1551143469375" duration="6771000" />
+      <workItem from="1551229983710" duration="2843000" />
+      <workItem from="1551403008725" duration="3245000" />
+      <workItem from="1551662011680" duration="1281000" />
+      <workItem from="1551749121214" duration="1532000" />
+      <workItem from="1551756299155" duration="11716000" />
+      <workItem from="1551834513428" duration="31209000" />
+      <workItem from="1551920868695" duration="9458000" />
+      <workItem from="1553821766053" duration="18204000" />
+      <workItem from="1554081715307" duration="21935000" />
+      <workItem from="1554253927484" duration="19221000" />
+      <workItem from="1554339968040" duration="8971000" />
+      <workItem from="1554684650072" duration="29975000" />
+      <workItem from="1554773796107" duration="21853000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="63000" />
+  </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" sideWeight="0.49854228" visible="true" weight="0.18176973" />
+      <window_info id="Structure" order="1" sideWeight="0.50145775" side_tool="true" weight="0.25692964" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="Capture Tool" order="4" />
+      <window_info id="UI Designer" order="5" />
+      <window_info id="Favorites" order="6" side_tool="true" />
+      <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.298441" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.8523454" visible="true" weight="0.38752785" />
+      <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.14765458" side_tool="true" weight="0.26837417" />
+      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49840087" weight="0.30289534" />
+      <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" visible="true" weight="0.015991472" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.20255864" />
+      <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" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32983872" />
+    </layout>
+    <layout-to-restore>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15242778" />
+      <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" />
+      <window_info id="Capture Tool" order="4" />
+      <window_info id="UI Designer" order="5" />
+      <window_info id="Favorites" order="6" side_tool="true" />
+      <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.36302894" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.91518134" visible="true" weight="0.3776301" />
+      <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" />
+      <window_info anchor="bottom" id="Terminal" order="8" />
+      <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.3001066" side_tool="true" weight="0.5222717" />
+      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49969268" weight="0.19376393" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <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="Palette" order="4" />
+      <window_info anchor="right" id="Capture Analysis" order="5" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32983872" />
+    </layout-to-restore>
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="Branch">
+          <value>
+            <list />
+          </value>
+        </entry>
+        <entry key="User">
+          <value>
+            <list />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TransactionServiceImpl.java</url>
+          <line>144</line>
+          <properties />
+          <option name="timeStamp" value="10" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
+  <component name="antWorkspaceConfiguration">
+    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+    <option name="FILTER_TARGETS" value="false" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TransactionReply.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="77" column="30" selection-start-line="77" selection-start-column="30" selection-end-line="77" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TransactionServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="268" column="23" selection-start-line="268" selection-start-column="23" selection-end-line="268" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TransactionController.java

@@ -91,4 +91,37 @@ public class TransactionController extends BaseController {
 		ResponseBean  addAnnouncement= transactionService.transactionsAdd(paramets,userElement.getCommunityId(),userElement.getId());
 		return addAnnouncement;
 	}
+
+	@ApiOperation(value = "添加二手租赁",nickname ="添加二手租赁")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="transactionTitle:话题标题，" +
+					"type:0 代表 二手（卖二手物品）  1 是代表 求购 （买二手物品） 2 是代表 租赁（租二手物品）3其他话题，contentImg：图片，sort:权重值,status:'0 是已作废 1 是已发布  2 是草稿 ")})
+	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+	@RequestMapping(value="/transactions/updata",method = RequestMethod.POST)
+	public ResponseBean transactionsUpdata(@RequestBody String paramets, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  transactionsUpdata= transactionService.transactionsUpdata(paramets,userElement.getCommunityId(),userElement.getId());
+		return transactionsUpdata;
+	}
+	@ApiOperation(value = "删除二手租赁",nickname ="删除二手租赁")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id(多个)" )})
+	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+	@RequestMapping(value="/transactions/delete",method = RequestMethod.POST)
+	public ResponseBean transactionsDelete(@RequestBody String paramets, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  transactionsUpdata= transactionService.transactionsDelete(paramets,userElement.getCommunityId(),userElement.getId());
+		return transactionsUpdata;
+	}
+
+	@ApiOperation(value = "二手评论列表",nickname ="二手评论列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id" )})
+	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+	@RequestMapping(value="/transactionReplyList",method = RequestMethod.POST)
+	public ResponseBean transactionReplyList(@RequestBody String paramets, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  transactionReplyList= transactionService.transactionReplyList(paramets,userElement.getCommunityId(),userElement.getId());
+		return transactionReplyList;
+	}
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.community.huiju.model.TpTicket;
 import com.community.huiju.model.TpTransaction;
+import com.community.huiju.model.TransactionReport;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -20,4 +21,6 @@ import java.util.List;
 public interface TpTransactionMapper extends BaseMapper<TpTransaction> {
 
 	List<TpTransaction> selectListByParams(Page page, @Param("transactionTitle") String transactionTitle,@Param("userName") String userName, @Param("id")Integer id, @Param("status")Integer status,@Param("communityId") Integer communityId);
+
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TransactionReplyMapper.java

@@ -0,0 +1,27 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.community.huiju.model.TransactionReply;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 物业web端二手交易评论表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-09
+ */
+public interface TransactionReplyMapper extends BaseMapper<TransactionReply> {
+
+    /**
+     * 二手帖子列表
+     * @param page
+     * @param id
+     * @return
+     */
+    List<TransactionReply> transactionReplyList(Page page, @Param("id") Integer id,@Param("userID") Integer userID,@Param("status") Integer status);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TransactionReportMapper.java

@@ -2,6 +2,7 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TransactionReport;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author jobob
  * @since 2019-04-08
  */
+@Mapper
 public interface TransactionReportMapper extends BaseMapper<TransactionReport> {
 
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpTransaction.java

@@ -116,4 +116,14 @@ public class TpTransaction implements Serializable {
      */
     @TableField(exist = false)
     private Integer reportSum;
+
+    /**
+     * 权重
+     */
+    private String sort;
+
+    /**
+     * 1代表物业端发帖子，0代表app端发帖子
+     */
+    private String releaseIdentity;
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TransactionReply.java

@@ -0,0 +1,80 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 物业web端二手交易评论表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_transaction_reply")
+public class TransactionReply implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 交易帖子ID
+     */
+    private Integer transactionId;
+
+    /**
+     * 回复帖子的住户APP端的用户ID
+     */
+    private Integer taUserId;
+
+    /**
+     * 回复帖子的住户APP端的用户姓名
+     */
+    private String taUserName;
+
+    /**
+     * 0代表app端用户，1代表物业端用户，
+     */
+    private String releaseIdentity;
+
+    /**
+     * 回复内容
+     */
+    private String replyContent;
+
+    /**
+     * 被回复的评论内容的住户App端用户ID
+     */
+    private Integer replyTaUserId;
+
+    /**
+     * 被回复的评论内容的住户App端用户姓名
+     */
+    private String replyTaUserName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 回复的图片List
+     */
+    @TableField(exist = false)
+    private List<String> tdImagesLists;
+}

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

@@ -39,4 +39,31 @@ public interface ITransactionService extends IService<TpTransaction> {
 	 * @return
 	 */
     ResponseBean transactionsAdd(String paramets, Integer communityId, Integer id);
+
+	/**
+	 * 修改二手交易
+	 * @param paramets
+	 * @param communityId
+	 * @param id
+	 * @return
+	 */
+    ResponseBean transactionsUpdata(String paramets, Integer communityId, Integer id);
+
+	/**
+	 * 删除二手帖子
+	 * @param paramets
+	 * @param communityId
+	 * @param id
+	 * @return
+	 */
+	ResponseBean transactionsDelete(String paramets, Integer communityId, Integer id);
+
+	/**
+	 * 二手帖子评论列表
+	 * @param paramets
+	 * @param communityId
+	 * @param id
+	 * @return
+	 */
+	ResponseBean transactionReplyList(String paramets, Integer communityId, Integer id);
 }

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

@@ -8,10 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
-import com.community.huiju.dao.TdImagesMapper;
-import com.community.huiju.dao.TpTransactionMapper;
-import com.community.huiju.dao.TransactionLikeMapper;
-import com.community.huiju.dao.TransactionReportMapper;
+import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
 import com.community.huiju.service.ITransactionService;
 import com.google.common.collect.Maps;
@@ -20,6 +17,7 @@ import org.springframework.stereotype.Service;
 
 import javax.xml.crypto.Data;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -48,6 +46,12 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 	@Autowired
 	private TransactionReportMapper transactionReportMapper;
 
+	@Autowired
+	private UserMapper userMapper;
+
+	@Autowired
+	private TransactionReplyMapper transactionReplyMapper;
+
 
 	@Override
 	public ResponseBean getTransactionList(String parameter,Integer communityId) {
@@ -139,14 +143,20 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 	@Override
 	public ResponseBean transactionsAdd(String paramets, Integer communityId, Integer id) {
 		ResponseBean response = new ResponseBean();
+
 		JSONObject jsonobject = JSONObject.parseObject(paramets);
+
 		TpTransaction tpTransaction = JSONObject.parseObject(paramets, TpTransaction.class);
 		tpTransaction.setCommunityId(communityId);
-		tpTransaction.setTaUserId(null);
+		tpTransaction.setTaUserId(userMapper.selectById(id).getTaUserId());
 		tpTransaction.setCreateDate(LocalDateTime.now());
 		tpTransaction.setCreateUser(id);
 		tpTransaction.setViewCount(0);
+		tpTransaction.setIsReported("0");
+		tpTransaction.setReleaseIdentity("1");
+		tpTransactionMapper.insert(tpTransaction);
 		JSONArray contentImg = jsonobject.getJSONArray("contentImg");
+
 		String[] contentImgArray = contentImg.toArray(new String[]{});
 		if (tpTransaction.getTransactionTitle() == null) {
 			response.addError("标题不能为空");
@@ -168,4 +178,108 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		return response;
 
 	}
+
+	@Override
+	public ResponseBean transactionsUpdata(String paramets, Integer communityId, Integer id) {
+		ResponseBean response = new ResponseBean();
+
+		JSONObject jsonobject = JSONObject.parseObject(paramets);
+
+		TpTransaction tpTransaction = JSONObject.parseObject(paramets, TpTransaction.class);
+		tpTransaction.setCommunityId(communityId);
+		tpTransaction.setTaUserId(userMapper.selectById(id).getTaUserId());
+		tpTransaction.setUpdateDate(LocalDateTime.now());
+		tpTransaction.setCreateUser(id);
+		tpTransactionMapper.updateById(tpTransaction);
+		JSONArray contentImg = jsonobject.getJSONArray("contentImg");
+
+		String[] contentImgArray = contentImg.toArray(new String[]{});
+		if (tpTransaction.getTransactionTitle() == null) {
+			response.addError("标题不能为空");
+			return response;
+		}
+		if (null == tpTransaction.getTransactionContent() && null == contentImg) {
+			response.addError("内容和图片必须填一个");
+			return response;
+		}
+		//修改图片时删除原来图片
+		QueryWrapper<TdImages> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().eq(TdImages::getUuid, tpTransaction.getId());
+		queryWrapper.lambda().eq(TdImages::getType, "transaction");
+		tdImagesMapper.delete(queryWrapper);
+
+		for (String img : contentImgArray) {
+			TdImages tdImages = new TdImages();
+			tdImages.setImageUrl(img);
+			tdImages.setType("transaction");
+			tdImages.setUuid(tpTransaction.getId());
+			tdImages.setCreateTime(LocalDateTime.now());
+			tdImages.setCreateUser(id);
+			tdImagesMapper.insert(tdImages);
+		}
+		return response;
+	}
+
+	@Override
+	public ResponseBean transactionsDelete(String paramets, Integer communityId, Integer userId) {
+		ResponseBean response = new ResponseBean();
+		JSONObject parseObject = JSONObject.parseObject(paramets);
+
+		JSONArray tpTransactionIdId = parseObject.getJSONArray("id");
+		Integer[] announcementIdArray = tpTransactionIdId.toArray(new Integer[]{});
+		for (Integer id : announcementIdArray) {
+			TpTransaction tpTransaction = new TpTransaction();
+			tpTransaction.setId(id);
+			tpTransaction.setStatus("0");
+			tpTransaction.setUpdateDate(LocalDateTime.now());
+			tpTransaction.setUpdateUser(userId);
+			tpTransactionMapper.updateById(tpTransaction);
+//			//1.5版本维护消息
+//			Message message= new Message();
+//			message.setStatus("0");
+//			message.setAnnouncementId(id);
+//			message.setUpdateUser(userId);
+//			message.setUpdateDate(LocalDateTime.now());
+//			tdImagesMapper.updateMessage(message);
+		}
+		response.addSuccess("成功");
+		return response;
+	}
+
+	@Override
+	public ResponseBean transactionReplyList(String paramets, Integer communityId, Integer userID) {
+		ResponseBean responseBean = new ResponseBean();
+		JSONObject object= JSONObject.parseObject(paramets);
+		Integer id = object.getInteger("id");
+		Integer status = object.getInteger("status");
+		Integer pageNum = object.getInteger("pageNum");
+		Integer pageSize = object.getInteger("pageSize");
+		Page<TransactionReply> page = new Page<>();
+		page.setSize(pageSize == null ? 10 : pageSize);
+		page.setCurrent(pageNum == null ? 1 : pageNum);
+		// 分页查询
+		List<TransactionReply> TransactionReplylList = transactionReplyMapper.transactionReplyList(page,id,userID,status);
+		//查询帖子评论所带图片
+
+		for (TransactionReply transactionReply:TransactionReplylList){
+			QueryWrapper<TdImages> tdImagesList = new QueryWrapper<>();
+			tdImagesList.eq("uuid",transactionReply.getId());
+			tdImagesList.eq("type","reply");
+			List<TdImages> tdImages= tdImagesMapper.selectList(tdImagesList);
+			List<String> list= new ArrayList<>();
+			for (TdImages imageUrl:tdImages){
+				list.add(imageUrl.getImageUrl());
+				transactionReply.setTdImagesLists(list);
+			}
+
+		}
+
+		Map<String, Object> map = Maps.newHashMap();
+		map.put("list",TransactionReplylList);
+		map.put("total",page.getTotal());
+		map.put("pageNum", page.getCurrent());
+		map.put("pageSize", page.getSize());
+		responseBean.addSuccess(map);
+		return responseBean;
+	}
 }

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

@@ -17,11 +17,12 @@
         COUNT(re.transaction_id) AS replySum
         FROM
         tp_transaction t
-        LEFT JOIN ta_user ta ON  t.create_user = ta.id
+        LEFT JOIN ta_user ta ON  t.ta_user_id = ta.id
         LEFT JOIN ta_visitor v ON ta.id = v.ta_user_id
         LEFT JOIN tp_transaction_like li ON t.id = li.transaction_id AND li.like_status=1
         LEFT JOIN tp_transaction_reply re ON t.id = re.transaction_id
         WHERE t.community_id =#{communityId}
+        and t.status=1
         <if test="id != null and id != '' or id ==0">
             and t.id like concat('%',#{id},'%')
         </if>
@@ -31,9 +32,6 @@
         <if test="status != null and status != '' and status != '-1' ">
             and t.status = #{status}
         </if>
-        <if test="status != null and status != '' and status = '-1' ">
-            and  t.type in(0,1,2)
-        </if>
         <if test="userName != null and userName != ''">
             and ta.user_name like concat('%',#{userName,jdbcType=VARCHAR},'%')
         </if>

CODE/smart-community/property-api/src/main/resources/mapper/TransactionReplyMapper.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TransactionReplyMapper">
+    <select id="transactionReplyList" resultType="com.community.huiju.model.TransactionReply">
+    SELECT
+        re.id,
+        re.community_id,
+        re.transaction_id,
+        re.ta_user_id,
+        re.ta_user_name,
+        re.reply_content,
+        re.reply_ta_user_id,
+        re.reply_ta_user_name,
+        re.create_date
+    FROM
+        tp_transaction tr
+    LEFT JOIN tp_transaction_reply re ON tr.id = re.transaction_id
+    WHERE
+        tr.id = #{id}
+    <if test="status != null and status !=''and status == 0 ">
+    AND re.release_identity in(1,2)
+    AND re.reply_ta_user_id = #{userID}
+    </if>
+
+    <if test="status != null and status !=''and status == 1 ">
+    AND re.release_identity = 0
+    AND re.reply_ta_user_id = #{userID}
+    </if>
+
+    <if test="status != null and status !=''and status == 2 ">
+    AND re.release_identity = 0
+    AND re.ta_user_id = #{userID}
+    </if>
+
+    <if test="status != null and status !=''and status == 3 ">
+    AND re.release_identity in(1,2)
+    AND re.ta_user_id = tr.create_user
+    </if>
+    </select>
+
+</mapper>

CODE/smart-community/property-api/src/main/resources/mapper/TransactionReportMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.community.huiju.dao.mapper.TransactionReportMapper">
+<mapper namespace="com.community.huiju.dao.TransactionReportMapper">
 
 </mapper>

VUECODE/smart-property-manage/src/api/transaction.js

@@ -45,11 +45,56 @@ export function transactionsAdd(data) {
     method: 'post',
     data: {
       transactionTitle: data.transactionTitle,
+      type: data.type,
       id: data.id,
       userName: data.userName,
       status: data.status,
       contentImg: data.contentImg,
-      announcementContent: data.announcementContent
+      transactionContent: data.transactionContent,
+      sort: data.sort
+    }
+  })
+}
+
+export function transactionsEdit(data) {
+  return request({
+    url: '/transactions/updata',
+    method: 'post',
+    data: {
+      transactionTitle: data.transactionTitle,
+      type: data.type,
+      id: data.id,
+      userName: data.userName,
+      status: data.status,
+      contentImg: data.contentImg,
+      transactionContent: data.transactionContent,
+      sort: data.sort
+    }
+  })
+}
+export function transactionsDelete(data) {
+  console.log('1111')
+  console.log(data)
+  return request({
+    url: '/transactions/delete',
+    method: 'post',
+    data: {
+      id: data
+    }
+  })
+}
+
+export function transactionReplyList(data) {
+  return request({
+    url: '/transactionReplyList',
+    method: 'post',
+    data: {
+      transactionTitle: data.transactionTitle,
+      id: data.id,
+      userName: data.userName,
+      status: data.status,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize
     }
   })
 }

VUECODE/smart-property-manage/src/router/index.js

@@ -118,13 +118,27 @@ export const constantRouterMap = [
         hidden: true,
         meta: { title: '添加二手求购', icon: 'table' }
       },
+      {
+        path: '/transaction/transaction',
+        component: () => import('@/views/social/transaction/transactionEdit'),
+        name: 'transaction-edit',
+        hidden: true,
+        meta: { title: '修改二手求购', icon: 'table' }
+      },
       {
         path: '/transaction/info',
-        component: () => import('@/views/social/transaction/info/transactionInfo'),
+        component: () => import('@/views/social/transaction/transactionDetails'),
         name: 'transaction-info',
         hidden: true,
         meta: { title: '二手求购租赁详情', icon: 'table' }
       },
+      {
+        path: '/transaction/reply',
+        component: () => import('@/views/social/transaction/reply/transactionreply'),
+        name: 'transactionreply-index',
+        hidden: true,
+        meta: { title: '二手帖子回复列表', icon: 'table' }
+      },
       {
         path: '/activity/add',
         component: () => import('@/views/social/activity/add/index'),

VUECODE/smart-property-manage/src/store/modules/transaction.js

@@ -1,4 +1,4 @@
-import { fetchList, transactionById, updateTransactionById, transactionsList, transactionsAdd} from '@/api/transaction'
+import { fetchList, transactionById, updateTransactionById, transactionsList, transactionsAdd, transactionsEdit, transactionsDelete, transactionReplyList } from '@/api/transaction'
 
 const transaction = {
   namespaced: true,
@@ -65,6 +65,33 @@ const transaction = {
           reject(error)
         })
       })
+    },
+    TransactionsEdit({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        transactionsEdit(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    TransactionsDelete({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        transactionsDelete(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    TransactionReplyList({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        transactionReplyList(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/social/transaction/index.vue

@@ -16,8 +16,7 @@
          <el-option label="选择状态" value="" />
          <el-option label="议事大厅" value="0"/>
          <el-option label="友令互助" value="1"/>
-         <!-- -1包括，二手，租赁，求购 -->
-         <el-option label="二手租赁" value="-1"/>
+         <el-option label="二手租赁" value="2"/>
          <el-option label="其他" value="3"/>
         </el-select>
       </el-form-item>
@@ -29,7 +28,7 @@
     <div class="button">
       <el-button type="primary" @click="add">添加</el-button>
       <el-button type="warning" @click="edit">修改</el-button>
-      <el-button type="danger" @click="deleteAnnouncement">作废</el-button>
+      <el-button type="danger" @click="deleteTransaction">作废</el-button>
     </div>
     <el-table
       v-loading="listLoading"
@@ -44,14 +43,18 @@
         width="55"/>
       <el-table-column prop="id" label="话题编号" align="center"/>
        <el-table-column prop="type" label="话题类型" align="center"/>
-      <el-table-column prop="transactionTitle" label="话题标题" align="center"/>
+      <el-table-column prop="transactionTitle" label="话题标题" align="center">
+      <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.transactionTitle }}</span></a></template>
+      </el-table-column>
       <el-table-column prop="userName" label="发布人" align="center"/>
       <el-table-column prop="createDate" label="发布时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>
 
       <el-table-column prop="viewCount" label="查看人数" align="center"/>
       <el-table-column prop="transactionLikeSum" label="点赞数" align="center"/>
       <el-table-column prop="transactionNoLikeSum" label="点衰数" align="center"/>
-      <el-table-column prop="replySum" label="回复数" align="center"/>
+      <el-table-column prop="replySum" label="回复数" align="center">
+        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickReply(scope.row.id)">{{ scope.row.replySum }}</span></a></template>
+      </el-table-column>
       <el-table-column prop="reportSum" label="举报数量" align="center"/>
     </el-table>
     <div class="block">
@@ -120,27 +123,27 @@ export default {
       return value
     },
     getStatus(row) { // 获取状态
-      let statusName = ''
+      // let statusName = ''
 
-      // 判断状态
-      switch (row.status) {
-        case '0':
-          statusName = '已作废'
-          break
-        case '1':
-          statusName = '已发布'
-          break
-        case '2':
-          statusName = '草稿'
-          break
-      }
+      // // 判断状态
+      // // switch (row.status) {
+      // //   case '0':
+      // //     statusName = '已作废'
+      // //     break
+      // //   case '1':
+      // //     statusName = '已发布'
+      // //     break
+      // //   case '2':
+      // //     statusName = '草稿'
+      // //     break
+      // // }
 
-      // 如果修改时间和创建时间不一致, 就显示已修改
-      if (row.status === '1' && (row.updateDate > row.createDate)) {
-        statusName = '已修改'
-      }
+      // // 如果修改时间和创建时间不一致, 就显示已修改
+      // if (row.status === '1' && (row.updateDate > row.createDate)) {
+      //   statusName = '已修改'
+      // }
 
-      return statusName
+      // return statusName
     },
     dataQuery() { // 查询数据
     
@@ -192,57 +195,54 @@ export default {
         this.$message.error('请选择一行数据进行修改!')
         return
       }
-       let ide= this.deleteIds[0]
-       this.listQuery.id = ide
-      this.$store.dispatch('AnnouncementById', this.listQuery).then((res) => {
-        const resData = res.data
-        const announcement = resData.tpAnnouncement
-        const imgList = resData.studentList
-        this.listQuery = announcement
-        this.listQuery.announcementTitle = ''
-        console.log("1",this.listQuery.status)
-        if(this.listQuery.status == 0){
-          this.$message.error('已作废不可以修改')
-          return
-        }
-       this.$router.push({ name: 'announcement-edit', params: { id: ids[0] }})
-      }) 
+       let id= this.deleteIds[0]
+       this.$router.push({ name: 'transaction-edit', query: { id: id }})
       },
-    deleteAnnouncement(){
-       let ide= this.deleteIds[0]
-       this.listQuery.id = ide 
-      this.$store.dispatch('AnnouncementById', this.listQuery).then((res) => {
-        const resData = res.data
-        const announcement = resData.tpAnnouncement
-        const imgList = resData.studentList
-        this.listQuery.status= announcement.status
-        console.log("1",this.listQuery.status)
-        if(this.listQuery.status == 0){
-          this.$message.error('已作废不可以作废')
-          return
-        }
-        this.deleteId()     
-      })    
+    deleteTransaction(){
+      const ids = this.deleteIds
+      if (ids < 1) {
+        this.$message.error('请选择一行数据进行修改!')
+        return
+      }
+      // this.$store.dispatch('AnnouncementById', this.listQuery).then((res) => {
+      //   const resData = res.data
+      //   const announcement = resData.tpAnnouncement
+      //   const imgList = resData.studentList
+      //   this.listQuery.status= announcement.status
+      //   console.log("1",this.listQuery.status)
+      //   if(this.listQuery.status == 0){
+      //     this.$message.error('已作废不可以作废')
+      //     return
+      //   }
+      //   this.deleteId()     
+      // }) 
+      this.deleteId()   
     },
 
     deleteId(){
-       const ids = this.deleteIds
+      const ids = this.deleteIds
       this.listLoading = true
       console.log(ids)
-      this.$store.dispatch('DeleteAnnouncement', ids).then((res) => {
+      this.$store.dispatch('transaction/TransactionsDelete', ids).then((res) => {
         this.listLoading = false
-        this.listQuery.announcementTitle = ''
         this.dataQuery()
       }).catch(() => {
         this.listLoading = false
-        console.log('error DeleteAnnouncement')
+        console.log('error TransactionsDelete')
       })
     },
 
-
+    // 二手帖子详情
     clickTitle(id) {
-      this.$router.push({ name: 'contentParticulars-details', query: { id: id }})
+      console.log('id',id)
+      this.$router.push({ name: 'transaction-info', query: { id: id }})
+    },
+      // 回复列表
+    clickReply(id) {
+      console.log('id',id)
+      this.$router.push({ name: 'transactionreply-index', query: { id: id }})
     },
+    
     formatDate(val) {
       if (val === null) {
         return ''

VUECODE/smart-property-manage/src/views/social/transaction/info/transactionInfo.vue

@@ -1,74 +1,84 @@
 <template>
   <div id="root">
-    <span class="activityTile">{{ ruleForm.transactionTitle }}</span>
-    <div class="activityContext">
-      {{ ruleForm.transactionContent }}
+    <el-form ref="form" label-width="100px" label-position="left">
+      <el-form-item label="公共标题">
+        <span class="activityTile">{{ ruleForm.announcementTitle }}</span>
+      </el-form-item>
+      <el-form-item label="公告轮播图">
+        <span style="color: #99a9bf;">轮播图为横幅位展示图片，不会显示在公告详情页</span>
+        <img :src="ruleForm.announcementCarouselImg" width="100" height="100">
+      </el-form-item>
+      <el-form-item label="公告详细内容">
+        <div class="activityContext">
+          {{ ruleForm.announcementContent }}
+        </div>
+      </el-form-item>
+      <el-form-item label="公告配图">
+        <template v-for="site in ruleForm.contentImg">
+          <img :src="site.url" width="100" height="100" >
+        </template>
+      </el-form-item>
+    </el-form>
+    <div class="bom-button">
+      <el-button v-if="isEdi" type="primary" style="width: 150px;" @click="edi">修改</el-button>
     </div>
-    <div class="activityContextImg">
-      <img v-for="item in ruleForm.contentImg" :src="item" width="700" height="500" >
-    </div>
-    <el-button v-if="ruleForm.status === '1'" type="primary" style="width: 130px;margin-left: 250px;" @click="invalid">作废</el-button>
   </div>
 </template>
 
 <script>
-import { mapState, mapActions, mapMutations } from 'vuex'
-
 export default {
+  name: 'Index',
   data() {
     return {
       asOfdate: '2018/10/10 23:59:59',
       ruleForm: {
         id: '',
-        status: '',
-        transactionTitle: '',
-        transactionContent: '', // 交易内容详细
-        contentImg: [] // 活动内容配图
-      }
+        announcementTitle: '',
+        announcementCarouselImg: '', // 轮播图
+        announcementContent: '', // 内容详细
+        contentImg: [], // 内容配图
+        signUpCount: '', // 报名人数统计
+        registrationEndTime: '', // 报名活动结束时间
+        sort: 1, // 权重
+        status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
+      },
+      isEdi: true // 默认显示修改按钮
     }
   },
   mounted() {
-    this.getById(this.$route.params.id)
+    this.ruleForm.id = this.$route.query.id
+    this.getById()
   },
   methods: {
-    ...mapActions('transaction', [
-      'TransactionById',
-      'UpdateTransactionById'
-    ]),
-    getById(id) { // 根据ID获取活动信息
-      this.TransactionById(id).then((res) => {
-        const resData = res.data.tpTransaction
-        this.ruleForm.transactionTitle = resData.transactionTitle
-        this.ruleForm.transactionContent = resData.transactionContent
-        this.ruleForm.status = resData.status
-        this.ruleForm.contentImg = res.data.list
-      }).catch(() => {
-        console.log('get list error')
+    getById() { // 根据ID获取活动信息
+      this.$store.dispatch('AnnouncementById', this.ruleForm).then((res) => {
+        const resData = res.data
+        const announcement = resData.tpAnnouncement
+        const imgList = resData.studentList
+        this.ruleForm = announcement
+        // 多张图片进行遍历
+        this.ruleForm.contentImg = []
+        for (let i = 0; i < imgList.length; i++) {
+          this.ruleForm.contentImg.push({ url: imgList[i].imageUrl })
+        }
+        if (this.ruleForm.status === '0') {
+          this.isEdi = false
+        }
       })
     },
-    invalid(){
-      this.$confirm('确定要作废此帖吗？作废相当于删除帖子, 是否继续?', '作废确认提示', {
-        confirmButtonText: '确定作废',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.UpdateTransactionById(this.$route.params.id).then((res) => {
-          if (res.code === '0') {
-          this.$message({
-            message: "作废成功",
-            type: 'success'
-          })
-          // 切换路由
-          this.$router.push({ name: 'transaction-import' })
-          return
-        }
-        this.$message.error(res.message)
-        }).catch(() => {
-          console.log('update error')
-        })
-      }).catch(() => {
-        console.log("cancel")        
-      });
+    formatDate(val) {
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      // var hour = value.getHours()
+      // var minutes = value.getMinutes()
+      // var seconds = value.getSeconds()
+      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      return year + '-' + month + '-' + day
+    },
+    edi() { // 修改活动
+      this.$router.push({ name: 'announcement-edit', query: { id: this.ruleForm.id }})
     }
   }
 }
@@ -78,7 +88,7 @@ export default {
 #root {
   display: flex;
   flex-flow: column;
-  width: 700px;
+  width: 500px;
   margin-top: 50px;
   margin-left: auto;
   margin-right: auto;
@@ -89,35 +99,35 @@ export default {
   margin-bottom: 10px;
 }
 .activityContext{
-  margin-top: 20px;
+  /*margin-top: 20px;*/
   margin-bottom: 20px;
   font-size: 20px;
   justify-items: center;
 }
-.progress {
+/* .progress {
   display: flex;
   justify-content: space-between;
   margin-top: 20px;
   margin-bottom: 20px;
-}
-.text-progress {
+} */
+/* .text-progress {
   width: 500px;
   float: left;
   align-content: center;
   position: absolute;
   margin-top: 12px;
-}
-.people-number {
+} */
+/* .people-number {
   position: relative;
   margin-left: 180px;
-}
-.outer-layer {
+} */
+/* .outer-layer {
   background-color: gainsboro;
   height: 3px;
   width: 450px;
   margin-top: -10px;
   position: relative;
-}
+} */
 .inner-layer {
   background-color: aquamarine;
   height: 6px;
@@ -125,20 +135,20 @@ export default {
   position: relative;
   margin-top: -4px;
 }
-.circular {
+/* .circular {
   border: 1px #001528 solid;
   border-radius: 10px;
   /*background-color: chartreuse;*/
-  width: 20px;
+ /* width: 20px;
   height: 20px;
   position: relative;
   margin-left: 452px;
   margin-top: 11px;
   float: left;
-}
-.people-limit {
+} */
+/* .people-limit {
   margin-top: 13px;
-}
+} */
 .bom-button{
   display: flex;
   justify-content: center;

VUECODE/smart-property-manage/src/views/social/transaction/reply/transactionreply.vue

@@ -0,0 +1,234 @@
+
+<template>
+  <div class="root">
+    <el-form :inline="true" :model="listQuery" class="form-listQuery">
+      <el-form-item class="filter-item" label="回复人姓名" >
+        <el-input v-model.trim="listQuery.taUserName" placeholder="回复人姓名" />
+      </el-form-item>
+      <el-form-item class="filter-item" label="被回复人姓名" >
+        <el-input v-model.trim="listQuery.replyTaUserName" placeholder="被回复人姓名" />
+      </el-form-item>
+
+      <el-form-item class="filter-item" label="话题类型" >
+        <el-select v-model="listQuery.status" placeholder="请选择">
+         <el-option label="选择状态" value="" />
+         <el-option label="回复我的" value="0"/>
+         <el-option label="回复全部物业人员的" value="1"/>
+         <el-option label="全部物业人员回复的" value="2"/>
+         <el-option label="话题发起人回复的" value="3"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item class="filter-item" label="日期">
+        <span >
+        <span class="demonstration"></span>
+        <el-date-picker
+        v-model="listQuery.dataValue"
+        type="date"
+        placeholder="年-月-日">
+        </el-date-picker>
+      </span>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" class="filter-item" @click="handleFilter">清空</el-button>
+        <el-button type="primary" @click="search">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="button">
+      <el-button type="danger" >作废</el-button>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="transactionsList"
+      border
+      tooltip-effect="dark"
+      style="width: 100%; margin-top: 20px;"
+      @selection-change="handleSelectionChange">
+      <el-table-column
+        type="selection"
+        width="55"/>
+      <el-table-column prop="taUserName" label="回复人" align="center"/>
+       <el-table-column prop="replyContent" label="回复内容" align="center"/>
+      <el-table-column prop="transactionTitle" label="回复配图" align="center">
+           <template slot-scope="scope">
+             <img v-for="sr in scope.row.tdImagesLists" :src="sr" preview  width="50" height="50">
+           </template>
+      </el-table-column>
+      <el-table-column prop="replyTaUserName" label="被回复人" align="center"/>
+      <el-table-column prop="createDate" label="时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>
+      <el-table-column prop="viewCount" label="操作" align="center">
+      <template slot-scope="scope"><a><span style="color: #63B8FF" @click="TransactionReplyAdd(scope.row.id)">{{ '回复此回复' }}</span></a></template>
+      </el-table-column>  
+    </el-table>
+    <div class="block">
+      <el-pagination
+        :current-page.sync="listQuery.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size.sync="listQuery.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapActions } from 'vuex'
+
+export default {
+  data() {
+    return {
+      listQuery: {
+        communityId: '',
+				createDate: '',
+				releaseIdentity: '',
+				replyContent: '',
+				replyTaUserId: '',
+				replyTaUserName: '',
+				taUserId: '1',
+				taUserName: '',
+				transactionId: '',
+        pageNum: '1',
+        pageSize: 10
+      },
+      total: 0, // 数据总数
+      transactionsList: [],
+      deleteIds: [], // 选择的id集合
+      listLoading: true // 加载圈
+    }
+  },
+  mounted() {
+    this.listQuery.id = this.$route.query.id
+    // 获取数据
+    this.dataQuery()
+  },
+  methods: {
+    ...mapActions('listAnnouncement', [
+      'BserPassCertification'
+    ]),
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.listQuery.pageSize = val
+      this.dataQuery()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.listQuery.pageNum = val
+      this.dataQuery()
+    },
+    padDate(value) {
+      value = value < 10 ? '0' + value : value
+      return value
+    },
+    getStatus(row) { // 获取状态
+      // let statusName = ''
+
+      // // 判断状态
+      // // switch (row.status) {
+      // //   case '0':
+      // //     statusName = '已作废'
+      // //     break
+      // //   case '1':
+      // //     statusName = '已发布'
+      // //     break
+      // //   case '2':
+      // //     statusName = '草稿'
+      // //     break
+      // // }
+
+      // // 如果修改时间和创建时间不一致, 就显示已修改
+      // if (row.status === '1' && (row.updateDate > row.createDate)) {
+      //   statusName = '已修改'
+      // }
+
+      // return statusName
+    },
+    dataQuery() { // 查询数据
+      this.listLoading = true
+      this.$store.dispatch('transaction/TransactionReplyList', this.listQuery).then((res) => {
+        const resData = res.data
+        this.transactionsList = resData.list
+        this.listQuery.pageNum = resData.pageNum
+        this.listQuery.pageSize = resData.pageSize
+        this.total = resData.total
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error TransactionsList')
+      })
+    },
+    handleSelectionChange(data) {
+      // 设置为 空
+      this.deleteIds = []
+      for (let i = 0; i < data.length; i++) {
+        this.deleteIds.push(data[i].id)
+      }
+    },
+	  search() {
+      this.listQuery.pageNum = 1
+      this.dataQuery()
+    },
+    handleFilter() {
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
+      this.listQuery.ownerName =''
+      this.listQuery.id=''
+      this.listQuery.status=''
+      this.listQuery.userName=''
+      this.dataQuery()
+    },
+    deleteId(){
+      const ids = this.deleteIds
+      this.listLoading = true
+      console.log(ids)
+      this.$store.dispatch('transaction/TransactionsDelete', ids).then((res) => {
+        this.listLoading = false
+        this.dataQuery()
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error TransactionsDelete')
+      })
+    },
+
+
+    
+    formatDate(val) {
+      if (val === null) {
+        return ''
+      }
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      return year + '-' + month + '-' + day
+    }
+  }
+}
+</script>
+
+<style scoped>
+.root{
+  display: flex;
+  flex-flow: column;
+}
+.form-listQuery{
+  margin-top: 20px;
+  margin-left: 30px;
+}
+.operation{
+  display: flex;
+  justify-content: space-between;
+  margin-left: 20px;
+  margin-right: 20px;
+}
+.block{
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
+.button {
+  margin-left: 20px;
+}
+</style>
+

VUECODE/smart-property-manage/src/views/social/transaction/transactionAdd.vue

@@ -3,7 +3,7 @@
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
 
     <el-form-item class="filter-item" label="话题类型" >
-        <el-select v-model="ruleForm.status" placeholder="请选择">
+        <el-select v-model="ruleForm.type" placeholder="请选择">
          <el-option label="选择状态" value="" />
          <el-option label="议事大厅" value="0"/>
          <el-option label="友令互助" value="1"/>
@@ -16,7 +16,7 @@
         <el-input v-model="ruleForm.transactionTitle" placeholder="20字以内"/>
       </el-form-item>
       <el-form-item label="话题详细描述">
-        <el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="内容，规则，时间等"/>
+        <el-input v-model="ruleForm.transactionContent" :rows="10" type="textarea" placeholder="内容，规则，时间等"/>
       </el-form-item>
       <el-form-item label="话题配图">
         <el-upload
@@ -110,7 +110,7 @@ export default {
                 message: res.message,
                 type: 'success'
               })
-              this.$router.push({ name: 'announcement-index' })
+              this.$router.push({ name: 'transaction-import' })
               loading.close()
               return
             }

VUECODE/smart-property-manage/src/views/social/transaction/transactionDetails.vue

@@ -0,0 +1,179 @@
+<template>
+  <div id="root">
+    <el-form ref="form" label-width="100px" label-position="left">
+      <el-form-item label="话题类型">
+         <span v-if="ruleForm.type==='0'">{{'议事大厅'}}</span>
+         <span v-if="ruleForm.type==='1'">{{'邻里互助'}}</span>
+         <span v-if="ruleForm.type==='2'">{{'二手/租赁'}}</span>
+         <span v-if="ruleForm.type==='3'">{{'其他话题'}}</span>
+      </el-form-item>
+      <el-form-item label="话题标题">
+        <div class="activityContext">
+          {{ ruleForm.transactionTitle }}
+        </div>
+      </el-form-item>  
+      <el-form-item label="详情描述">
+        <div class="activityContext">
+          {{ ruleForm.transactionContent }}
+        </div>
+      </el-form-item>
+      <el-form-item label="话题配图">
+        <template v-for="site in ruleForm.contentImg">
+          <img :src="site" width="100" height="100" >
+        </template>
+      </el-form-item>
+      <el-form-item label="权重值">
+        <span>{{ ruleForm.sort }}</span>
+      </el-form-item>
+    </el-form>
+    <div class="bom-button">
+      <el-button v-if="isEdi" type="primary" style="width: 100px;" @click="edi">修改</el-button>
+      <el-button v-if="isEdi" type="primary" style="width: 100px;" @click="edi">回复帖子</el-button>
+      <el-button v-if="isEdi" type="primary" style="width: 150px;" @click="edi">查看全部N条回复</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Index',
+  data() {
+    return {
+      ruleForm: {
+        communityId: '',
+				createDate:'',
+				createUser:'',
+				id:'',
+				isReported:'',
+				status:'',
+				taUserId:'',
+				transactionContent:'',
+				transactionTitle:'',
+				type:'',
+				updateDate:'',
+				updateUser:'',
+				userName:'',
+        viewCount:'',
+        announcementCarouselImg: '', // 轮播图
+        announcementContent: '', // 内容详细
+        contentImg: [], // 内容配图
+        signUpCount: '', // 报名人数统计
+        registrationEndTime: '', // 报名活动结束时间
+        sort: 1, // 权重
+        status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
+      },
+      isEdi: true // 默认显示修改按钮
+    }
+  },
+  mounted() {
+    this.ruleForm.id = this.$route.query.id
+    this.getById()
+  },
+  methods: {
+    getById() { // 根据ID获取活动信息
+      this.$store.dispatch('transaction/TransactionById', this.ruleForm.id).then((res) => {
+        this.ruleForm.transactionTitle = res.data.tpTransaction.transactionTitle
+         this.ruleForm.type = res.data.tpTransaction.type
+         this.ruleForm.transactionContent = res.data.tpTransaction.transactionContent
+         this.ruleForm.sort = res.data.tpTransaction.sort
+        //  this.contentImgList = res.data.list
+         console.log(' res.data.tpTransaction.list', res.data.list)
+
+         // 多张图片进行遍历
+        for (let i = 0; i < res.data.list.length; i++) {
+          this.ruleForm.contentImg.push(res.data.list[i])
+        }
+      
+      })
+    },
+    formatDate(val) {
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      // var hour = value.getHours()
+      // var minutes = value.getMinutes()
+      // var seconds = value.getSeconds()
+      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      return year + '-' + month + '-' + day
+    },
+    edi() { // 修改活动
+      this.$router.push({ name: 'transaction-edit', query: { id: this.ruleForm.id }})
+    }
+  }
+}
+</script>
+
+<style scoped>
+#root {
+  display: flex;
+  flex-flow: column;
+  width: 500px;
+  margin-top: 50px;
+  margin-left: auto;
+  margin-right: auto;
+}
+.activityTile{
+  text-align: center;
+  font-size: 30px;
+  margin-bottom: 10px;
+}
+.activityContext{
+  /*margin-top: 20px;*/
+  margin-bottom: 20px;
+  font-size: 20px;
+  justify-items: center;
+}
+/* .progress {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 20px;
+  margin-bottom: 20px;
+} */
+/* .text-progress {
+  width: 500px;
+  float: left;
+  align-content: center;
+  position: absolute;
+  margin-top: 12px;
+} */
+/* .people-number {
+  position: relative;
+  margin-left: 180px;
+} */
+/* .outer-layer {
+  background-color: gainsboro;
+  height: 3px;
+  width: 450px;
+  margin-top: -10px;
+  position: relative;
+} */
+.inner-layer {
+  background-color: aquamarine;
+  height: 6px;
+  width: 100px;
+  position: relative;
+  margin-top: -4px;
+}
+/* .circular {
+  border: 1px #001528 solid;
+  border-radius: 10px;
+  /*background-color: chartreuse;*/
+ /* width: 20px;
+  height: 20px;
+  position: relative;
+  margin-left: 452px;
+  margin-top: 11px;
+  float: left;
+} */
+/* .people-limit {
+  margin-top: 13px;
+} */
+.bom-button{
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+  margin-bottom: 100px;
+  margin-left:-25%
+}
+</style>

VUECODE/smart-property-manage/src/views/social/transaction/transactionEdit.vue

@@ -0,0 +1,209 @@
+<template>
+  <div id="root">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
+
+    <el-form-item class="filter-item" label="话题类型" >
+        <el-select v-model="ruleForm.type" placeholder="请选择">
+         <el-option label="选择状态" value="" />
+         <el-option label="议事大厅" value="0"/>
+         <el-option label="友令互助" value="1"/>
+         <!-- -1包括，二手，租赁，求购 -->
+         <el-option label="二手租赁" value="-1"/>
+         <el-option label="其他" value="3"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="话题标题" prop="transactionTitle">
+        <el-input v-model="ruleForm.transactionTitle" placeholder="20字以内"/>
+      </el-form-item>
+      <el-form-item label="话题详细描述">
+        <el-input v-model="ruleForm.transactionContent" :rows="10" type="textarea" placeholder="内容，规则，时间等"/>
+      </el-form-item>
+      <el-form-item label="话题配图">
+        <el-upload
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleRemove"
+          :on-success="handleSuccessContentImg"
+          :file-list="contentImgList"
+          name="uploadFiles"
+          action="http://106.14.20.193:8086/property-api/uploadimage"
+          list-type="picture-card">
+          <i class="el-icon-plus"/>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+          <img :src="dialogImageUrl" width="100%" alt="">
+        </el-dialog>
+      </el-form-item>
+      <el-form-item label="权重值" prop="sort">
+        <el-input-number v-model="ruleForm.sort" label="权重值" @change="sortHandleChange"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm','1')">发布</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Index',
+  data() {
+    return {
+      ruleForm: {
+        sort: '',
+        communityId: '',
+        createDate:'',
+        createUser:'',
+        id:'',
+        isReported:'',
+        status:'',
+        taUserId:'',
+        transactionContent:'',
+        transactionTitle:'',
+        type:'',
+        updateDate:'',
+        updateUser:'',
+        userName:'',
+        viewCount:'',
+        announcementCarouselImg: '', // 轮播图
+        announcementContent: '', // 内容详细
+        contentImg: [], // 内容配图
+        sort: 1, // 权重
+        status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
+      },
+      contentImgList: [],
+      imageUrl: '', // 轮播图预览
+      dialogVisible: false, // 活动配图, 默认不显示 (以单张为单位)
+      dialogImageUrl: '', // 活动配图, 图片链接 (以单张为单位)
+      rules: {
+        announcementTitle: [
+          { required: true, message: '请输入公告名称', trigger: 'blur' },
+          { min: 1, max: 20, message: '长度在 15 个字符以内', trigger: 'blur' }
+        ],
+        announcementContent: [
+          { required: true, message: '公告详细描述', trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: '请输入权重值', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.ruleForm.id = this.$route.query.id
+    console.log('this.ruleForm.id',this.ruleForm.id)
+    this.transactionById()
+  },
+  methods: {
+    submitForm(formName, status) {
+      console.log(status)
+      // 加载框
+    //   const loading = this.$loading({
+    //     lock: true,
+    //     text: 'Loading',
+    //     spinner: 'el-icon-loading',
+    //     background: 'rgba(0, 0, 0, 0.7)'
+    //   })
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.ruleForm.transactionContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
+            this.$message.error('内容描述 和 图至少要存在一个!')
+            return
+          }
+          this.ruleForm.status = status // 发布状态
+          this.$store.dispatch('transaction/TransactionsEdit', this.ruleForm).then((res) => {
+            
+            // this.$message.error(res.message)
+            // loading.close()
+          }).catch(() => {
+            console.log('error AddActivity')
+          })
+        } else {
+          console.log('error submit!!')
+          // loading.close()
+          return false
+        }
+      })
+      // 关闭加载框
+      // loading.close()
+    },
+    resetForm(formName, status) {
+      console.log(status)
+      this.submitForm(formName, status)
+    },
+    handleRemove(file, fileList) { // 活动配图移除时
+      this.ruleForm.contentImg = []
+      for (let i = 0; i < fileList.length; i++) {
+        this.ruleForm.contentImg.push(fileList[i].url)
+      }
+    },
+    handlePictureCardPreview(file) { // 点击活动配图文件列表中已上传的文件时的钩子
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    handleSuccessContentImg(response, file, fileList) { // 活动配图上传成功时回调
+      const resImg = response.data[0]
+      this.ruleForm.contentImg.push(resImg)
+    },
+    sortHandleChange(value) { // 权重值
+      this.ruleForm.sort = value
+      console.log(value)
+    },
+    transactionById(){
+      this.$store.dispatch('transaction/TransactionById', this.ruleForm.id).then((res) => {
+         this.ruleForm.transactionTitle = res.data.tpTransaction.transactionTitle
+         this.ruleForm.type = res.data.tpTransaction.type
+         this.ruleForm.transactionContent = res.data.tpTransaction.transactionContent
+         this.ruleForm.sort = res.data.tpTransaction.sort
+        //  this.contentImgList = res.data.list
+         console.log(' res.data.tpTransaction.list', res.data.list)
+
+         // 多张图片进行遍历
+        for (let i = 0; i < res.data.list.length; i++) {
+          this.contentImgList.push({ url: res.data.list[i] })
+          this.ruleForm.contentImg.push(res.data.list[i])
+        }
+          }).catch(() => {
+            console.log('error TransactionById')
+          })
+
+
+    }
+    
+  }
+}
+</script>
+
+<style scoped>
+#root {
+  display: flex;
+}
+.ruleForm {
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>