回访

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

@@ -286,12 +286,19 @@ public class WorkOrderBaseController extends BaseController {
             input.setWorkorderstate(EnumOrderStatus.xgd.getValue());
         } else {
             //结束了 已完成
-            input.setWorkorderstate(EnumOrderStatus.end.getValue());
-            input.setEndtime(currentDate);
-            input.setDealuser(CurrentUser().getUserName());
+            if(input.getIsNeedVisit()==1){
+
+                input.setWorkorderstate(EnumOrderStatus.dhf.getValue());
+            }
+           else{
+                input.setWorkorderstate(EnumOrderStatus.end.getValue());
+                input.setEndtime(currentDate);
+                input.setDealuser(CurrentUser().getUserName());
+
+                input.setDealdept(CurrentUser().getDeptId());
+                input.setDealusername(CurrentUser().getNickName());
+            }
 
-            input.setDealdept(CurrentUser().getDeptId());
-            input.setDealusername(CurrentUser().getNickName());
         }
 
         boolean result = workorderbaseService.insert(input);
@@ -314,8 +321,14 @@ public class WorkOrderBaseController extends BaseController {
                 boolean logresult = addlog("创建了工单", "创建", CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName(), "");
             } else {
                 //结束了 已完成
+if(input.getIsNeedVisit()==1){
+    boolean logresult = addlog("创建了工单,工单待回访", "创建", CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName(), "");
+
+}
+else {
+    boolean logresult = addlog("创建并完成了工单" + dealContent, "创建并完成", CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName(), "");
 
-                boolean logresult = addlog("创建并完成了工单" + dealContent, "创建并完成", CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName(), "");
+}
             }
 
             //判断手机号存在不customer，不存在就添加新用户
@@ -363,22 +376,22 @@ public class WorkOrderBaseController extends BaseController {
         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());
-        orderBase.setWorkordercate(input.getWorkordercate());
-        orderBase.setContent(input.getContent());
-        orderBase.setSource(input.getSource());
+//        orderBase.setCaller(input.getCaller());
+//        orderBase.setCallnum(input.getCallnum());
+//        orderBase.setProject(input.getProject());
+//        orderBase.setWorkordercate(input.getWorkordercate());
+//        orderBase.setContent(input.getContent());
+//        orderBase.setSource(input.getSource());
         if (input.getIsend()==1)
         {
-            orderBase.setWorkorderstate(EnumOrderStatus.end.getValue());
-            orderBase.setIsend(1L);
-            orderBase.setEndtime(currentDate);
-            orderBase.setDealuser(CurrentUser().getUserName());
-            orderBase.setDealdept(CurrentUser().getDeptId());
-            orderBase.setDealusername(CurrentUser().getNickName());
+            input.setWorkorderstate(EnumOrderStatus.end.getValue());
+            input.setIsend(1L);
+            input.setEndtime(currentDate);
+            input.setDealuser(CurrentUser().getUserName());
+            input.setDealdept(CurrentUser().getDeptId());
+            input.setDealusername(CurrentUser().getNickName());
         }
-        boolean result = workorderbaseService.update(orderBase);
+        boolean result = workorderbaseService.update(input);
         if (result) {
 
             boolean logresult = addlog("编辑了工单", "编辑", CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName(), "");
@@ -502,9 +515,14 @@ public class WorkOrderBaseController extends BaseController {
         if(orderBase.getWorkorderstate()>EnumOrderStatus.dhf.getValue()){
             LambdaQueryWrapper<WorkOrderVisitLog> la=new LambdaQueryWrapper<>();
             la.eq(WorkOrderVisitLog::getWorkordercode,orderBase.getWorkordercode());
-            WorkOrderVisitLog log=  workordervisitlogService.getEntity(la);
-            ov.setVisitName(log!=null?log.getOperatorname():"");
-            ov.setVisitTime(log!=null?log.getCreatetime():null);
+            la.orderByDesc(WorkOrderVisitLog::getCreatetime);
+           List< WorkOrderVisitLog >loglist=  workordervisitlogService.getList(la);
+           if(loglist!=null &&loglist.size()>0){
+               WorkOrderVisitLog log=loglist.stream().findFirst().get();
+               ov.setVisitName(log!=null?log.getOperatorname():"");
+               ov.setVisitTime(log!=null?log.getCreatetime():null);
+           }
+
 
         }
 
@@ -840,7 +858,16 @@ public class WorkOrderBaseController extends BaseController {
         qw.eq(WorkOrderBase::getWorkordercode, code);
         if (agree == 1) {
             //同意 工单状态改
-            qw.set(WorkOrderBase::getWorkorderstate,  EnumOrderStatus.dhf.getValue());
+            if (orderBase.getIsNeedVisit()==0){
+
+                qw.set(WorkOrderBase::getWorkorderstate,  EnumOrderStatus.end.getValue());
+                qw.set(WorkOrderBase::getIsend, 1);
+                qw.set(WorkOrderBase::getEndtime, currentDate);
+            }
+            if(orderBase.getIsNeedVisit()==1){
+                qw.set(WorkOrderBase::getWorkorderstate,  EnumOrderStatus.dhf.getValue());
+            }
+
         } else {
             reason= map.get("reason").toString();
             qw.set(WorkOrderBase::getWorkorderstate,  EnumOrderStatus.dcl.getValue());
@@ -882,19 +909,33 @@ public class WorkOrderBaseController extends BaseController {
         qw.eq(WorkOrderBase::getWorkordercode, code);
 
 
-        Long myd= Long.parseLong(map.get("myd").toString());
+        Long myd=0L;
+        if(map.get("myd")!=null)
+        {
+         myd=   Long.parseLong(map.get("myd").toString());
+        }
         int isover= (int) map.get("isover");
         //工单状态改
-         if (isover>0||myd>0)
-         {
-             qw.set(WorkOrderBase::getWorkorderstate,  EnumOrderStatus.end.getValue());
-             qw.set(WorkOrderBase::getIsend, 1);
-             qw.set(WorkOrderBase::getEndtime, currentDate);
-         }
-        qw.set(WorkOrderBase::getVisitresult,  map.get("visitresult"));
-        qw.set(WorkOrderBase::getCallvisitid,  map.get("callid"));
-        qw.set(WorkOrderBase::getVisittime, currentDate);
-        qw.set(WorkOrderBase::getMyd, myd);
+//         if (isover>0||myd>0)
+//         {
+//             qw.set(WorkOrderBase::getWorkorderstate,  EnumOrderStatus.end.getValue());
+//             qw.set(WorkOrderBase::getIsend, 1);
+//             qw.set(WorkOrderBase::getEndtime, currentDate);
+//         }
+
+        if(isover==0){
+            qw.set(WorkOrderBase::getWorkorderstate,  EnumOrderStatus.dhf.getValue());
+        }
+        else {
+            qw.set(WorkOrderBase::getWorkorderstate,  EnumOrderStatus.end.getValue());
+            qw.set(WorkOrderBase::getIsend, 1);
+            qw.set(WorkOrderBase::getEndtime, currentDate);
+            qw.set(WorkOrderBase::getVisitresult,  map.get("result"));
+            qw.set(WorkOrderBase::getCallvisitid,  map.get("callid"));
+            qw.set(WorkOrderBase::getVisittime, currentDate);
+            qw.set(WorkOrderBase::getMyd, myd);
+        }
+
         boolean result = workorderbaseService.updateBatch(qw);
 
 
@@ -911,11 +952,12 @@ public class WorkOrderBaseController extends BaseController {
         visitLog.setWorkordercode(code);
         visitLog.setOperator(CurrentUser().getUserName());
         visitLog.setOperatorname(CurrentUser().getNickName());
-        visitLog.setContent(map.get("visitresult").toString());
+        visitLog.setContent(map.get("visitresult")!=null?map.get("visitresult").toString():"");
         visitLog.setMyd(myd);
+        visitLog.setResult( map.get("result")!=null?map.get("result").toString():"");
         visitLog.setCreatetime(currentDate);
         visitLogService.insert(visitLog);
-        System.out.println("到这没错4");
+
         if (result) {
             boolean logresult = addlog("回访了工单" , "回访", CurrentUser().getUserName(),
                     code , CurrentUser().getNickName(), "");