优化代码结构

wisenergy-service/src/main/java/cn/wisenergy/service/WorkTimeOrderService.java

@@ -44,22 +44,6 @@ public interface WorkTimeOrderService {
      */
     List<WorkTimeOrder> getByDayToDto(Integer userId, Date workDay);
 
-    /**
-     * 功能：工时填报
-     *
-     * @param dto 自定义填报类
-     * @return dto
-     */
-    List<WorkTimeOrderDto> add(CreateWorkOrderDto dto);
-
-
-    /**
-     * 功能： 驳回重新填报
-     *
-     * @param dto 自定义DTO
-     * @return 填报信息
-     */
-    List<WorkTimeOrderDto> update(CreateWorkOrderDto dto);
 
 
     /**
@@ -124,7 +108,7 @@ public interface WorkTimeOrderService {
      * @param createWorkOrderDto
      * @return
      */
-    List<WorkTimeOrderDto> addTest(CreateWorkOrderDto createWorkOrderDto);
+    List<WorkTimeOrderDto> addOrder(CreateWorkOrderDto createWorkOrderDto);
 
 
     /**

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/WorkTimeOrderController.java

@@ -51,24 +51,7 @@ public class WorkTimeOrderController extends BaseController {
         return getResult(workTimeOrderService.wtoToWtod(dtos));
     }
 
-    @ApiOperation(value = "工时填报", notes = "工时填报", httpMethod = "POST")
-    @ApiImplicitParam(name = "dto", value = "创建工单dto", dataType = "CreateWorkOrderDto")
-    @PostMapping(value = "/add")
-    public Result<List<WorkTimeOrderDto>> add(@RequestBody CreateWorkOrderDto dto) {
-        log.info("WorkTimeOrderController[]add[]input.param" + dto);
 
-        List<WorkTimeOrderDto> workOrderList = workTimeOrderService.add(dto);
-        return getResult(workOrderList);
-    }
-
-    @ApiOperation(value = "工时驳回重新填报", notes = "工时驳回重新填报", httpMethod = "PUT")
-    @ApiImplicitParam(name = "dto", value = "创建工单dto", dataType = "CreateWorkOrderDto")
-    @PutMapping(value = "/update")
-    public Result<List<WorkTimeOrderDto>> update(@RequestBody CreateWorkOrderDto dto) {
-        log.info("WorkTimeOrderController[]update[]input.param" + dto);
-        List<WorkTimeOrderDto> updateData = workTimeOrderService.update(dto);
-        return getResult(updateData);
-    }
 
     @ApiOperation(value = "查询待审批(小程序)", notes = "查询待审批(小程序)", httpMethod = "GET")
     @ApiImplicitParams({
@@ -166,12 +149,12 @@ public class WorkTimeOrderController extends BaseController {
         return getResult(workTimeOrderDtos);
     }
 
-    @ApiOperation(value = "工时填报(测试)", notes = "工时填报(测试)", httpMethod = "POST")
+    @ApiOperation(value = "工时填报", notes = "工时填报", httpMethod = "POST")
     @ApiImplicitParam(name = "dto", value = "创建工单dto", dataType = "CreateWorkOrderDto")
     @PostMapping(value = "/addOrder")
     public Result<List<WorkTimeOrderDto>> addOrder(@RequestBody CreateWorkOrderDto dto) {
         log.info("WorkTimeOrderController[]addTest[]input.param" + dto);
-        List<WorkTimeOrderDto> workTimeOrderDtos = workTimeOrderService.addTest(dto);
+        List<WorkTimeOrderDto> workTimeOrderDtos = workTimeOrderService.addOrder(dto);
         return getResult(workTimeOrderDtos);
     }