diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java index 28e6b96..d3381f9 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java @@ -7,13 +7,14 @@ import com.ics.admin.service.IIcsCustomerStaffService; import com.ics.admin.service.IRepairAttachService; import com.ics.admin.service.IRepairLogService; import com.ics.admin.service.IRepairService; -import com.ics.admin.utils.FlowOperate; +import com.ics.admin.utils.RepairDTO; import com.ics.admin.vo.RepairAttachVO; import com.ics.common.core.controller.BaseController; import com.ics.common.core.domain.IcsCustomerStaff; import com.ics.common.core.domain.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.wf.jwtp.annotation.Logical; @@ -46,22 +47,25 @@ public class RepairController extends BaseController { @Autowired private IIcsCustomerStaffService customerStaffService; - //@Ignore + /** + * 报修 + */ @RequiresPermissions(value = {"repair:attach:operator", "member:center:view"}, logical = Logical.OR) @PostMapping("flow/start") - public R startFlow(Repair repair, String[] files) { + public R startFlow(@RequestBody RepairDTO repairDTO) { Long userId = getLoginStaffId(); - String result = repairService.handleFlow(repair, userId, files, null, null); + String result = repairService.handleFlow(repairDTO.getRepair(), userId, repairDTO.getFiles(), null, null); return IRepairService.OK.equals(result) ? R.ok() : R.error(result); } - - //@Ignore + /** + * 流程处理 + */ @RequiresPermissions(value = {"repair:attach:operator", "member:center:view"}, logical = Logical.OR) @PostMapping("flow/handle") - public R handleFlow(Repair repair, String content, FlowOperate operate) { + public R handleFlow(@RequestBody RepairDTO repairDTO) { Long userId = getLoginStaffId(); - String result = repairService.handleFlow(repair, userId, null, content, operate); + String result = repairService.handleFlow(repairDTO.getRepair(), userId, null, repairDTO.getContent(), repairDTO.getOperate()); return IRepairService.OK.equals(result) ? R.ok() : R.error(result); } @@ -70,9 +74,9 @@ public class RepairController extends BaseController { */ @RequiresPermissions(value = {"repair:attach:operator", "member:center:view"}, logical = Logical.OR) @PostMapping("eval") - public R eval(Repair repair) { + public R eval(@RequestBody RepairDTO repairDTO) { Long userId = getLoginStaffId(); - return toAjax(repairService.eval(repair, userId)); + return toAjax(repairService.eval(repairDTO.getRepair(), userId)); } /** @@ -89,7 +93,7 @@ public class RepairController extends BaseController { */ @RequiresPermissions(value = {"repair:attach:operator", "member:center:view"}, logical = Logical.OR) @RequestMapping("list") - public R list(String type) { + public R list(@RequestBody String type) { startPage(); Long userId = getLoginStaffId(); IcsCustomerStaff loginUser = customerStaffService.selectIcsCustomerStaffById(userId); @@ -106,7 +110,7 @@ public class RepairController extends BaseController { */ @RequiresPermissions(value = {"repair:attach:operator", "member:center:view"}, logical = Logical.OR) @RequestMapping("get") - public R get(Long id) { + public R get(@RequestBody Long id) { Repair repair = repairService.selectRepairById(id); List list = repairAttachService.getListByRepair(id); @@ -140,7 +144,7 @@ public class RepairController extends BaseController { * 删除工单 */ @RequiresPermissions("repair:attach:operator") - @PostMapping("delete") + @RequestMapping("delete") public R remove(Long id) { return toAjax(repairService.deleteRepairById(id)); } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/utils/RepairDTO.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/utils/RepairDTO.java new file mode 100644 index 0000000..06c532c --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/utils/RepairDTO.java @@ -0,0 +1,28 @@ +package com.ics.admin.utils; + +import com.ics.admin.domain.Repair; +import lombok.Data; + +import java.io.Serializable; + +/** + * weixin 传输参数体 + * created at 2024-8-13 11:11 + * + * @author lujiang + * @version 1.0.0 + * @since 1.0.0 + */ +@Data +public class RepairDTO implements Serializable { + private static final long serialVersionUID = -202408131112L; + + private Repair repair; + + private String[] files; //附件id + + private String content; //反馈文字内容 + + FlowOperate operate; //json 参数值,NEXT、BACK、END + +} diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml index 992007f..cb1e0f9 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml @@ -79,7 +79,7 @@ floor_id, floor, room, - explain, + `explain`, per_userid, preDate, cause, @@ -171,7 +171,7 @@ floor_id = #{floorId}, floor = #{floor}, room = #{room}, - explain = #{explain}, + `explain` = #{explain}, per_userid = #{perUserId}, predate = #{preDate}, cause = #{cause},