修改流程代码提交

liusheng

2024-02-22 d5c2c0762ccbb2bb33635f99480d404f1fb10d5a

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

@@ -11,6 +11,7 @@
import com.ruoyi.project.service.IBaseFinancesubjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -19,15 +20,15 @@

/**
 * 收入费用科目Controller
 * 
 *
 * @author ruoyi
 * @date 2022-01-11
 */
@Slf4j
@Api("收入费用科目")
@RestController
@RequestMapping("/project/financesubject")
public class BaseFinancesubjectController extends BaseController
{
public class BaseFinancesubjectController extends BaseController {
    @Autowired
    private IBaseFinancesubjectService baseFinancesubjectService;

@@ -37,8 +38,8 @@
    @ApiOperation("查询收入费用科目列表")
    //@PreAuthorize("@ss.hasPermi('project::list')")
    @GetMapping("/list")
    public TableDataInfo list(BaseFinancesubject baseFinancesubject)
    {
    public TableDataInfo list(BaseFinancesubject baseFinancesubject) {
        log.info("查询收入费用科目列表{}：", baseFinancesubject);
        startPage();
        //List<BaseFinancesubject> list = baseFinancesubjectService.queryList(baseFinancesubject);、
        List<BaseFinancesubject> list = baseFinancesubjectService.selectBaseFinancesubjectList(baseFinancesubject);
@@ -52,8 +53,8 @@
    //@PreAuthorize("@ss.hasPermi('project:financesubject:export')")
    @Log(title = "收入费用科目", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(BaseFinancesubject baseFinancesubject)
    {
    public AjaxResult export(BaseFinancesubject baseFinancesubject) {
        log.info("导出收入费用科目列表{}：", baseFinancesubject);
        List<BaseFinancesubject> list = baseFinancesubjectService.queryList(baseFinancesubject);
        ExcelUtil<BaseFinancesubject> util = new ExcelUtil<BaseFinancesubject>(BaseFinancesubject.class);
        return util.exportExcel(list, "收入费用科目数据");
@@ -65,8 +66,8 @@
    @ApiOperation("获取收入费用科目详细信息")
    //@PreAuthorize("@ss.hasPermi('project:financesubject:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("获取收入费用科目详细信息{}：", id);
        return AjaxResult.success(baseFinancesubjectService.getById(id));
    }

@@ -76,11 +77,13 @@
    @ApiOperation("新增收入费用科目")
    //@PreAuthorize("@ss.hasPermi('project:financesubject:add')")
    @Log(title = "收入费用科目", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseFinancesubject baseFinancesubject)
    {
        return toAjax(baseFinancesubjectService.save(baseFinancesubject));
    public AjaxResult add(@RequestBody BaseFinancesubject baseFinancesubject) {
        log.info("新增收入费用科目{}：", baseFinancesubject);
        boolean save = baseFinancesubjectService.save(baseFinancesubject);
        log.info("新增收入费用科目baseFinancesubject的ID为：{}", baseFinancesubject.getId());
        return AjaxResult.success(baseFinancesubject);
    }

    /**
@@ -89,10 +92,10 @@
    @ApiOperation("修改收入费用科目")
    //@PreAuthorize("@ss.hasPermi('project:financesubject:edit')")
    @Log(title = "收入费用科目", businessType = BusinessType.UPDATE)
    @PutMapping
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody BaseFinancesubject baseFinancesubject)
    {
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody BaseFinancesubject baseFinancesubject) {
        log.info("修改收入费用科目{}：", baseFinancesubject);
        return toAjax(baseFinancesubjectService.updateById(baseFinancesubject));
    }

@@ -102,21 +105,23 @@
    @ApiOperation("删除收入费用科目")
    //@PreAuthorize("@ss.hasPermi('project:financesubject:remove')")
    @Log(title = "收入费用科目", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        log.info("删除收入费用科目{}：", ids);
        return toAjax(baseFinancesubjectService.removeByIds(Arrays.asList(ids)));
    }

    @GetMapping(value = "/getItemName/{ItemType}")
    public AjaxResult getItemName(@PathVariable("ItemType") String ItemType){
    public AjaxResult getItemName(@PathVariable("ItemType") String ItemType) {
        log.info("/getItemName的入参 {}：", ItemType);
        return AjaxResult.success(baseFinancesubjectService.getItemName(ItemType));
    }

    @ApiOperation("获取捐献成本")
    @Log(title = "获取捐献成本", businessType = BusinessType.OTHER)
    @GetMapping(value = "/getDonationCost/{DonorNo}")
    public AjaxResult getDonationCost(@PathVariable("DonorNo") String DonorNo){
    public AjaxResult getDonationCost(@PathVariable("DonorNo") String DonorNo) {
        log.info("获取捐献成本{}：", DonorNo);
        return AjaxResult.success(baseFinancesubjectService.getDonationCost(DonorNo));
    }

@@ -127,8 +132,8 @@
    @ApiOperation("根据费用大类获取项目类型")
    @Log(title = "根据费用大类获取项目类型", businessType = BusinessType.OTHER)
    @GetMapping("/getbyexpensetype/{ExpenseType}")
    public AjaxResult getByExpenseType(@PathVariable("ExpenseType") String ExpenseType)
    {
    public AjaxResult getByExpenseType(@PathVariable("ExpenseType") String ExpenseType) {
        log.info("根据费用大类获取项目类型{}：", ExpenseType);
        /*BaseFinancesubject baseFinancesubject=new BaseFinancesubject();
        baseFinancesubject.setExpensetype(ExpenseType);
        List<BaseFinancesubject> list = baseFinancesubjectService.queryList(baseFinancesubject);
@@ -144,8 +149,8 @@
    @ApiOperation("根据费用大类获取项目明细")
    @Log(title = "根据费用大类获取项目明细", businessType = BusinessType.OTHER)
    @GetMapping("/getDetails/{ExpenseType}")
    public AjaxResult getDetails(@PathVariable("ExpenseType") String ExpenseType)
    {
    public AjaxResult getDetails(@PathVariable("ExpenseType") String ExpenseType) {
        log.info("根据费用大类获取项目明细{}：", ExpenseType);
        return AjaxResult.success(baseFinancesubjectService.getDetails(ExpenseType));
    }