chuancan

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

@@ -4,6 +4,7 @@ import api.entity.database.call.CallLog;
 import api.entity.database.call.Record;
 import api.entity.database.order.WorkOrderOperateLog;
 import api.entity.database.system.*;
+import api.entity.input.order.TransOrderInput;
 import api.entity.view.order.WorkOrderBaseView;
 import api.mapper.system.UserMapper;
 import api.service.call.ICallLogService;
@@ -442,7 +443,7 @@ public class WorkOrderBaseController extends BaseController {
     @ApiOperation("交办 Dealuser不是必填，Dealdept 必填")
     @Log(title = "转派wo_workorderbase", businessType = BusinessType.UPDATE)
     @PutMapping("/transfer")
-    public AjaxResult transfer(@RequestBody WorkOrderBase input, String reason) {
+    public AjaxResult transfer(@RequestBody TransOrderInput input) {
         Date currentDate = new Date(System.currentTimeMillis());
 
         WorkOrderBase orderBase = workorderbaseService.getEntity(input.getWorkorderId());
@@ -461,13 +462,13 @@ public class WorkOrderBaseController extends BaseController {
         qw.set(WorkOrderBase::getAssignusername, CurrentUser().getNickName());
         qw.set(WorkOrderBase::getDealdept, input.getDealdept());
         boolean result = workorderbaseService.updateBatch(qw);
-        if (!StringHelper.isEmpty(reason)) {
-            reason = "，备注：" + reason;
+        if (!StringHelper.isEmpty( input.getReason()) ){
+            input.setReason("，备注：" + input.getReason());  // "，备注：" + reason;
         }
 
 
         if (result) {
-            boolean logresult = addlog("交办了工单" + reason, "交办", CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName(), "");
+            boolean logresult = addlog("交办了工单" + input.getReason(), "交办", CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName(), "");
             return Success("交办成功");
         } else {
             return Error("交办失败");
@@ -477,8 +478,8 @@ public class WorkOrderBaseController extends BaseController {
     //待交办1  待接单（没有处理人的时候）2 待处理3 待审核 4 待回访5 已完结6
     @ApiOperation("完结")
     @Log(title = "完结wo_workorderbase", businessType = BusinessType.UPDATE)
-    @PutMapping("/end")
-    public AjaxResult end(String reason, int id) {
+    @PutMapping("/end/{id}")
+    public AjaxResult end(@RequestBody String reason,@PathVariable int id) {
         Date currentDate = new Date(System.currentTimeMillis());
 
 
@@ -503,8 +504,8 @@ public class WorkOrderBaseController extends BaseController {
 
     @ApiOperation("审核，agree 0 拒绝 ；1 同意")
     @Log(title = "审核wo_workorderbase", businessType = BusinessType.UPDATE)
-    @PutMapping("/audit")
-    public AjaxResult audit(String reason, int agree, int id) {
+    @PutMapping("/audit/{id}/{agree}")
+    public AjaxResult audit(@RequestBody String reason, @PathVariable int agree, @PathVariable  int id) {
         Date currentDate = new Date(System.currentTimeMillis());
 
 
@@ -540,8 +541,8 @@ public class WorkOrderBaseController extends BaseController {
     //重启 2、重启：只有已完结的可进行重启，重启之后，工单为重办中状态
     @ApiOperation("重启 ,参数是id，以后都用id")
     @Log(title = "重启", businessType = BusinessType.OTHER)
-    @PostMapping("restarts/{id}/{reason}")
-    public AjaxResult restarts(@PathVariable long id, @PathVariable String reason) {
+    @PostMapping("/restarts/{id}")
+    public AjaxResult restarts( @PathVariable long id, @RequestBody  String reason) {
         WorkOrderBase orderBase = workorderbaseService.getEntity(id);
         if (orderBase.getWorkorderstate() != 6) {
             return Success("只有已完结的可进行重启");
@@ -566,8 +567,8 @@ public class WorkOrderBaseController extends BaseController {
 
     @ApiOperation("处理人退回")
     @Log(title = "退回,参数是id，以后都用id", businessType = BusinessType.OTHER)
-    @PostMapping("back/{id}/{reason}")
-    public AjaxResult back(@PathVariable long id, @PathVariable String reason) {
+    @PostMapping("/back/{id}")
+    public AjaxResult back( @PathVariable long id, @RequestBody String reason) {
         WorkOrderBase orderBase = workorderbaseService.getEntity(id);
         LambdaUpdateWrapper<WorkOrderBase> qw = new LambdaUpdateWrapper<>();
         qw.eq(WorkOrderBase::getWorkorderId, id);
@@ -593,8 +594,8 @@ public class WorkOrderBaseController extends BaseController {
     //待交办1 ; 待接单（没有处理人的时候）2; 待处理3; 待审核 4 ;待回访5 ;已完结6;
     @ApiOperation("已办待回访退回到已办待审核")
     @Log(title = "退回,参数是id，以后都用id", businessType = BusinessType.OTHER)
-    @PostMapping("backtoaudit/{id}/{reason}")
-    public AjaxResult backtoaudit(@PathVariable long id, @PathVariable String reason) {
+    @PostMapping("/backtoaudit/{id}")
+    public AjaxResult backtoaudit(@PathVariable long id,  @RequestBody  String reason) {
         WorkOrderBase orderBase = workorderbaseService.getEntity(id);
         LambdaUpdateWrapper<WorkOrderBase> qw = new LambdaUpdateWrapper<>();
         qw.eq(WorkOrderBase::getWorkorderId, id);
@@ -617,8 +618,8 @@ public class WorkOrderBaseController extends BaseController {
 
     @ApiOperation("组内工单接单")
     @Log(title = "接单,参数是id，以后都用id", businessType = BusinessType.OTHER)
-    @PostMapping("receive/{id}/{reason}")
-    public AjaxResult receive(@PathVariable long id, @PathVariable String reason) {
+    @PostMapping("/receive/{id}")
+    public AjaxResult receive( @PathVariable long id, @RequestBody  String reason) {
         WorkOrderBase orderBase = workorderbaseService.getEntity(id);
         LambdaUpdateWrapper<WorkOrderBase> qw = new LambdaUpdateWrapper<>();
         qw.eq(WorkOrderBase::getWorkorderId, id);

zxkf-entity/src/main/java/api/entity/input/order/TransOrderInput.java

@@ -0,0 +1,12 @@
+package api.entity.input.order;
+
+import lombok.Data;
+
+@Data
+public class TransOrderInput {
+    private String reason;
+    private Long workorderId;
+    private String dealuser;
+    private Long dealdept;
+
+}