Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveCloudController.java

@@ -4,10 +4,11 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.dto.ApproveDTO;
import com.doumee.dao.business.model.Approve;
import com.doumee.service.business.ApproveService;
import io.swagger.annotations.Api;
@@ -46,7 +47,6 @@
        approveService.deleteById(id);
        return ApiResponse.success(null);
    }

    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @CloudRequiredPermission("business:approve:delete")
@@ -88,4 +88,14 @@
    public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(approveService.findById(id));
    }

    @ApiOperation("审批信息提交")
    @PostMapping("/approved")
    @CloudRequiredPermission("business:approve:create")
    public ApiResponse approved (@RequestBody ApproveDTO approveDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        approveDTO.setLoginUserInfo(getLoginUser(token));
        approveService.approved(approveDTO);
        return ApiResponse.success("操作成功");
    }

}