gongdan修改

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

@@ -1,5 +1,6 @@
 package api.controller.order;
 
+import api.controller.system.WorkroderTypeController;
 import api.entity.database.call.CallLog;
 import api.entity.database.call.Record;
 import api.entity.database.order.WorkOrderOperateLog;
@@ -69,6 +70,9 @@ public class WorkOrderBaseController extends BaseController {
     @Autowired
     private ISysAccessoriesService sysaccessoriesService;
 
+    @Autowired
+    private IWorkroderTypeService workrodertypeService;
+
     //待交办1 ; 待接单（没有处理人的时候）2; 待处理3; 待审核 4 ;待回访5 ;已完结6;
     @ApiOperation("列表 listType 0 综合查询列表 1（处理人）我的待处理；2 待交办;3 已办待审核；4 已办待回访；5 我的回复列表；6 组内工单")
     @Log(title = "查询wo_workorderbase列表", businessType = BusinessType.QUERY)
@@ -210,13 +214,20 @@ public class WorkOrderBaseController extends BaseController {
             qw.set(CallLog::getWorkordercode, ordercode);
             calllogService.updateBatch(qw);
         }
+
+        String dealContent="";
+        if(!StringHelper.isEmpty(input.getResult())){
+            dealContent=",回复内容："+input.getResult();
+
+        }
         if (result) {
             //添加操作日志
             if (input.getIsend() == 0) {
                 boolean logresult = addlog("创建了工单", "创建", CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName(), "");
             } else {
                 //结束了 已完成
-                boolean logresult = addlog("创建并完成了工单", "创建并完成", CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName(), "");
+
+                boolean logresult = addlog("创建并完成了工单"+dealContent, "创建并完成", CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName(), "");
             }
 
             //判断手机号存在不customer，不存在就添加新用户
@@ -291,10 +302,14 @@ public class WorkOrderBaseController extends BaseController {
             qw.set(WorkOrderBase::getFile,input.getFile());
 
         }
+        String dealContent="";
+        if(!StringHelper.isEmpty(input.getResult())){
+            dealContent=",回复内容："+input.getResult();
 
+        }
         boolean result = workorderbaseService.updateBatch(qw);
         if (result) {
-            boolean logresult = addlog("处理了工单," + input.getResult(), "处理", CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName(), input.getFile());
+            boolean logresult = addlog("处理了工单," + dealContent, "处理", CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName(), input.getFile());
 
             return Success("处理成功");
         } else {
@@ -415,8 +430,11 @@ public class WorkOrderBaseController extends BaseController {
             ov.setProjectname(dicdata.getDictLabel());
         }
         if (orderBase.getWorkordercate() > 0) {
-            DictData dicdata = dictDataService.getEntity(orderBase.getWorkordercate());
-            ov.setWorkordercatename(dicdata.getDictLabel());
+            WorkroderType ordertype = workrodertypeService.getEntity(orderBase.getWorkordercate() );
+            if(ordertype!=null){
+                ov.setWorkordercatename(ordertype.getTypeName());
+            }
+
         }
         //待交办1 ; 待接单（没有处理人的时候）2; 待处理3; 待审核 4 ;待回访5 ;已完结6;
 
@@ -466,6 +484,7 @@ public class WorkOrderBaseController extends BaseController {
     @ApiOperation("交办 Dealuser不是必填，Dealdept 必填")
     @Log(title = "转派wo_workorderbase", businessType = BusinessType.UPDATE)
     @PutMapping("/transfer")
+    @Anonymous
     public AjaxResult transfer(@RequestBody TransOrderInput input) {
         Date currentDate = new Date(System.currentTimeMillis());
 
@@ -688,7 +707,10 @@ public class WorkOrderBaseController extends BaseController {
         //工单状态改成交办1
         qw.set(WorkOrderBase::getWorkorderstate, 3);
         qw.set(WorkOrderBase::getDealuser, CurrentUser().getUserName());
-        qw.set(WorkOrderBase::getDealdept, CurrentUser().getDeptId());
+
+        qw.set(WorkOrderBase::getDealusername, CurrentUser().getNickName());
+
+
         boolean update = workorderbaseService.updateBatch(qw);
         if (update) {