变更

liusheng

2024-07-22 9e99e7e192c62c2274f8f5362b354cbf55c3d80f

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java

@@ -12,6 +12,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.weaver.loadtime.Aj;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -37,7 +38,7 @@
     * 查询差旅城市和补贴标准列表
     */
    @ApiOperation("查询差旅城市和补贴标准列表")
    @PreAuthorize("@ss.hasPermi('project:travelcity:list')")
    // @PreAuthorize("@ss.hasPermi('project:travelcity:list')")
    @GetMapping("/list")
    public TableDataInfo list(BaseTravelcity baseTravelcity) {
        log.info("查询差旅城市和补贴标准列表{}：", baseTravelcity);
@@ -50,7 +51,7 @@
     * 导出差旅城市和补贴标准列表
     */
    @ApiOperation("导出差旅城市和补贴标准列表")
    @PreAuthorize("@ss.hasPermi('project:travelcity:export')")
    // @PreAuthorize("@ss.hasPermi('project:travelcity:export')")
    @Log(title = "差旅城市和补贴标准", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(BaseTravelcity baseTravelcity) {
@@ -64,7 +65,7 @@
     * 获取差旅城市和补贴标准详细信息
     */
    @ApiOperation("获取差旅城市和补贴标准详细信息")
    @PreAuthorize("@ss.hasPermi('project:travelcity:query')")
    // @PreAuthorize("@ss.hasPermi('project:travelcity:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("获取差旅城市和补贴标准详细信息{}：", id);
@@ -75,20 +76,22 @@
     * 新增差旅城市和补贴标准
     */
    @ApiOperation("新增差旅城市和补贴标准")
    @PreAuthorize("@ss.hasPermi('project:travelcity:add')")
    // @PreAuthorize("@ss.hasPermi('project:travelcity:add')")
    @Log(title = "差旅城市和补贴标准", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseTravelcity baseTravelcity) {
        log.info("新增差旅城市和补贴标准{}：", baseTravelcity);
        return toAjax(baseTravelcityService.save(baseTravelcity));
        boolean save = baseTravelcityService.save(baseTravelcity);
        log.info("新增差旅城市和补贴标准baseTravelcity的id{}：", baseTravelcity.getId());
        return AjaxResult.success(baseTravelcity);
    }

    /**
     * 修改差旅城市和补贴标准
     */
    @ApiOperation("修改差旅城市和补贴标准")
    @PreAuthorize("@ss.hasPermi('project:travelcity:edit')")
    // @PreAuthorize("@ss.hasPermi('project:travelcity:edit')")
    @Log(title = "差旅城市和补贴标准", businessType = BusinessType.UPDATE)
    @PutMapping
    @RepeatSubmit
@@ -101,7 +104,7 @@
     * 删除差旅城市和补贴标准
     */
    @ApiOperation("删除差旅城市和补贴标准")
    @PreAuthorize("@ss.hasPermi('project:travelcity:remove')")
    // @PreAuthorize("@ss.hasPermi('project:travelcity:remove')")
    @Log(title = "差旅城市和补贴标准", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
@@ -114,7 +117,7 @@
     * 根据区域获取伙食补助、公杂要补助
     */
    @ApiOperation("根据区域获取补助")
    // @PreAuthorize("@ss.hasPermi('project:travelcity:list')")
    // // @PreAuthorize("@ss.hasPermi('project:travelcity:list')")
    @GetMapping("/getSubsidy/{cityCode}")
    public AjaxResult getSubsidy(@PathVariable String cityCode) {
        log.info("根据区域获取伙食补助、公杂要补助{}：", cityCode);