工单详情

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

@@ -182,6 +182,27 @@ public class WorkOrderBaseController extends BaseController {
         return Success("成功", ov);
     }
 
+
+    @ApiOperation("详情")
+    @Log(title = "查询wo_workorderbase详情", businessType = BusinessType.QUERY)
+    @GetMapping("getInfoByCode/{code}")
+    public AjaxResult getInfoByCode(@PathVariable String code) {
+        LambdaQueryWrapper<WorkOrderBase> qw = new LambdaQueryWrapper();
+        qw.eq(WorkOrderBase::getWorkordercode, code);
+        qw.eq(WorkOrderBase::getIsdelete, 0);
+
+      List<WorkOrderBase> base= workorderbaseService.getList(qw);
+      if(base!=null && base.stream().count()>0){
+          WorkOrderBaseView ov=trans(base.get(0));
+
+          return Success("成功", ov);
+
+      }
+
+        return Success("成功");
+    }
+
+
     @ApiOperation("新增")
     @Log(title = "新增wo_workorderbase", businessType = BusinessType.INSERT)
     @PostMapping
@@ -579,7 +600,7 @@ public class WorkOrderBaseController extends BaseController {
     @ApiOperation("完结")
     @Log(title = "完结wo_workorderbase", businessType = BusinessType.UPDATE)
     @PutMapping("/end/{id}")
-    public AjaxResult end(@RequestBody String reason,@PathVariable int id) {
+    public AjaxResult end(@RequestBody HashMap<String,String> map,@PathVariable int id) {
         Date currentDate = new Date(System.currentTimeMillis());
 
 
@@ -596,13 +617,16 @@ public class WorkOrderBaseController extends BaseController {
         qw.set(WorkOrderBase::getDealdept, CurrentUser().getDeptId());
         qw.set(WorkOrderBase::getDealusername, CurrentUser().getNickName());
 
+        qw.set(WorkOrderBase::getFile, map.get("file"));
+        qw.set(WorkOrderBase::getResult, map.get("result"));
 
+       String reason="";
         boolean result = workorderbaseService.updateBatch(qw);
-        if (!StringHelper.isEmpty(reason)) {
-            reason = "，备注：" + reason;
+        if (!StringHelper.isEmpty(map.get("result"))) {
+            reason = "，回复内容：" + map.get("result");
         }
         if (result) {
-            boolean logresult = addlog("完结了工单" + reason, "完结", CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName(), "");
+            boolean logresult = addlog("完结了工单" + reason, "完结", CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName(), map.get("file"));
             return Success("完结成功");
         } else {
             return Error("完结失败");