Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

feige

2024-10-24 4215ced06b40268e9f3c8ef6915998fbe64013b4

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java

@@ -3,6 +3,8 @@

import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.TravelDetail;
import com.ruoyi.service.TravelCountSharService;
import com.ruoyi.service.TravelDetailDownlService;
import com.ruoyi.service.TravelDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -25,6 +27,12 @@

    @Autowired
    TravelDetailService travelDetailService;

    @Autowired
    TravelDetailDownlService travelDetailDownlService;

    @Autowired
    TravelCountSharService travelCountSharService;

    @GetMapping("/{cid}")
     public AjaxResult getDataByCid(@PathVariable("cid") Long cid,TravelDetail travelDetail){
@@ -55,6 +63,9 @@
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        if (! (travelDetailDownlService.deleteData(ids) && travelCountSharService.deleteByContentId(ids)  ) ){
            return AjaxResult.error();
        }
        travelDetailService.removeByIds(Arrays.asList(ids));
        return AjaxResult.success();
    }