合并

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

@@ -35,4 +35,6 @@ public interface TpTicketMapper {
      * @return
      */
 	TpTicket selectByTicketId(@Param("communityId") String communityId,@Param("ticketId") Integer ticketId);
+
+    void updateTpUserId(@Param("ticketId") Integer ticketId);
 }

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

@@ -507,7 +507,8 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTicket.setId(Integer.valueOf(ticketId));
         tpTicket.setStatus("5");
         tpTicketMapper.updateByPrimaryKeySelective(tpTicket);
-
+        //根据1.4版本需要被终止时，清空当前工单受理人
+        tpTicketMapper.updateTpUserId(Integer.valueOf(ticketId));
         //工单处理表新增评分记录
         TpTicketRecord record = new TpTicketRecord();
         record.setCommunityId(communityId);

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

@@ -393,6 +393,8 @@ public class TicketServiceImpl implements ITicketService {
             tpTicket.setStatus("6");
             tpTicket.setId(ticketId);
             tpTicketMapper.updateByPrimaryKeySelective(tpTicket);
+            //根据1.4版本需要被终止时，清空当前工单受理人
+            tpTicketMapper.updateTpUserId(ticketId);
 
             TpTicketRecord tpTicketRecord = new TpTicketRecord();
             tpTicketRecord.setStatus("6");

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

@@ -234,6 +234,7 @@
           <if test="payType == 1">
             AND (i.bill_status = 1 or i.bill_status = 2)
           </if>
+          and i.status=1
           AND i.ta_user_id = #{userId,jdbcType=INTEGER}
   </select>
 

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

@@ -248,5 +248,12 @@
         t.id = #{ticketId,jdbcType=INTEGER}
         AND t.community_id = #{communityId,jdbcType=INTEGER}
   </select>
-  <select id="ticketList" resultType="com.community.huiju.model.TpTicket"></select>
+  <update id="updateTpUserId" parameterType="int" >
+    update tp_ticket
+    set
+      tp_user_id =null
+    where id = #{ticketId,jdbcType=INTEGER}
+  </update>
+
+
 </mapper>

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

@@ -227,7 +227,10 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         bill.setPayedNum(0);
         bill.setBillStatus(billStatus);
         bill.setCreateUser(userElement.getId());
-        bill.setCreateDate(new Date());
+        //为草稿时不创建时间
+        if(!"2".equals(billStatus)) {
+            bill.setCreateDate(new Date());
+        }
         bill.setCommunityId(userElement.getCommunityId());
         Integer payTotalNum = tempBills.size() != 0 ? tempBills.size() : records != null ? records.size() : 0;
         Integer unpayedNum = tempBills.size() != 0 ? tempBills.size() : records != null ? records.size() : 0;

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

@@ -289,7 +289,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         tpTicketRecordComment.setTicketRecordId(tpTicketRecord.getId());
         tpTicketRecordComment.setUuid(id);
         tpTicketRecordComment.setUserType("0");
-        tpTicketRecordComment.setContent("处理结果如下，原因——"+content);
+        tpTicketRecordComment.setContent("处理结果如下____"+content);
         tpTicketRecordComment.setUserName(userName);
         tpTicketRecordComment.setCreateDate(LocalDateTime.now());
         tpTicketRecordCommentMapper.insert(tpTicketRecordComment);

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

@@ -150,7 +150,7 @@
           <img :src="dialogImageUrl" width="100%" alt="">
         </el-dialog>
       </el-form-item>
-        <el-button type="primary" @click="submitContent">提交</el-button>
+        <el-button type="primary" @click="submitContent" style="margin-left: 90%;transform:translateY(-340%);">提交</el-button>
         </div>
         </div>
         <div v-if="listQuery.status==='3'">
@@ -159,7 +159,7 @@
         </div>
         <br>
           <div>   
-          <textarea v-model="listQuery.relationContent" placeholder="请输入内容" class="textarea-inherit" id="message_textarea" rows="4"></textarea> 
+          <textarea v-model="listQuery.relationContent" placeholder="处理完了?在此填写处理结果，发送给业主让TA给好评~" class="textarea-inherit" id="message_textarea" rows="4"></textarea> 
         </div>
         <div>
         <el-form-item label="图片附件">
@@ -179,7 +179,7 @@
           <img :src="dialogImageUrl" width="100%" alt="">
           </el-dialog>
         </el-form-item>
-        <el-button type="primary" @click="succeedClick">提交</el-button>
+        <el-button type="primary" @click="succeedClick" style="margin-left: 90%;transform:translateY(-340%);">发送处理结果</el-button>
         </div>
         </div>
         
@@ -433,7 +433,7 @@ export default {
         background: 'rgba(0, 0, 0, 0.7)'
       })
       if(this.listQuery.textContent===undefined){
-         this.$message.error('请填写拒绝内容')
+         this.$message.error('请输入内容')
          loading.close()
          return
       }
@@ -534,7 +534,7 @@ export default {
         })
           loading.close()
       }).catch(() => {
-        console.log('error addRecordComment')
+        console.log('error UpdateTicket')
       })
         this.contentImgIO = []
     },

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

@@ -23,7 +23,6 @@
          <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-option label="待评价" value="4"/>
          <el-option label="已评价" value="5"/>
@@ -69,7 +68,6 @@
         <template slot-scope="scope">
           <span v-if="scope.row.status==='0'">{{ '待分配' }}</span>
           <span v-if="scope.row.status==='1'">{{ '拒绝处理' }}</span>
-          <span v-if="scope.row.status==='2'">{{ '待处理' }}</span>
           <span v-if="scope.row.status==='3'">{{ '正在处理' }}</span>
           <span v-if="scope.row.status==='4'">{{ '待评价' }}</span>
           <span v-if="scope.row.status==='5'">{{ '已评价' }}</span>