Merge branch 'master' of http://192.168.1.222:3000/zhoufan/zxkf_api

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

@@ -756,7 +756,12 @@ public class WorkOrderBaseController extends BaseController {
         //工单状态改成交办1
         qw.set(WorkOrderBase::getWorkorderstate, 1);
         qw.set(WorkOrderBase::getDealuser, "");
+        qw.set(WorkOrderBase::getDealusername, "");
         qw.set(WorkOrderBase::getDealdept, 0);
+
+        qw.set(WorkOrderBase::getAssignusername, "");
+        qw.set(WorkOrderBase::getAssignuser, "");
+        qw.set(WorkOrderBase::getAssigntime, null);
         boolean result = workorderbaseService.updateBatch(qw);
 
         if (result) {

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

@@ -55,6 +55,7 @@ public class WorkOrderVisitLogController extends BaseController {
         qw.eq(input.getCreatetime() != null , WorkOrderVisitLog::getCreatetime, input.getCreatetime());
         qw.like(!StringHelper.isEmpty(input.getOperator()), WorkOrderVisitLog::getOperator, input.getOperator());
         qw.like(!StringHelper.isEmpty(input.getOperatorname()), WorkOrderVisitLog::getOperatorname, input.getOperatorname());
+       qw.orderByDesc(WorkOrderVisitLog::getVisitId);
         Page<WorkOrderVisitLog> page = GetPage(pageInput);
         if (page != null) {
             IPage<WorkOrderVisitLog> iPage = workordervisitlogService.getListPage(page, qw);