回访记录

zxkf-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -4,6 +4,7 @@ import api.controller.system.WorkroderTypeController;
 import api.entity.database.call.CallLog;
 import api.entity.database.call.Record;
 import api.entity.database.order.WorkOrderOperateLog;
+import api.entity.database.order.WorkOrderVisitLog;
 import api.entity.database.system.*;
 import api.entity.input.order.TransOrderInput;
 import api.entity.view.order.WorkOrderBaseView;
@@ -12,6 +13,7 @@ import api.mapper.system.UserMapper;
 import api.service.call.ICallLogService;
 import api.service.call.IRecordService;
 import api.service.order.IWorkOrderOperateLogService;
+import api.service.order.IWorkOrderVisitLogService;
 import api.service.system.*;
 import api.util.annotation.Anonymous;
 import com.alibaba.fastjson2.JSON;
@@ -79,6 +81,12 @@ public class WorkOrderBaseController extends BaseController {
     @Autowired
     private IWorkroderTypeService workrodertypeService;
 
+    @Autowired
+    private IWorkOrderVisitLogService visitLogService;
+
+
+
+
     //待交办1 ; 待接单（没有处理人的时候）2; 待处理3; 待审核 4 ;待回访5 ;已完结6;
     @ApiOperation("列表 listType 0 综合查询列表 1（处理人）我的待处理；2 待交办;3 已办待审核；4 已办待回访；5 我的回复列表；6 组内工单")
     @Log(title = "查询wo_workorderbase列表", businessType = BusinessType.QUERY)
@@ -579,12 +587,12 @@ public class WorkOrderBaseController extends BaseController {
     @ApiOperation("回访")
     @Log(title = "回访wo_workorderbase", businessType = BusinessType.UPDATE)
     @PutMapping("/visit/{id}")
-    public AjaxResult visit(@RequestBody  HashMap<String,Object> map  ,@PathVariable int id) {
+    public AjaxResult visit(@RequestBody  HashMap<String,Object> map  ,@PathVariable Long id) {
         Date currentDate = new Date(System.currentTimeMillis());
         WorkOrderBase orderBase = workorderbaseService.getEntity(id);
         LambdaUpdateWrapper<WorkOrderBase> qw = new LambdaUpdateWrapper<>();
         qw.eq(WorkOrderBase::getWorkorderId, id);
-        int myd= (int) map.get("myd");
+        Long myd= (Long) map.get("myd");
         int isover= (int) map.get("isover");
         //工单状态改成已完结
          if (isover>0||myd>0)
@@ -598,12 +606,26 @@ public class WorkOrderBaseController extends BaseController {
         qw.set(WorkOrderBase::getVisittime, currentDate);
         qw.set(WorkOrderBase::getMyd, myd);
         boolean result = workorderbaseService.updateBatch(qw);
-        String visitresult="";
-        if (map.get("visitresult")!=null&&!StringHelper.isEmpty(map.get("visitresult").toString())) {
-            visitresult= "，回访结果：" + map.get("visitresult");
-        }
+//        String visitresult="";
+//        if (map.get("visitresult")!=null&&!StringHelper.isEmpty(map.get("visitresult").toString())) {
+//            visitresult= "，回访结果：" + map.get("visitresult");
+//        }
+        //添加回访记录
+        WorkOrderVisitLog visitLog=new WorkOrderVisitLog();
+        if(map.get("callid")!=null){
+            visitLog.setCallid(map.get("callid").toString());
+        }
+
+        visitLog.setWorkorderid(id);
+        visitLog.setOperator(CurrentUser().getUserName());
+        visitLog.setOperatorname(CurrentUser().getNickName());
+        visitLog.setContent(map.get("visitresult").toString());
+        visitLog.setMyd(myd);
+        visitLog.setCreatetime(currentDate);
+        visitLogService.insert(visitLog);
+
         if (result) {
-            boolean logresult = addlog("回访了工单" + visitresult, "回访", CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName(), "");
+            boolean logresult = addlog("回访了工单" , "回访", CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName(), "");
             return Success("回访成功");
         } else {
             return Error("回访失败");

zxkf-api/src/main/java/api/controller/order/WorkOrderVisitLogController.java

@@ -1,5 +1,10 @@
 package api.controller.order;
 
+import api.entity.database.call.Record;
+import api.entity.view.order.WorkOrderVisitLogView;
+import api.service.call.IRecordService;
+import api.service.system.IConfigService;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,7 +20,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 @Api(value = "wo_visitlog",tags = "wo_visitlog")
 @RestController
@@ -23,6 +31,10 @@ import java.util.Arrays;
 public class WorkOrderVisitLogController extends BaseController {
     @Autowired
     private IWorkOrderVisitLogService workordervisitlogService;
+    @Autowired
+    private IRecordService recordService;
+    @Autowired
+    private IConfigService configService;
 
     @ApiOperation("列表")
     @Log(title = "查询wo_visitlog列表",businessType = BusinessType.QUERY)
@@ -30,7 +42,9 @@ public class WorkOrderVisitLogController extends BaseController {
     public AjaxResult getList(WorkOrderVisitLog input, PageInput pageInput) {
         LambdaQueryWrapper<WorkOrderVisitLog> qw = new LambdaQueryWrapper();
         qw.eq(input.getVisitId() != null && input.getVisitId() > 0, WorkOrderVisitLog::getVisitId, input.getVisitId());
-        qw.like(!StringHelper.isEmpty(input.getWorkordercode()), WorkOrderVisitLog::getWorkordercode, input.getWorkordercode());
+
+        qw.eq(input.getWorkorderid() != null && input.getWorkorderid() > 0, WorkOrderVisitLog::getWorkorderid, input.getWorkorderid());
+
         qw.eq(input.getMyd() != null && input.getMyd() > 0, WorkOrderVisitLog::getMyd, input.getMyd());
         qw.like(!StringHelper.isEmpty(input.getContent()), WorkOrderVisitLog::getContent, input.getContent());
         qw.like(!StringHelper.isEmpty(input.getCallid()), WorkOrderVisitLog::getCallid, input.getCallid());
@@ -42,7 +56,13 @@ public class WorkOrderVisitLogController extends BaseController {
             IPage<WorkOrderVisitLog> iPage = workordervisitlogService.getListPage(page, qw);
             return Success("成功", iPage.getRecords(), iPage.getTotal());
         } else {
-            return Success("成功", workordervisitlogService.getList(qw));
+            List<WorkOrderVisitLog> logList = workordervisitlogService.getList(qw);
+            List<WorkOrderVisitLogView> logViewList = new ArrayList<>();
+            for (WorkOrderVisitLog log : logList) {
+                WorkOrderVisitLogView ov = trans(log);
+                logViewList.add(ov);
+            }
+            return Success("成功", logViewList);
         }
     }
 
@@ -88,5 +108,18 @@ public class WorkOrderVisitLogController extends BaseController {
             return Error("删除失败");
         }
     }
+    public WorkOrderVisitLogView trans(WorkOrderVisitLog log) {
+        WorkOrderVisitLogView ov = JSON.parseObject(JSON.toJSONString(log), WorkOrderVisitLogView.class);
+        if(!StringHelper.isEmpty( log.getCallid()))
+        {
+            //根据callid获取录音文件
+            String captchaEnabled = configService.selectCaptchaEnabled("FileUrl");
+             Record record=recordService.getEntity(log.getCallid());
+            ov.setLyurl(captchaEnabled + record.getFilePath());
+        }
+        return  ov;
+
+    }
+
 
 }

zxkf-entity/src/main/java/api/entity/database/order/WorkOrderVisitLog.java

@@ -18,8 +18,8 @@ public class WorkOrderVisitLog {
     @TableId(type = IdType.AUTO)
     private Long visitId;
     /** workordercode */
-    @ApiModelProperty("workordercode")
-    private String workordercode;
+    @ApiModelProperty("workorderid")
+    private Long workorderid;
     /** myd */
     @ApiModelProperty("myd")
     private Long myd;

zxkf-entity/src/main/java/api/entity/view/order/WorkOrderBaseView.java

@@ -12,6 +12,7 @@ import java.util.List;
 public class WorkOrderBaseView extends WorkOrderBase {
 
 
+
     @ApiModelProperty("项目名")
     private String projectname;
 
@@ -33,4 +34,5 @@ public class WorkOrderBaseView extends WorkOrderBase {
     private String mydname;
 
 
+
 }

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

@@ -0,0 +1,23 @@
+package api.entity.view.order;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import api.entity.database.order.WorkOrderVisitLog;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+
+
+@Data
+public class WorkOrderVisitLogView extends WorkOrderVisitLog {
+
+
+    /** 工单类型 */
+    @ApiModelProperty("文件路径")
+    private String lyurl;
+
+
+
+
+}