Merge remote-tracking branch 'origin/master'

# Conflicts:
#	zxkf-api/src/main/java/api/controller/system/UserController.java

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

@@ -124,22 +124,32 @@ public class WorkOrderBaseController extends BaseController {
         input.setWorkordercode(ordercode);
         input.setIsdelete(0L);
         input.setCreateuser(CurrentUser().getUserName());
+        input.setCreateusername(CurrentUser().getNickName());
         input.setCreatetime(currentDate);
         //没结束 处理中
         if (input.getIsend() == 0) {
             input.setWorkorderstate(0L);
-            input.setDealuser(input.getDealuser());
+//            input.setDealuser(input.getDealuser());
+//            User user = userMapper.selectUserByUserName(input.getDealuser());
+//            input.setDealusername(user.getNickName());
         } else {
             //结束了 已完成
             input.setWorkorderstate(1L);
             input.setEndtime(currentDate);
             input.setDealuser(CurrentUser().getUserName());
+            input.setDealusername(CurrentUser().getNickName());
         }
-        input.setSource("来电");
+//        input.setSource("来电");
         boolean result = workorderbaseService.insert(input);
         if (result) {
             //添加操作日志
-            boolean logresult = addlog("创建了工单", 1L, CurrentUser().getUserName(), input.getWorkordercode());
+            if (input.getIsend() == 0) {
+                boolean logresult = addlog("创建了工单", 1L, CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName());
+            } else {
+                //结束了 已完成
+                boolean logresult = addlog("创建并完成了工单", 1L, CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName());
+            }
+
             //判断手机号存在不customer，不存在就添加新用户
             LambdaQueryWrapper<Customer> qw = new LambdaQueryWrapper<>();
             qw.eq(Customer::getCustomerPhone, input.getCallnum());
@@ -166,6 +176,8 @@ public class WorkOrderBaseController extends BaseController {
     public AjaxResult edit(@RequestBody WorkOrderBase input) {
         Date currentDate = new Date(System.currentTimeMillis());
         WorkOrderBase orderBase = workorderbaseService.getEntity(input.getWorkorderId());
+        boolean noend=orderBase.getIsend()==0?true:false;
+
         orderBase.setCaller(input.getCaller());
         orderBase.setCallnum(input.getCallnum());
         orderBase.setProject(input.getProject());
@@ -175,24 +187,27 @@ public class WorkOrderBaseController extends BaseController {
         orderBase.setResult(input.getResult());
         //没结束 处理中
         if (input.getIsend() == 0) {
-            input.setWorkorderstate(0L);
-            input.setDealuser(input.getDealuser());
+            orderBase.setWorkorderstate(0L);
+//            orderBase.setDealuser(input.getDealuser());
+//            User user = userMapper.selectUserByUserName(input.getDealuser());
+//            orderBase.setDealusername(user.getNickName());
         } else {
             //结束了 已完成
-            input.setWorkorderstate(1L);
-            input.setEndtime(currentDate);
-            input.setDealuser(CurrentUser().getUserName());
+            orderBase.setWorkorderstate(1L);
+            orderBase.setEndtime(currentDate);
+            orderBase.setDealuser(CurrentUser().getUserName());
+            orderBase.setDealusername(CurrentUser().getNickName());
         }
 
         boolean result = workorderbaseService.update(orderBase);
         if (result) {
-            if (orderBase.getIsend()==0 && input.getIsend()==1)
+            if (noend && input.getIsend()==1)
             {
-                boolean logresult = addlog("修改并结束了工单", 3L, CurrentUser().getUserName(), orderBase.getWorkordercode());
+                boolean logresult = addlog("修改并结束了工单", 3L, CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName());
             }
             else
             {
-                boolean logresult = addlog("修改了工单", 4L, CurrentUser().getUserName(), input.getWorkordercode());
+                boolean logresult = addlog("修改了工单", 4L, CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName());
             }
             return Success("成功");
         } else {
@@ -210,14 +225,15 @@ public class WorkOrderBaseController extends BaseController {
         Date currentDate = new Date(System.currentTimeMillis());
         WorkOrderBase orderBase = workorderbaseService.getEntity(input.getWorkorderId());
         orderBase.setDealuser(CurrentUser().getUserName());
+        orderBase.setDealusername(CurrentUser().getNickName());
         orderBase.setResult(input.getResult());
         orderBase.setIsend(1L);
         orderBase.setEndtime(currentDate);
         orderBase.setFile(input.getFile());
         orderBase.setWorkorderstate(1L);
-        boolean result = workorderbaseService.update(input);
+        boolean result = workorderbaseService.update(orderBase);
         if (result) {
-            boolean logresult = addlog("处理了工单", 2L, CurrentUser().getUserName(), orderBase.getWorkordercode());
+            boolean logresult = addlog("处理了工单", 2L, CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName());
             return Success("成功");
         } else {
             return Error("修改失败");
@@ -289,9 +305,11 @@ public class WorkOrderBaseController extends BaseController {
         input.setIsend(0L);
         input.setWorkorderstate(0L);
 
+        input.setCreateusername(input.getCaller());
+
         boolean result = workorderbaseService.insert(input);
         if (result) {
-            boolean logresult = addlog("留言创建了工单", 1L, "", input.getWorkordercode());
+            boolean logresult = addlog("留言创建了工单", 1L, "", input.getWorkordercode(),"");
             //判断手机号存在不customer，不存在就添加新用户
             LambdaQueryWrapper<Customer> qw = new LambdaQueryWrapper<>();
             qw.eq(Customer::getCustomerPhone, input.getCallnum());
@@ -314,7 +332,7 @@ public class WorkOrderBaseController extends BaseController {
         }
     }
 
-    public boolean addlog(String content, Long type, String operator, String code) {
+    public boolean addlog(String content, Long type, String operator, String code,String nickname) {
         Date currentDate = new Date(System.currentTimeMillis());
         //添加操作日志
         WorkOrderOperateLog loginput = new WorkOrderOperateLog();
@@ -324,6 +342,7 @@ public class WorkOrderBaseController extends BaseController {
         loginput.setOperationtype(type);
         loginput.setOperator(operator);
         loginput.setWorkordercode(code);
+        loginput.setOperatorname(nickname);
         boolean logresult = workorderoperatelogService.insert(loginput);
         return logresult;
     }
@@ -341,14 +360,7 @@ public class WorkOrderBaseController extends BaseController {
             DictData dicdata = dictDataService.getEntity(orderBase.getWorkordercate());
             ov.setWorkordercatename(dicdata.getDictValue());
         }
-        if (!StringHelper.isEmpty(orderBase.getDealuser())) {
-            User user = userMapper.selectUserByUserName(orderBase.getDealuser());
-            ov.setDealusername(user.getNickName());
-        }
-        if (!StringHelper.isEmpty(orderBase.getCreateuser())) {
-            User user = userMapper.selectUserByUserName(orderBase.getCreateuser());
-            ov.setCreateusername(user.getNickName());
-        }
+
         if (orderBase.getWorkorderstate() == 0) {
             ov.setWorkorderstatename("待处理");
         } else if (orderBase.getWorkorderstate() == 1) {
@@ -383,11 +395,15 @@ public class WorkOrderBaseController extends BaseController {
         Date currentDate = new Date(System.currentTimeMillis());
         WorkOrderBase orderBase = workorderbaseService.getEntity(input.getWorkorderId());
         orderBase.setDealuser(input.getDealuser());
+        User user = userMapper.selectUserByUserName(input.getDealuser());
+        orderBase.setDealusername(user.getNickName());
         orderBase.setAssigntime(currentDate);
         orderBase.setAssignuser(CurrentUser().getUserName());
+
+        orderBase.setAssignusername(CurrentUser().getNickName());
         boolean result = workorderbaseService.update(input);
         if (result) {
-            boolean logresult = addlog("转派了工单", 5L, CurrentUser().getUserName(), orderBase.getWorkordercode());
+            boolean logresult = addlog("转派了工单", 5L, CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName());
             return Success("转派成功");
         } else {
             return Error("转派失败");

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

@@ -1,5 +1,9 @@
 package api.controller.order;
 
+import api.entity.database.system.User;
+
+import api.mapper.system.UserMapper;
+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 +19,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_operatelog",tags = "wo_operatelog")
 @RestController
@@ -24,8 +31,11 @@ public class WorkOrderOperateLogController extends BaseController {
     @Autowired
     private IWorkOrderOperateLogService workorderoperatelogService;
 
+    @Autowired
+    private UserMapper userMapper;
+
     @ApiOperation("列表")
-    @Log(title = "查询wo_operatelog列表",businessType = BusinessType.QUERY)
+    @Log(title = "查询wo_operatelog列表", businessType = BusinessType.QUERY)
     @GetMapping
     public AjaxResult getList(WorkOrderOperateLog input, PageInput pageInput) {
         LambdaQueryWrapper<WorkOrderOperateLog> qw = new LambdaQueryWrapper();
@@ -35,26 +45,28 @@ public class WorkOrderOperateLogController extends BaseController {
         qw.like(!StringHelper.isEmpty(input.getLogcontent()), WorkOrderOperateLog::getLogcontent, input.getLogcontent());
         qw.eq(input.getOperationtype() != null && input.getOperationtype() > 0, WorkOrderOperateLog::getOperationtype, input.getOperationtype());
 
-        qw.eq( WorkOrderOperateLog::getIsdelete, 0);
+        qw.eq(WorkOrderOperateLog::getIsdelete, 0);
         qw.orderByDesc(WorkOrderOperateLog::getOperationtime);
         Page<WorkOrderOperateLog> page = GetPage(pageInput);
         if (page != null) {
             IPage<WorkOrderOperateLog> iPage = workorderoperatelogService.getListPage(page, qw);
+
             return Success("成功", iPage.getRecords(), iPage.getTotal());
         } else {
+
             return Success("成功", workorderoperatelogService.getList(qw));
         }
     }
 
     @ApiOperation("详情")
-    @Log(title = "查询wo_operatelog详情",businessType = BusinessType.QUERY)
+    @Log(title = "查询wo_operatelog详情", businessType = BusinessType.QUERY)
     @GetMapping("/{id}")
     public AjaxResult getInfo(@PathVariable long id) {
         return Success("成功", workorderoperatelogService.getEntity(id));
     }
 
     @ApiOperation("新增")
-    @Log(title = "新增wo_operatelog",businessType = BusinessType.INSERT)
+    @Log(title = "新增wo_operatelog", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody WorkOrderOperateLog input) {
         boolean result = workorderoperatelogService.insert(input);
@@ -65,7 +77,10 @@ public class WorkOrderOperateLogController extends BaseController {
         }
     }
 
+}
+
+
+
 
 
 
-}

zxkf-api/src/main/java/api/controller/system/UserController.java

@@ -36,6 +36,8 @@ public class UserController extends BaseController {
     @Autowired
     private IUserService userService;
     @Autowired
+    private UserMapper userMapper;
+    @Autowired
     private IDeptService deptService;
     @Autowired
     private IRoleService roleService;

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

@@ -84,6 +84,18 @@ public class WorkOrderBase {
 
 
 
+    /** 创建人 */
+    @ApiModelProperty("创建人姓名")
+    private String createusername;
+
+    /** 处理人 */
+    @ApiModelProperty("处理人姓名")
+    private String dealusername;
+
+    /** zhipai人 */
+    @ApiModelProperty("zhipairen姓名")
+    private String assignusername;
+
 
     /** 删除标志（0代表存在 1代表删除）） */
     @ApiModelProperty("删除标志（0代表存在 1代表删除）")

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

@@ -23,9 +23,13 @@ public class WorkOrderOperateLog {
     private String workordercode;
 
     /** 操作人 */
-    @ApiModelProperty("操作人")
+    @ApiModelProperty("操作人工号")
     private String operator;
 
+    /** 操作人 */
+    @ApiModelProperty("操作人姓名")
+    private String operatorname;
+
     /** 操作记录 */
     @ApiModelProperty("操作记录")
     private String logcontent;

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

@@ -15,12 +15,7 @@ public class WorkOrderBaseView extends WorkOrderBase {
     @ApiModelProperty("项目名")
     private String projectname;
 
-    @ApiModelProperty("创建人名")
-    private String createusername;
 
-    /** 处理人 */
-    @ApiModelProperty("处理人名")
-    private String dealusername;
 
     /** 工单类型 */
     @ApiModelProperty("工单类型名")