合并

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

@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="051ae1e0-ece1-4622-91c0-3f05ac339943" name="Default Changelist" comment="" />
+    <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/TicketController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/api/ticket.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/api/ticket.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/ticket/details.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/ticket/details.vue" afterDir="false" />
+    </list>
     <ignored path="$PROJECT_DIR$/../smart-community/eureka-sever/target/" />
     <ignored path="$PROJECT_DIR$/../smart-community/app-api/target/" />
     <ignored path="$PROJECT_DIR$/../smart-community/operate-api/target/" />
@@ -19,107 +26,17 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </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/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="5350">
-              <caret line="448" selection-start-line="448" selection-end-line="448" />
-            </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/ITicketService.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="315">
-              <caret line="72" column="35" selection-start-line="72" selection-start-column="17" selection-end-line="72" 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/TpTicketRecordCommentMapper.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="216">
-              <caret line="13" selection-start-line="13" selection-end-line="14" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketRecordCommentMapper.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="246">
-              <caret line="29" column="63" selection-start-line="29" selection-start-column="63" selection-end-line="29" selection-end-column="63" />
-            </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/TdImagesMapper.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="203">
-              <caret line="13" column="8" selection-start-line="13" selection-start-column="8" selection-end-line="13" 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/resources/mapper/TdImagesMapper.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="203">
-              <caret line="24" column="2" selection-start-line="24" selection-start-column="2" selection-end-line="24" selection-end-column="2" />
-            </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/TicketController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="197">
-              <caret line="212" column="140" selection-start-line="212" selection-start-column="140" selection-end-line="212" selection-end-column="140" />
-            </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/TpTicketRecordMapper.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-22">
-              <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketRecordMapper.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
-              <caret line="136" column="88" selection-start-line="136" selection-start-column="88" selection-end-line="136" selection-end-column="88" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="243">
-              <caret line="155" selection-start-line="155" selection-end-line="194" selection-end-column="5" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
       <find>ticketDetails</find>
-      <find>ticketId</find>
       <find>queryWrapper</find>
       <find>content</find>
       <find>图片上传</find>
       <find>selectById</find>
+      <find>ticketId</find>
+      <find>updateTicketsReply</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -138,16 +55,16 @@
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketMapper.xml" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java" />
         <option value="$PROJECT_DIR$/../smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java" />
-        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" />
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/ImageController.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpTicketRecord.java" />
         <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/service/ITicketService.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/java/com/community/huiju/controller/TicketController.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/java/com/community/huiju/service/impl/TicketServiceImpl.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketRecordCommentMapper.xml" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/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/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -169,9 +86,10 @@
     <option name="jreName" value="1.8" />
     <option name="vmOptions" value="-DarchetypeCatalog=internal" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
-    <option name="x" value="181" />
-    <option name="width" value="1628" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-8" />
+    <option name="y" value="50" />
+    <option name="width" value="1940" />
     <option name="height" value="1061" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -189,277 +107,6 @@
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="app-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="app-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="app-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="app-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="app-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="app-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="app-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="app-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="app-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="vo" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
-              <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="app-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="community-common" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="community-common" 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="community-common" 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="community-common" 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="community-common" 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="community-common" 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="community-common" 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="commom" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="community-common" 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="commom" type="462c0819:PsiDirectoryNode" />
-              <item name="constant" 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="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>
           </expand>
           <select />
         </subPane>
@@ -473,7 +120,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="1550823776406" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550833217061" />
     <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" />
@@ -615,18 +262,18 @@
       <workItem from="1550625046867" duration="10953000" />
       <workItem from="1550663154868" duration="404000" />
       <workItem from="1550711362440" duration="16076000" />
-      <workItem from="1550798426456" duration="16826000" />
+      <workItem from="1550798426456" duration="22840000" />
+      <workItem from="1551057295750" duration="236000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="63380000" />
+    <option name="totallyTimeSpent" value="69678000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
-    <editor active="true" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25692964" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18869936" />
       <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" />
@@ -636,8 +283,8 @@
       <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.20824054" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.91518134" visible="true" weight="0.04899777" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.6998934" visible="true" weight="0.20824054" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.91518134" weight="0.4521158" />
       <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" />
@@ -645,7 +292,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.16815145" />
+      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49969268" weight="0.26837417" />
       <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" />
@@ -699,26 +346,7 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java</url>
-          <line>448</line>
-          <properties />
-          <option name="timeStamp" value="9" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTicketRecord.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="343">
-          <caret line="30" column="46" selection-start-line="30" selection-start-column="46" selection-end-line="30" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/zuul/src/main/java/com/community/huiju/ZuulApplication.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="378">
@@ -883,13 +511,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="162">
-          <caret line="6" column="21" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTicketRecordComment.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="542">
@@ -935,19 +556,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpTicketRecordComment.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="244">
-          <caret line="32" column="24" selection-start-line="32" selection-start-column="24" selection-end-line="32" selection-end-column="24" />
-          <folding>
-            <element signature="e#569#570#0" expanded="true" />
-            <element signature="e#598#599#0" expanded="true" />
-            <element signature="e#648#649#0" expanded="true" />
-            <element signature="e#684#685#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TpTicketController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="96">
@@ -969,20 +577,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
-          <caret line="155" selection-start-line="155" selection-end-line="194" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="212" column="140" selection-start-line="212" selection-start-column="140" selection-end-line="212" selection-end-column="140" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TpTicketRecordMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="81">
@@ -992,14 +586,14 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketRecordMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-22">
+        <state relative-caret-position="135">
           <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketRecordMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
+        <state relative-caret-position="450">
           <caret line="136" column="88" selection-start-line="136" selection-start-column="88" selection-end-line="136" selection-end-column="88" />
         </state>
       </provider>
@@ -1059,17 +653,52 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5350">
-          <caret line="448" selection-start-line="448" selection-end-line="448" />
+        <state relative-caret-position="-4895">
+          <caret line="40" column="14" lean-forward="true" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/ITicketService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="72" column="35" selection-start-line="72" selection-start-column="17" selection-end-line="72" selection-end-column="35" />
+        <state relative-caret-position="267">
+          <caret line="56" column="30" selection-start-line="56" selection-start-column="12" selection-end-line="56" selection-end-column="30" />
+        </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/HttpServlet.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="155">
+          <caret line="660" selection-start-line="660" selection-end-line="660" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpTicketRecordComment.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="243">
+          <caret line="12" column="28" selection-start-line="12" selection-start-column="20" selection-end-line="12" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="167">
+          <caret line="132" column="135" selection-start-line="132" selection-start-column="114" selection-end-line="132" selection-end-column="135" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="229">
+          <caret line="94" column="31" selection-start-line="94" selection-start-column="31" selection-end-line="94" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="453" selection-start-line="453" selection-end-line="453" />
         </state>
       </provider>
     </entry>

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

@@ -130,7 +130,7 @@ public class TicketController extends BaseController {
             @ApiImplicitParam(name = "tpTicketRecordComment", value = "回复记录参数(ticketId:工单id,content:回复时间,ticketRecordCommentId:需要回复的id)", paramType = "body"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
     @RequestMapping(value = "/ticket/reply/{communityId}", method = RequestMethod.POST)
-    public ResponseBean updateTicketsReply(@PathVariable(value = "communityId") Integer communityId, @RequestBody TpTicketRecordComment tpTicketRecordComment, HttpSession session){
+    public ResponseBean updateTicketsReply(@PathVariable(value = "communityId") Integer communityId, @RequestBody TpTicketRecordComment tpTicketRecordComment,HttpSession session){
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();

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

@@ -342,13 +342,18 @@ public class TicketServiceImpl implements ITicketService {
         //查询用户名
         TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
 
+       TpTicket  tpTicket= tpTicketMapper.selectByPrimaryKey(tpTicketRecordComment.getTicketId());
+       TpTicketRecord ticketRecord= tpTicketRecordMapper.selectTpTicketRecord(tpTicketRecordComment.getTicketId(), Integer.valueOf(tpTicket.getStatus()));
+
         tpTicketRecordComment.setUserName(taUser.getUserName());
         tpTicketRecordComment.setParentId(tpTicketRecordComment.getTicketRecordCommentId());
         tpTicketRecordComment.setUuid(userId);
+        tpTicketRecordComment.setTicketRecordId(ticketRecord.getId());
         tpTicketRecordComment.setUserType(Constant.TICKET_USER_TYPE);
         tpTicketRecordComment.setCreateDate(new Date());
         //插入回复数据
         return tpTicketRecordCommentMapper.insertSelective(tpTicketRecordComment);
+
     }
 
     @Override

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

@@ -111,7 +111,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         /*查询工单类容的图片*/
         QueryWrapper<TdImages> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(TdImages::getUuid,ticketId);
-        queryWrapper.lambda().eq(TdImages::getType,ticketVO.getType());
+        queryWrapper.lambda().eq(TdImages::getType,Constant.SERVICE);
         List<TdImages> tdImages= tdImagesMapper.selectList(queryWrapper);
         List<String> contentImg = new ArrayList<String>();
         for (TdImages images:tdImages){

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

@@ -44,7 +44,7 @@ export function addRecord(data) {
     method: 'post',
     data: {
       ticketId: data.id,
-      id: data.userNmaeIds
+      id: data.selectVale
     }
   })
 }

VUECODE/smart-property-manage/src/views/ticket/details.vue

@@ -126,7 +126,7 @@
         <el-form-item label="图片附件">
         <el-upload
           :limit="8"
-          :before-upload="handleCompress"
+          :before-upload="handleCompressReply"
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
           :on-success="handleSuccessContentImg"
@@ -191,7 +191,7 @@
         
         <div  v-if="listQuery.status==='0'">
         <el-form-item style="width:1000  px" >
-         <el-select v-model="listQuery.userNmaeIds" placeholder="请选择工单由谁负责,然后点击受理分配"  >
+         <el-select v-model="listQuery.selectVale" placeholder="请选择工单由谁负责,然后点击受理分配"  >
           <el-option label="请选择工单由谁负责,然后点击受理分配" value="-1" />
           <el-option label="我自己" :value="listQuery.currentUserName"/>
           <el-option  v-for="user in listQuery.userList" :label="user.userName" :value="user.id"/>
@@ -241,7 +241,7 @@ export default {
         statusList: [],
         userList:[],
         textContent: '',
-        userNmaeIds : '-1',
+        selectVale : '-1',
         noAcceptContent : '',//拒绝的对话内容
         relationContent : '',//流程操作内容
         relationImg : []//流程操作的图片
@@ -313,6 +313,39 @@ export default {
       const resImg = response.data[0]
       this.contentImgIO.push(resImg)
     },
+    //回复压缩
+    handleCompressReply(file) {  // 图片压缩
+      let self = this;
+      return new Promise((resolve, reject) => {
+        var reader = new FileReader()
+        reader.onload = function (e) {
+          var data = e.target.result
+          // 加载图片获取图片真实宽度和高度
+            var image = new Image()
+            image.onload = function () {
+            let newdata = self.compress(image);
+            let blob = self.dataURItoBlob(newdata);
+            var formData = new FormData();
+            formData.append("file", blob);
+            formData.append("newdata", newdata);
+            console.log("********将blob对象转成formData对象********");
+            console.log(formData.get("file"));
+            console.log('formData',formData) 
+
+            console.log(formData)
+            let data = {"uploadFiles": newdata }
+              self.$store.dispatch('ImgAdd', Qs.stringify(data)).then((res) => {
+               self.contentImgAA.push(res.data[0])
+               console.log('this.contentImgIO',res.data[0])
+               console.log('this.listQuery.contentImgIO',self.contentImgIO)      
+             })
+          }
+          image.src = data
+        }
+        reader.readAsDataURL(file)
+      })
+    },
+    //流程压缩
     handleCompress(file) {  // 图片压缩
       let self = this;
       return new Promise((resolve, reject) => {
@@ -335,13 +368,8 @@ export default {
             let data = {"uploadFiles": newdata }
               self.$store.dispatch('ImgAdd', Qs.stringify(data)).then((res) => {
                self.contentImgIO.push(res.data[0])
-               self.contentImgAA.push(res.data[0])
                console.log('this.contentImgIO',res.data[0])
-               console.log('this.listQuery.contentImgIO',self.contentImgIO)
-          
-                // this.console.log('this.listQuery.contentImgIO=res.data[0]',this.listQuery.contentImgIO=res.data[0])
-              //  console.log('reaDate',reaDate[0])
-              //  this.contentImgIO.push(reaDate)         
+               console.log('this.listQuery.contentImgIO',self.contentImgIO)      
              })
           }
           image.src = data
@@ -423,7 +451,7 @@ export default {
       this.$store.dispatch('AddRecordComment', this.listQuery,).then((res) => {
           this.Ass=false
           this.contentImgAA=[]
-          this.dataQuery()    
+          this.dataQuery()
           this.Ass=true
           loading.close()
       }).catch(() => {
@@ -432,6 +460,10 @@ export default {
     },
         //受理人添加
         addRecord(){
+          if(this.selectVale==='1'){
+            return
+          }
+          
         const loading = this.$loading({
         lock: true,
         text: 'Loading',
@@ -498,12 +530,11 @@ export default {
       }    
         console.log('sss',this.listQuery.relationContent)
         console.log('this.contentImgIO[0]',  this.contentImgIO)
-      
-         this.listQuery.imgIO=this.contentImgIO
+         this.listQuery.imgIO = this.contentImgIO
          console.log('imgIO',this.listQuery.imgIO)
         this.$store.dispatch('UpdateTicket', this.listQuery).then((res) => {
           this.Ass=false
-          this.contentImgIO=''
+          this.contentImgIO = []
           this.dataQuery()
           this.Ass=true
           this.$message({
@@ -514,6 +545,7 @@ export default {
       }).catch(() => {
         console.log('error addRecordComment')
       })
+        this.contentImgIO = []
     },
      next() {
         if (this.active++ > 2) this.active = 0;