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

nidapeng

2024-03-20 c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25

 server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java

@@ -4,8 +4,10 @@
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.LoginUserInfo;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.dto.ApplyChangeCyclePriceDTO;
import com.doumee.dao.business.dto.ApplyChangeOptDTO;
import com.doumee.dao.business.dto.CountCyclePriceDTO;
@@ -15,7 +17,8 @@
import com.doumee.service.business.ApplyChangeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;    
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -64,11 +67,11 @@
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @ApiOperation("修改信息")
    @PostMapping("/update")
    @RequiresPermissions("business:applychange:update")
    public ApiResponse updateById(@RequestBody ApplyChange applyChange) {
        applyChangeService.updateById(applyChange);
    public ApiResponse update(@RequestBody ApplyChange applyChange) {
        applyChangeService.update(applyChange);
        return ApiResponse.success(null);
    }

@@ -83,7 +86,7 @@
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:applychange:exportExcel")
    public void exportExcel (@RequestBody PageWrap<ApplyChange> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(ApplyChange.class).export(applyChangeService.findPage(pageWrap).getRecords(), "加减保换厂申请信息表", response);
        ExcelExporter.build(ApplyChange.class).export(applyChangeService.findPageForCompany(pageWrap).getRecords(), "加减保换厂申请信息表", response);
    }
    @ApiOperation("导出加减保详情单")
    @PostMapping("/exportJiajianBaoExcel")
@@ -116,7 +119,6 @@
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(applyChangeService.findDetail(id));
    }


    @ApiOperation(value = "业务处理",notes = "退回申请，关闭等")
    @PostMapping("/applyChangeOpt")