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

k94314517

2024-06-19 7e01b349c769045abeeeb6cf98241c8d60d0aeb3

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

@@ -6,9 +6,11 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.dto.ApplyChangeOptDTO;
import com.doumee.dao.business.model.ApplyChange;
import com.doumee.dao.business.model.InsuranceApply;
import com.doumee.service.business.ApplyChangeService;
import com.doumee.service.business.InsuranceApplyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -30,6 +32,8 @@

    @Autowired
    private ApplyChangeService applyChangeService;
    @Autowired
    private InsuranceApplyService insuranceApplyService;

    @PreventRepeat
    @ApiOperation("新建")
@@ -57,7 +61,9 @@
    @PostMapping("/uploadPidan")
    @RequiresPermissions("business:applychange:uploadPidan")
    public ApiResponse uploadPidan(@RequestBody ApplyChange applyChange) {
        return ApiResponse.success(applyChangeService.uploadPidan(applyChange));
        Integer applyId = applyChangeService.uploadPidan(applyChange);
        insuranceApplyService.updateApplyCurrentFee(applyId,null);
        return ApiResponse.success(null);
    }
    @PreventRepeat
    @ApiOperation("平台修改批单")
@@ -114,6 +120,14 @@
        return ApiResponse.success(applyChangeService.findPageForCompany(pageWrap));
    }

    @ApiOperation("列表查询")
    @PostMapping("/list")
    @RequiresPermissions("business:applychange:query")
    public ApiResponse<List<ApplyChange>> list (@RequestBody ApplyChange applyChange) {
        return ApiResponse.success(applyChangeService.findListForCompany(applyChange));
    }


    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:applychange:exportExcel")
@@ -149,4 +163,15 @@
    public ApiResponse check(@RequestBody ApplyChange model) {
        return ApiResponse.success(applyChangeService.check(model));
    }



    @ApiOperation(value = "业务处理",notes = "退回申请，关闭等")
    @PostMapping("/applyChangeOpt")
    public ApiResponse applyChangeOpt (@RequestBody ApplyChangeOptDTO applyChangeOptDTO) {
        applyChangeService.changeOpt(applyChangeOptDTO);
        return ApiResponse.success("操作成功");
    }


}