liyuanyuan лет назад: 2
Родитель
Сommit
0d22ff5c58

+ 15 - 7
zxkf-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -586,13 +586,19 @@ public class WorkOrderBaseController extends BaseController {
586 586
     //待交办1  待接单(没有处理人的时候)2 待处理3 待审核 4 待回访5 已完结6
587 587
     @ApiOperation("回访")
588 588
     @Log(title = "回访wo_workorderbase", businessType = BusinessType.UPDATE)
589
-    @PutMapping("/visit/{id}")
590
-    public AjaxResult visit(@RequestBody  HashMap<String,Object> map  ,@PathVariable Long id) {
589
+    @PutMapping("/visit")
590
+    public AjaxResult visit(@RequestBody  HashMap<String,Object> map){
591
+
592
+
593
+        Long orderid=Long.parseLong( map.get("id").toString());
594
+
591 595
         Date currentDate = new Date(System.currentTimeMillis());
592
-        WorkOrderBase orderBase = workorderbaseService.getEntity(id);
596
+        WorkOrderBase orderBase = workorderbaseService.getEntity(orderid);
593 597
         LambdaUpdateWrapper<WorkOrderBase> qw = new LambdaUpdateWrapper<>();
594
-        qw.eq(WorkOrderBase::getWorkorderId, id);
595
-        Long myd= (Long) map.get("myd");
598
+        qw.eq(WorkOrderBase::getWorkorderId, orderid);
599
+
600
+
601
+        Long myd= Long.parseLong(map.get("myd").toString());
596 602
         int isover= (int) map.get("isover");
597 603
         //工单状态改成已完结
598 604
          if (isover>0||myd>0)
@@ -606,6 +612,8 @@ public class WorkOrderBaseController extends BaseController {
606 612
         qw.set(WorkOrderBase::getVisittime, currentDate);
607 613
         qw.set(WorkOrderBase::getMyd, myd);
608 614
         boolean result = workorderbaseService.updateBatch(qw);
615
+
616
+
609 617
 //        String visitresult="";
610 618
 //        if (map.get("visitresult")!=null&&!StringHelper.isEmpty(map.get("visitresult").toString())) {
611 619
 //            visitresult= ",回访结果:" + map.get("visitresult");
@@ -616,14 +624,14 @@ public class WorkOrderBaseController extends BaseController {
616 624
             visitLog.setCallid(map.get("callid").toString());
617 625
         }
618 626
 
619
-        visitLog.setWorkorderid(id);
627
+        visitLog.setWorkorderid(orderid);
620 628
         visitLog.setOperator(CurrentUser().getUserName());
621 629
         visitLog.setOperatorname(CurrentUser().getNickName());
622 630
         visitLog.setContent(map.get("visitresult").toString());
623 631
         visitLog.setMyd(myd);
624 632
         visitLog.setCreatetime(currentDate);
625 633
         visitLogService.insert(visitLog);
626
-
634
+        System.out.println("到这没错4");
627 635
         if (result) {
628 636
             boolean logresult = addlog("回访了工单" , "回访", CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName(), "");
629 637
             return Success("回访成功");

+ 17 - 0
zxkf-api/src/main/java/api/controller/order/WorkOrderVisitLogController.java

@@ -117,6 +117,23 @@ public class WorkOrderVisitLogController extends BaseController {
117 117
              Record record=recordService.getEntity(log.getCallid());
118 118
             ov.setLyurl(captchaEnabled + record.getFilePath());
119 119
         }
120
+
121
+        if(log.getMyd()!=null)
122
+        {
123
+            if (log.getMyd()==0)
124
+            {
125
+                ov.setMydname("不满意");
126
+            }
127
+            else  if (log.getMyd()==1)
128
+            {
129
+                ov.setMydname("基本满意");
130
+            }
131
+            else  if (log.getMyd()==2)
132
+            {
133
+                ov.setMydname("非常满意");
134
+            }
135
+
136
+        }
120 137
         return  ov;
121 138
 
122 139
     }

+ 2 - 1
zxkf-entity/src/main/java/api/entity/view/order/WorkOrderVisitLogView.java

@@ -16,7 +16,8 @@ public class WorkOrderVisitLogView extends WorkOrderVisitLog {
16 16
     /** 工单类型 */
17 17
     @ApiModelProperty("文件路径")
18 18
     private String lyurl;
19
-
19
+    @ApiModelProperty("manyidu")
20
+    private String mydname;
20 21
 
21 22
 
22 23