傅行帆 4 anni fa
parent
commit
2c82caf3a4

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/ExtendContentController.java Vedi File

152
      * @return
152
      * @return
153
      */
153
      */
154
     @GetMapping("/wx/extendContent")
154
     @GetMapping("/wx/extendContent")
155
-    public ResponseBean extendContentListOfWX(@RequestParam(value = "cityId") Integer cityId, HttpServletRequest request) {
155
+    public ResponseBean extendContentListOfWX(@RequestParam(value = "cityId", required = false) Integer cityId, HttpServletRequest request) {
156
         return iExtendContentService.selectExtendContentListShowType(null, null, null,null, null, null, cityId,getOrgId(request));
156
         return iExtendContentService.selectExtendContentListShowType(null, null, null,null, null, null, cityId,getOrgId(request));
157
     }
157
     }
158
 
158
 

+ 11
- 4
src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java Vedi File

126
         Integer ticketId = object.getInteger("id");
126
         Integer ticketId = object.getInteger("id");
127
         TpTicketVO ticketVO= tpTicketMapper.ticketDetails(ticketId);
127
         TpTicketVO ticketVO= tpTicketMapper.ticketDetails(ticketId);
128
         // 从taUserVerify里面获取userID
128
         // 从taUserVerify里面获取userID
129
-        TaUserVerify taUserVerify= taUserVerifyMapper.selectById(ticketVO.getCreateUser());
130
         TaPerson taPerson = taPersonMapper.selectById(ticketVO.getPersonId());
129
         TaPerson taPerson = taPersonMapper.selectById(ticketVO.getPersonId());
131
         /*发起人*/
130
         /*发起人*/
132
         ticketVO.setCreateUserNmae(taPerson.getName());
131
         ticketVO.setCreateUserNmae(taPerson.getName());
189
             String statusName= tpTicketRecordMapper.statusName(tpTicketRecord.getStatus());
188
             String statusName= tpTicketRecordMapper.statusName(tpTicketRecord.getStatus());
190
             tpTicketRecord.setStatusName(statusName);
189
             tpTicketRecord.setStatusName(statusName);
191
         }
190
         }
191
+
192
+        // 是否缴费
193
+        ticketVO.setIsPay(false);
194
+        BillInvoice billInvoice = billInvoiceMapper.selectById(ticketVO.getBillInvoiceId());
195
+        if (null!= billInvoice && "1".equals(billInvoice.getBillStatus())){
196
+            ticketVO.setIsPay(true);
197
+        }
198
+
192
         response.addSuccess(ticketVO);
199
         response.addSuccess(ticketVO);
193
         return response;
200
         return response;
194
     }
201
     }
299
         message.setCreateUser(user.toString());
306
         message.setCreateUser(user.toString());
300
         message.setCreateDate(LocalDateTime.now());
307
         message.setCreateDate(LocalDateTime.now());
301
         message.setTicketId(ticketId);
308
         message.setTicketId(ticketId);
302
-        messageMapper.insert(message);
309
+//        messageMapper.insert(message);
303
         //如果分配给本人维护消息模板
310
         //如果分配给本人维护消息模板
304
         if (null!=userID&userID.equals(user)){
311
         if (null!=userID&userID.equals(user)){
305
             message.setModelType("1");
312
             message.setModelType("1");
306
-            messageMapper.insert(message);
313
+//            messageMapper.insert(message);
307
         }
314
         }
308
         //分配成功后推送app
315
         //分配成功后推送app
309
         message.setUuidType("1");
316
         message.setUuidType("1");
310
         message.setUuid(ticket.getCreateUser());
317
         message.setUuid(ticket.getCreateUser());
311
         message.setMessageContent("工单“" + ticket.getTicketTitle() + "”已被分配给:"+taUser.getUserName());
318
         message.setMessageContent("工单“" + ticket.getTicketTitle() + "”已被分配给:"+taUser.getUserName());
312
         message.setAdviceType("1");
319
         message.setAdviceType("1");
313
-        messageMapper.insert(message);
320
+//        messageMapper.insert(message);
314
         response.addSuccess("成功");
321
         response.addSuccess("成功");
315
         return response;
322
         return response;
316
     }
323
     }

+ 2
- 0
src/main/java/com/huiju/estateagents/property/vo/TpTicketVO.java Vedi File

91
      * 工单创建人房产
91
      * 工单创建人房产
92
      */
92
      */
93
     private  String houseProperty;
93
     private  String houseProperty;
94
+
95
+    private Boolean isPay;
94
 }
96
 }