liusheng
2023-09-09 f0f6c3b39dddf5cfdf145425687e9339453b5ba1
将put \ delete改成post \ get
已修改53个文件
408 ■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseItemexpenseController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributedetailController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributesummaryController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexrequirementController.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateconsolationfundController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateflowchartController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatefollowupController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExpertexpenseController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailSharedController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundflowController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundflowruleController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailSharedController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeSharedController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTravelexpensestandardController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysClassController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysGradeController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysStudentController.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/reportInfo.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceExternalpersonServiceImpl.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
@@ -50,7 +50,7 @@
    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
    @Log(title = "登录日志", businessType = BusinessType.DELETE)
    @DeleteMapping("/{infoIds}")
    @GetMapping("/remove/{infoIds}")
    public AjaxResult remove(@PathVariable Long[] infoIds)
    {
        return toAjax(logininforService.deleteLogininforByIds(infoIds));
@@ -58,7 +58,7 @@
    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
    @Log(title = "登录日志", businessType = BusinessType.CLEAN)
    @DeleteMapping("/clean")
    @GetMapping("/clean")
    public AjaxResult clean()
    {
        logininforService.cleanLogininfor();
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
@@ -50,7 +50,7 @@
    @Log(title = "操作日志", businessType = BusinessType.DELETE)
    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
    @DeleteMapping("/{operIds}")
    @GetMapping("/remove/{operIds}")
    public AjaxResult remove(@PathVariable Long[] operIds)
    {
        return toAjax(operLogService.deleteOperLogByIds(operIds));
@@ -58,7 +58,7 @@
    @Log(title = "操作日志", businessType = BusinessType.CLEAN)
    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
    @DeleteMapping("/clean")
    @GetMapping("/clean")
    public AjaxResult clean()
    {
        operLogService.cleanOperLog();
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
@@ -83,7 +83,7 @@
     */
    @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
    @Log(title = "在线用户", businessType = BusinessType.FORCE)
    @DeleteMapping("/{tokenId}")
    @GetMapping("/forceLogout/{tokenId}")
    public AjaxResult forceLogout(@PathVariable String tokenId)
    {
        redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java
@@ -90,7 +90,7 @@
     */
    @ApiOperation("修改专家费用")
    @Log(title = "专家费用", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody BaseExpertfeetype baseExpertfeetype)
    {
@@ -102,7 +102,7 @@
     */
    @ApiOperation("删除专家费用")
    @Log(title = "专家费用", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @DeleteMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(baseExpertfeetypeService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java
@@ -89,7 +89,7 @@
    @ApiOperation("修改收入费用科目")
    //@PreAuthorize("@ss.hasPermi('project:financesubject:edit')")
    @Log(title = "收入费用科目", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody BaseFinancesubject baseFinancesubject)
    {
@@ -102,7 +102,7 @@
    @ApiOperation("删除收入费用科目")
    //@PreAuthorize("@ss.hasPermi('project:financesubject:remove')")
    @Log(title = "收入费用科目", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(baseFinancesubjectService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseItemexpenseController.java
@@ -90,7 +90,7 @@
     */
    @ApiOperation("修改收入费用科目")
    @Log(title = "收入费用科目", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody BaseItemexpense baseItemexpense)
    {
@@ -102,7 +102,7 @@
     */
    @ApiOperation("删除收入费用科目")
    @Log(title = "收入费用科目", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(baseItemexpenseService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
@@ -89,7 +89,7 @@
    @ApiOperation("修改机构信息")
    //@PreAuthorize("@ss.hasPermi('project:organization:edit')")
    @Log(title = "机构管理", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody BaseOrganization baseOrganization)
    {
@@ -102,7 +102,7 @@
    @ApiOperation("删除机构信息")
    //@PreAuthorize("@ss.hasPermi('project:organization:remove')")
    @Log(title = "机构管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(baseOrganizationService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributedetailController.java
@@ -90,7 +90,7 @@
     */
    @ApiOperation("修改专家费用分发汇总明细")
    @Log(title = "专家费用分发汇总明细", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceDistributedetail serviceDistributedetail)
    {
@@ -102,7 +102,7 @@
     */
    @ApiOperation("删除专家费用分发汇总明细")
    @Log(title = "专家费用分发汇总明细", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceDistributedetailService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributesummaryController.java
@@ -90,7 +90,7 @@
     */
    @ApiOperation("修改专家费用分发汇总主")
    @Log(title = "专家费用分发汇总主", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceDistributesummary serviceDistributesummary)
    {
@@ -102,7 +102,7 @@
     */
    @ApiOperation("删除专家费用分发汇总主")
    @Log(title = "专家费用分发汇总主", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceDistributesummaryService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java
@@ -91,7 +91,7 @@
     */
    @ApiOperation("修改捐献附件")
    @Log(title = "捐献附件", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceDocumentfiles serviceDocumentfiles)
    {
@@ -103,7 +103,7 @@
     */
    @ApiOperation("删除捐献附件")
    @Log(title = "捐献附件", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceDocumentfilesService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java
@@ -106,7 +106,7 @@
    @ApiOperation("修改捐献附件信息")
    //@PreAuthorize("@ss.hasPermi('project:donateannex:edit')")
    @Log(title = "捐献附件", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceDonateannex serviceDonateannex)
    {
@@ -119,7 +119,7 @@
    @ApiOperation("删除捐献文件信息")
    //@PreAuthorize("@ss.hasPermi('project:donateannex:remove')")
    @Log(title = "捐献附件", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceDonateannexService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexrequirementController.java
@@ -27,15 +27,14 @@
/**
 * 捐献附件要求Controller
 *
 *
 * @author ruoyi
 * @date 2021-11-10
 */
@Api("捐献要求附件管理")
@RestController
@RequestMapping("/project/donateannexrequirement")
public class ServiceDonateannexrequirementController extends BaseController
{
public class ServiceDonateannexrequirementController extends BaseController {
    @Autowired
    private IServiceDonateannexrequirementService serviceDonateannexrequirementService;
@@ -45,8 +44,7 @@
    @ApiOperation("捐献要求附件管理列表")
    //@PreAuthorize("@ss.hasPermi('project:donateannexrequirement:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonateannexrequirement serviceDonateannexrequirement)
    {
    public TableDataInfo list(ServiceDonateannexrequirement serviceDonateannexrequirement) {
        startPage();
        List<ServiceDonateannexrequirement> list = serviceDonateannexrequirementService.queryList(serviceDonateannexrequirement);
        return getDataTable(list);
@@ -59,8 +57,7 @@
    //@PreAuthorize("@ss.hasPermi('project:donateannexrequirement:export')")
    @Log(title = "捐献附件要求", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonateannexrequirement serviceDonateannexrequirement)
    {
    public AjaxResult export(ServiceDonateannexrequirement serviceDonateannexrequirement) {
        List<ServiceDonateannexrequirement> list = serviceDonateannexrequirementService.queryList(serviceDonateannexrequirement);
        ExcelUtil<ServiceDonateannexrequirement> util = new ExcelUtil<ServiceDonateannexrequirement>(ServiceDonateannexrequirement.class);
        return util.exportExcel(list, "捐献附件要求数据");
@@ -72,8 +69,7 @@
    @ApiOperation("通过id获取捐献要求附件")
    //@PreAuthorize("@ss.hasPermi('project:donateannexrequirement:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceDonateannexrequirementService.getById(id));
    }
@@ -85,8 +81,7 @@
    @Log(title = "捐献附件要求", businessType = BusinessType.INSERT)
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonateannexrequirement serviceDonateannexrequirement)
    {
    public AjaxResult add(@RequestBody ServiceDonateannexrequirement serviceDonateannexrequirement) {
        return toAjax(serviceDonateannexrequirementService.save(serviceDonateannexrequirement));
    }
@@ -96,10 +91,9 @@
    @ApiOperation("修改捐献要求附件信息")
    //@PreAuthorize("@ss.hasPermi('project:donateannexrequirement:edit')")
    @Log(title = "捐献附件要求", businessType = BusinessType.UPDATE)
    @PutMapping
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonateannexrequirement serviceDonateannexrequirement)
    {
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonateannexrequirement serviceDonateannexrequirement) {
        return toAjax(serviceDonateannexrequirementService.updateById(serviceDonateannexrequirement));
    }
@@ -109,9 +103,8 @@
    @ApiOperation("删除捐献要求附件信息")
    //@PreAuthorize("@ss.hasPermi('project:donateannexrequirement:remove')")
    @Log(title = "捐献附件要求", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceDonateannexrequirementService.removeByIds(Arrays.asList(ids)));
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
@@ -154,7 +154,7 @@
    @ApiOperation("修改潜在捐献信息")
    //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:edit')")
    @Log(title = "捐献基础", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
        return toAjax(serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo));
@@ -166,7 +166,7 @@
    @ApiOperation("删除潜在捐献信息")
    //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:remove')")
    @Log(title = "捐献基础", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceDonatebaseinfoService.removeByIds(Arrays.asList(ids)));
    }
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
@@ -121,7 +121,7 @@
    @ApiOperation("修改捐献完成")
    //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
    @Log(title = "捐献完成", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo)
    {
        return toAjax(serviceDonatecompletioninfoService.updateById(serviceDonatecompletioninfo));
@@ -133,7 +133,7 @@
    @ApiOperation("删除捐献完成")
    //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:remove')")
    @Log(title = "捐献完成", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceDonatecompletioninfoService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateconsolationfundController.java
@@ -90,7 +90,7 @@
     */
    @ApiOperation("修改资金申请主表")
    @Log(title = "资金申请主表", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceDonateconsolationfund serviceDonateconsolationfund)
    {
@@ -102,7 +102,7 @@
     */
    @ApiOperation("删除资金申请主表")
    @Log(title = "资金申请主表", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceDonateconsolationfundService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateflowchartController.java
@@ -97,7 +97,7 @@
    @ApiOperation("修改捐献流程")
    //@PreAuthorize("@ss.hasPermi('system:donateflowchart:edit')")
    @Log(title = "捐献流程", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceDonateflowchart serviceDonateflowchart)
    {
@@ -110,7 +110,7 @@
    @ApiOperation("删除捐献流程")
    //@PreAuthorize("@ss.hasPermi('system:donateflowchart:remove')")
    @Log(title = "捐献流程", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceDonateflowchartService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatefollowupController.java
@@ -108,7 +108,7 @@
    @ApiOperation("修改捐献随访")
    //@PreAuthorize("@ss.hasPermi('project:donatefollowup:edit')")
    @Log(title = "捐献随访", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceDonatefollowup serviceDonatefollowup)
    {
@@ -122,7 +122,7 @@
    @ApiOperation("删除捐献随访")
    //@PreAuthorize("@ss.hasPermi('project:donatefollowup:remove')")
    @Log(title = "捐献随访", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceDonatefollowupService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
@@ -34,18 +34,16 @@
/**
 * 捐献器官管理Controller
 *
 *
 * @author ruoyi
 * @date 2021-11-10
 */
@Api("捐献器官管理")
@RestController
@RequestMapping("/project/donateorgan")
public class ServiceDonateorganController extends BaseController
{
public class ServiceDonateorganController extends BaseController {
    @Autowired
    private IServiceDonateorganService serviceDonateorganService;
    /**
@@ -54,16 +52,14 @@
    @ApiOperation("捐献器官列表")
    //@PreAuthorize("@ss.hasPermi('project:donateorgan:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonateorgan serviceDonateorgan)
    {
    public TableDataInfo list(ServiceDonateorgan serviceDonateorgan) {
        startPage();
        List<ServiceDonateorgan> list = serviceDonateorganService.queryList(serviceDonateorgan);
        return getDataTable(list);
    }
    @GetMapping("/listnew")
    public TableDataInfo listnew (DonateOrganVO donateOrganVO)
    {
    public TableDataInfo listnew(DonateOrganVO donateOrganVO) {
        startPage();
        List<DonateOrganVO> list = serviceDonateorganService.selectVOList(donateOrganVO);
        return getDataTable(list);
@@ -77,8 +73,7 @@
    //@PreAuthorize("@ss.hasPermi('project:donateorgan:export')")
    @Log(title = "捐献器官管理", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonateorgan serviceDonateorgan)
    {
    public AjaxResult export(ServiceDonateorgan serviceDonateorgan) {
        List<ServiceDonateorgan> list = serviceDonateorganService.queryList(serviceDonateorgan);
        ExcelUtil<ServiceDonateorgan> util = new ExcelUtil<ServiceDonateorgan>(ServiceDonateorgan.class);
        return util.exportExcel(list, "捐献器官管理数据");
@@ -90,8 +85,7 @@
    @ApiOperation("通过id获得捐献器官信息")
    //@PreAuthorize("@ss.hasPermi('project:donateorgan:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceDonateorganService.getById(id));
    }
@@ -103,21 +97,16 @@
    @Log(title = "捐献器官管理", businessType = BusinessType.INSERT)
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonateorgan serviceDonateorgan)
    {
    public AjaxResult add(@RequestBody ServiceDonateorgan serviceDonateorgan) {
        String organNumber = serviceDonateorgan.getDonorno() + "." + serviceDonateorgan.getOrganno();
        if (organNumber == "")
        {
        if (organNumber == "") {
            return AjaxResult.error("新增时生成的编号为空,创建失败!");
        }
        else
        {
        } else {
            ServiceDonateorgan serviceDonateorgan1 = new ServiceDonateorgan();
            serviceDonateorgan1.setOrgannumber(organNumber);
            List<ServiceDonateorgan> listrecord = serviceDonateorganService.queryList(serviceDonateorgan);
            if (listrecord.size()>0)
            {
                return AjaxResult.error("新增时生成的编号"+ organNumber +"已存在,无法保存!");
            if (listrecord.size() > 0) {
                return AjaxResult.error("新增时生成的编号" + organNumber + "已存在,无法保存!");
            }
        }
        serviceDonateorgan.setOrgannumber(organNumber);
@@ -130,10 +119,9 @@
    @ApiOperation("修改捐献器官信息")
    //@PreAuthorize("@ss.hasPermi('project:donateorgan:edit')")
    @Log(title = "捐献器官管理", businessType = BusinessType.UPDATE)
    @PutMapping
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonateorgan serviceDonateorgan)
    {
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonateorgan serviceDonateorgan) {
        return toAjax(serviceDonateorganService.updateById(serviceDonateorgan));
    }
@@ -143,28 +131,27 @@
    @ApiOperation("删除捐献器官信息")
    //@PreAuthorize("@ss.hasPermi('project:donateorgan:remove')")
    @Log(title = "捐献器官管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceDonateorganService.removeByIds(Arrays.asList(ids)));
    }
    @ApiOperation("得到浙江各市下的捐献信息")
    @GetMapping("/numberOfOrgans")
    public AjaxResult numberOfOrgans(){
    public AjaxResult numberOfOrgans() {
        return AjaxResult.success(serviceDonateorganService.getNumberOfOrgans());
    }
    @ApiOperation("得到各医院的捐献信息")
    @PostMapping("/OrgansOfHospital")
    public AjaxResult OrgansOfHospital(String cityName){
    public AjaxResult OrgansOfHospital(String cityName) {
        return AjaxResult.success(serviceDonateorganService.getOrgansOfHospital(cityName));
    }
    @ApiOperation("全省捐献器官信息汇总")
    @GetMapping("/allOrgansInfo")
    public AjaxResult allOrgansInfo(TimeVO timeVO){
    public AjaxResult allOrgansInfo(TimeVO timeVO) {
        return AjaxResult.success(serviceDonateorganService.getAllOrgansInfo(timeVO));
    }
@@ -219,46 +206,45 @@
    @ApiOperation("按月度统计的各医院的捐献信息")
    @GetMapping("/OrgansOfHospitalByMonth")
    public AjaxResult OrgansOfHospitalByMonth(TimeVO timeVO){
    public AjaxResult OrgansOfHospitalByMonth(TimeVO timeVO) {
        return AjaxResult.success(serviceDonateorganService.OrgansOfHospitalByMonth(timeVO));
    }
    @ApiOperation("按时间统计的各医院的捐献信息")
    @GetMapping("/OrgansOfHospitalByTime")
    public AjaxResult OrgansOfHospitalByTime(TimeVO timeVO){
    public AjaxResult OrgansOfHospitalByTime(TimeVO timeVO) {
        return AjaxResult.success(serviceDonateorganService.OrgansOfHospitalByTime(timeVO));
    }
    @ApiOperation("每百万人口的捐献率")
    @GetMapping("/getPMPRate")
    public AjaxResult getPMPRate(TimeVO timeVO){
    public AjaxResult getPMPRate(TimeVO timeVO) {
        return AjaxResult.success(serviceDonateorganService.getPMPRate(timeVO));
    }
    @ApiOperation("根据地市返回捐献、完成、器官数")
    @GetMapping("/getDistrictDonateCalculate")
    public AjaxResult getDistrictDonateCalculate(){
    public AjaxResult getDistrictDonateCalculate() {
        return AjaxResult.success(serviceDonateorganService.getDistrictDonateCalculate());
    }
    @ApiOperation("根据时间地市返回捐献、完成、器官数")
    @GetMapping("/getDistrictDonateCalculateByTime")
    public AjaxResult getDistrictDonateCalculateByTime(TimeVO timeVO){
    public AjaxResult getDistrictDonateCalculateByTime(TimeVO timeVO) {
        return AjaxResult.success(serviceDonateorganService.getDistrictDonateCalculateByTime(timeVO));
    }
    @ApiOperation("根据机构返回器官总数")
    @GetMapping("/getOrganNumberByOrg")
    public AjaxResult getOrganNumberByOrg(TimeVO timeVO){
    public AjaxResult getOrganNumberByOrg(TimeVO timeVO) {
        return AjaxResult.success(serviceDonateorganService.getOrganNumberByOrg(timeVO));
    }
    @ApiOperation("返回器官总数")
    @GetMapping("/getOrganCount")
    public AjaxResult getOrganCount(TimeVO timeVO){
    public AjaxResult getOrganCount(TimeVO timeVO) {
        return AjaxResult.success(serviceDonateorganService.getOrganCount(timeVO));
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
@@ -133,7 +133,7 @@
    @ApiOperation("修改捐献见证")
    //@PreAuthorize("@ss.hasPermi('project:donationwitness:edit')")
    @Log(title = "捐献见证", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceDonationwitness serviceDonationwitness)
    {
@@ -146,7 +146,7 @@
    @ApiOperation("删除捐献见证")
    //@PreAuthorize("@ss.hasPermi('project:donationwitness:remove')")
    @Log(title = "捐献见证", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceDonationwitnessService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
@@ -98,7 +98,7 @@
     */
    //@PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:edit')")
    @Log(title = "伦理审查专家意见", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions)
    {
@@ -110,7 +110,7 @@
     */
    //@PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:remove')")
    @Log(title = "伦理审查专家意见", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceEthicalreviewopinionsService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExpertexpenseController.java
@@ -90,7 +90,7 @@
     */
    @ApiOperation("修改费用申请主")
    @Log(title = "费用申请主", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceExpertexpense serviceExpertexpense)
    {
@@ -102,7 +102,7 @@
     */
    @ApiOperation("删除费用申请主")
    @Log(title = "费用申请主", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceExpertexpenseService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java
@@ -87,7 +87,7 @@
     */
    //@PreAuthorize("@ss.hasPermi('project:externalperson:edit')")
    @Log(title = "外围单位人员", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/editZJInfo")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceExternalperson serviceExternalperson)
    {
@@ -99,7 +99,7 @@
     */
    //@PreAuthorize("@ss.hasPermi('project:externalperson:remove')")
    @Log(title = "外围单位人员", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceExternalpersonService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
@@ -95,7 +95,7 @@
    @ApiOperation("修改费用申请明细")
    //@PreAuthorize("@ss.hasPermi('project:funddetail:edit')")
    @Log(title = "费用申请明细", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceFunddetail serviceFunddetail) {
        return toAjax(serviceFunddetailService.updateById(serviceFunddetail));
@@ -107,7 +107,7 @@
    @ApiOperation("删除费用申请明细")
    //@PreAuthorize("@ss.hasPermi('project:funddetail:remove')")
    @Log(title = "费用申请明细", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceFunddetailService.removeByIds(Arrays.asList(ids)));
    }
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailSharedController.java
@@ -95,7 +95,7 @@
    @ApiOperation("修改费用申请明细")
    @PreAuthorize("@ss.hasPermi('project:funddetailshared:edit')")
    @Log(title = "费用申请明细", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceFunddetailShared serviceFunddetailShared)
    {
@@ -108,7 +108,7 @@
    @ApiOperation("删除费用申请明细")
    @PreAuthorize("@ss.hasPermi('project:funddetailshared:remove')")
    @Log(title = "费用申请明细", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceFunddetailSharedService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundflowController.java
@@ -90,7 +90,7 @@
     */
    @ApiOperation("修改资金审批流程")
    @Log(title = "资金审批流程", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceFundflow serviceFundflow)
    {
@@ -102,7 +102,7 @@
     */
    @ApiOperation("删除资金审批流程")
    @Log(title = "资金审批流程", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceFundflowService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundflowruleController.java
@@ -90,7 +90,7 @@
     */
    @ApiOperation("修改资金审批规则")
    @Log(title = "资金审批规则", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceFundflowrule serviceFundflowrule)
    {
@@ -102,7 +102,7 @@
     */
    @ApiOperation("删除资金审批规则")
    @Log(title = "资金审批规则", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceFundflowruleService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
@@ -105,7 +105,7 @@
    @ApiOperation("修改医学评估")
    //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:edit')")
    @Log(title = "医学评估", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceMedicalevaluation serviceMedicalevaluation)
    {
@@ -118,7 +118,7 @@
    @ApiOperation("删除医学评估")
    //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:remove')")
    @Log(title = "医学评估", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceMedicalevaluationService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java
@@ -90,7 +90,7 @@
    @ApiOperation("修改器官分配信息")
    //@PreAuthorize("@ss.hasPermi('project:organallocation:edit')")
    @Log(title = "器官分配", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceOrganallocation serviceOrganallocation)
    {
@@ -103,7 +103,7 @@
    @ApiOperation("删除器官分配信息")
    //@PreAuthorize("@ss.hasPermi('project:organallocation:remove')")
    @Log(title = "器官分配", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceOrganallocationService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
@@ -75,7 +75,7 @@
    }
    @DeleteMapping("/deleteByRBId/{rbid}")
    @GetMapping("/deleteByRBId/{rbid}")
    public AjaxResult removeAllDetail(@PathVariable("rbid") Long rbid) {
        List<Long> ids = serviceReimbursementdetailService.getAllIds(rbid);
        Long[] arr = (Long[]) ids.toArray(new Long[ids.size()]);
@@ -147,7 +147,7 @@
    @ApiOperation("删除报销申请明细")
    //@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:remove')")
    @Log(title = "报销申请明细", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceReimbursementdetailService.removeByIds(Arrays.asList(ids)));
    }
@@ -158,7 +158,7 @@
     */
    @ApiOperation("删除报销申请明细并修改金额")
    @Log(title = "报销申请明细", businessType = BusinessType.DELETE)
    @DeleteMapping("/deleteDetail/{id}")
    @GetMapping("/deleteDetail/{id}")
    public AjaxResult deleteDetail(@PathVariable Long id) {
        return AjaxResult.success(serviceReimbursementdetailService.deleteDetail(id));
    }
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailSharedController.java
@@ -95,7 +95,7 @@
    @ApiOperation("修改报销申请明细")
    @PreAuthorize("@ss.hasPermi('project:reimbursementdetailshared:edit')")
    @Log(title = "报销申请明细", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceReimbursementdetailShared serviceReimbursementdetailShared)
    {
@@ -108,7 +108,7 @@
    @ApiOperation("删除报销申请明细")
    @PreAuthorize("@ss.hasPermi('project:reimbursementdetailshared:remove')")
    @Log(title = "报销申请明细", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceReimbursementdetailSharedService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
@@ -101,7 +101,7 @@
    @ApiOperation("删除差旅报销付款信息")
    //@PreAuthorize("@ss.hasPermi('project:reimbursementpayee:remove')")
    @Log(title = "差旅报销付款信息", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable String[] ids)
    {
        return toAjax(serviceReimbursementpayeeService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeSharedController.java
@@ -95,7 +95,7 @@
    @ApiOperation("修改差旅报销付款信息")
    @PreAuthorize("@ss.hasPermi('project:reimbursementpayeeshared:edit')")
    @Log(title = "差旅报销付款信息", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceReimbursementpayeeShared serviceReimbursementpayeeShared)
    {
@@ -108,7 +108,7 @@
    @ApiOperation("删除差旅报销付款信息")
    @PreAuthorize("@ss.hasPermi('project:reimbursementpayeeshared:remove')")
    @Log(title = "差旅报销付款信息", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceReimbursementpayeeSharedService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
@@ -132,7 +132,7 @@
    @ApiOperation("修改亲属确认")
    //@PreAuthorize("@ss.hasPermi('project:relativesconfirmation:edit')")
    @Log(title = "捐献亲属确认", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceRelativesconfirmation serviceRelativesconfirmation)
    {
@@ -145,7 +145,7 @@
    @ApiOperation("删除亲属确认")
    //@PreAuthorize("@ss.hasPermi('project:relativesconfirmation:remove')")
    @Log(title = "捐献亲属确认", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceRelativesconfirmationService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java
@@ -108,7 +108,7 @@
     */
    @ApiOperation("修改系统消息")
    @Log(title = "系统消息", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceSystemmessage serviceSystemmessage) {
        return toAjax(serviceSystemmessageService.updateById(serviceSystemmessage));
@@ -120,7 +120,7 @@
    @ApiOperation("删除系统消息")
    @PreAuthorize("@ss.hasPermi('project:systemmessage:remove')")
    @Log(title = "系统消息", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceSystemmessageService.removeByIds(Arrays.asList(ids)));
    }
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTravelexpensestandardController.java
@@ -93,7 +93,7 @@
     */
    @ApiOperation("修改住宿费限额标准")
    @Log(title = "住宿费限额标准", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceTravelexpensestandard serviceTravelexpensestandard)
    {
@@ -105,7 +105,7 @@
     */
    @ApiOperation("删除住宿费限额标准")
    @Log(title = "住宿费限额标准", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceTravelexpensestandardService.removeByIds(Arrays.asList(ids)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysClassController.java
@@ -87,7 +87,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:class:edit')")
    @Log(title = "班级信息", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody SysClass sysClass)
    {
@@ -99,7 +99,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:class:remove')")
    @Log(title = "班级信息", businessType = BusinessType.DELETE)
    @DeleteMapping("/{classIds}")
    @GetMapping("/remove/{classIds}")
    public AjaxResult remove(@PathVariable Long[] classIds)
    {
        return toAjax(sysClassService.removeByIds(Arrays.asList(classIds)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
@@ -98,7 +98,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:config:edit')")
    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    public AjaxResult edit(@Validated @RequestBody SysConfig config)
    {
        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
@@ -114,7 +114,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:config:remove')")
    @Log(title = "参数管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{configIds}")
    @GetMapping("/remove/{configIds}")
    public AjaxResult remove(@PathVariable Long[] configIds)
    {
        configService.deleteConfigByIds(configIds);
@@ -126,7 +126,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:config:remove')")
    @Log(title = "参数管理", businessType = BusinessType.CLEAN)
    @DeleteMapping("/refreshCache")
    @GetMapping("/refreshCache")
    public AjaxResult refreshCache()
    {
        configService.resetConfigCache();
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
@@ -122,7 +122,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    public AjaxResult edit(@Validated @RequestBody SysDept dept)
    {
        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
@@ -147,7 +147,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
    @Log(title = "部门管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{deptId}")
    @GetMapping("/remove/{deptId}")
    public AjaxResult remove(@PathVariable Long deptId)
    {
        if (deptService.hasChildByDeptId(deptId))
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@@ -103,7 +103,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
    @Log(title = "字典数据", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    public AjaxResult edit(@Validated @RequestBody SysDictData dict)
    {
        dict.setUpdateBy(getUsername());
@@ -115,7 +115,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
    @Log(title = "字典类型", businessType = BusinessType.DELETE)
    @DeleteMapping("/{dictCodes}")
    @GetMapping("/remove/{dictCodes}")
    public AjaxResult remove(@PathVariable Long[] dictCodes)
    {
        dictDataService.deleteDictDataByIds(dictCodes);
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
@@ -84,7 +84,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
    @Log(title = "字典类型", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    public AjaxResult edit(@Validated @RequestBody SysDictType dict)
    {
        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
@@ -100,7 +100,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
    @Log(title = "字典类型", businessType = BusinessType.DELETE)
    @DeleteMapping("/{dictIds}")
    @GetMapping("/remove/{dictIds}")
    public AjaxResult remove(@PathVariable Long[] dictIds)
    {
        dictTypeService.deleteDictTypeByIds(dictIds);
@@ -112,7 +112,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
    @Log(title = "字典类型", businessType = BusinessType.CLEAN)
    @DeleteMapping("/refreshCache")
    @GetMapping("/refreshCache")
    public AjaxResult refreshCache()
    {
        dictTypeService.resetDictCache();
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysGradeController.java
@@ -88,7 +88,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:grade:edit')")
    @Log(title = "年级信息", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody SysGrade sysGrade)
    {
@@ -100,7 +100,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:grade:remove')")
    @Log(title = "年级信息", businessType = BusinessType.DELETE)
    @DeleteMapping("/{gradeIds}")
    @GetMapping("/remove/{gradeIds}")
    public AjaxResult remove(@PathVariable Long[] gradeIds)
    {
        return toAjax(sysGradeService.removeByIds(Arrays.asList(gradeIds)));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@@ -106,7 +106,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
    @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    public AjaxResult edit(@Validated @RequestBody SysMenu menu)
    {
        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
@@ -130,7 +130,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
    @Log(title = "菜单管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{menuId}")
    @GetMapping("/remove/{menuId}")
    public AjaxResult remove(@PathVariable("menuId") Long menuId)
    {
        if (menuService.hasChildByMenuId(menuId))
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
@@ -71,7 +71,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
    @Log(title = "通知公告", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    public AjaxResult edit(@Validated @RequestBody SysNotice notice)
    {
        notice.setUpdateBy(getUsername());
@@ -83,7 +83,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:notice:remove')")
    @Log(title = "通知公告", businessType = BusinessType.DELETE)
    @DeleteMapping("/{noticeIds}")
    @GetMapping("/remove/{noticeIds}")
    public AjaxResult remove(@PathVariable Long[] noticeIds)
    {
        return toAjax(noticeService.deleteNoticeByIds(noticeIds));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
@@ -91,7 +91,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:post:edit')")
    @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    public AjaxResult edit(@Validated @RequestBody SysPost post)
    {
        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
@@ -111,7 +111,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:post:remove')")
    @Log(title = "岗位管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{postIds}")
    @GetMapping("/remove/{postIds}")
    public AjaxResult remove(@PathVariable Long[] postIds)
    {
        return toAjax(postService.deletePostByIds(postIds));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
@@ -62,7 +62,7 @@
     * 修改用户
     */
    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/updateProfile")
    public AjaxResult updateProfile(@RequestBody SysUser user)
    {
        if (StringUtils.isNotEmpty(user.getPhonenumber())
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -106,7 +106,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:role:edit')")
    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    public AjaxResult edit(@Validated @RequestBody SysRole role)
    {
        roleService.checkRoleAllowed(role);
@@ -140,7 +140,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:role:edit')")
    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
    @PutMapping("/dataScope")
    @PostMapping("/dataScope")
    public AjaxResult dataScope(@RequestBody SysRole role)
    {
        roleService.checkRoleAllowed(role);
@@ -152,7 +152,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:role:edit')")
    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
    @PutMapping("/changeStatus")
    @PostMapping("/changeStatus")
    public AjaxResult changeStatus(@RequestBody SysRole role)
    {
        roleService.checkRoleAllowed(role);
@@ -165,7 +165,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:role:remove')")
    @Log(title = "角色管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{roleIds}")
    @GetMapping("/remove/{roleIds}")
    public AjaxResult remove(@PathVariable Long[] roleIds)
    {
        return toAjax(roleService.deleteRoleByIds(roleIds));
@@ -210,7 +210,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:role:edit')")
    @Log(title = "角色管理", businessType = BusinessType.GRANT)
    @PutMapping("/authUser/cancel")
    @PostMapping("/authUser/cancel/cancelAuthUser")
    public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
    {
        return toAjax(roleService.deleteAuthUser(userRole));
@@ -221,7 +221,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:role:edit')")
    @Log(title = "角色管理", businessType = BusinessType.GRANT)
    @PutMapping("/authUser/cancelAll")
    @PostMapping("/authUser/cancelAll/cancelAuthUserAll")
    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
    {
        return toAjax(roleService.deleteAuthUsers(roleId, userIds));
@@ -232,7 +232,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:role:edit')")
    @Log(title = "角色管理", businessType = BusinessType.GRANT)
    @PutMapping("/authUser/selectAll")
    @PostMapping("/authUser/selectAll/selectAuthUserAll")
    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
    {
        return toAjax(roleService.insertAuthUsers(roleId, userIds));
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysStudentController.java
@@ -1,29 +1,22 @@
package com.ruoyi.system.controller;
import java.util.*;
import java.util.stream.Collectors;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.SysStudentMapper;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.SysStudent;
import com.ruoyi.system.service.ISysStudentService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysStudent;
import com.ruoyi.system.mapper.SysStudentMapper;
import com.ruoyi.system.service.ISysStudentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.stream.Collectors;
/**
 * 学生信息Controller
@@ -143,7 +136,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:student:edit')")
    @Log(title = "学生信息", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody SysStudent sysStudent) {
        return toAjax(sysStudentService.updateById(sysStudent));
@@ -154,7 +147,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:student:remove')")
    @Log(title = "学生信息", businessType = BusinessType.DELETE)
    @DeleteMapping("/{studentIds}")
    @GetMapping("/remove/{studentIds}")
    public AjaxResult remove(@PathVariable Long[] studentIds) {
        return toAjax(sysStudentService.removeByIds(Arrays.asList(studentIds)));
    }
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -168,7 +168,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:user:edit')")
    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    public AjaxResult edit(@Validated @RequestBody SysUser user)
    {
        userService.checkUserAllowed(user);
@@ -191,7 +191,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:user:remove')")
    @Log(title = "用户管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{userIds}")
    @GetMapping("/remove/{userIds}")
    public AjaxResult remove(@PathVariable Long[] userIds)
    {
        if (ArrayUtils.contains(userIds, getUserId()))
@@ -206,7 +206,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
    @PutMapping("/resetPwd")
    @PostMapping("/resetPwd")
    public AjaxResult resetPwd(@RequestBody SysUser user)
    {
        userService.checkUserAllowed(user);
@@ -225,7 +225,7 @@
     */
    @PreAuthorize("@ss.hasPermi('system:user:edit')")
    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
    @PutMapping("/changeStatus")
    @PostMapping("/changeStatus")
    public AjaxResult changeStatus(@RequestBody SysUser user)
    {
        userService.checkUserAllowed(user);
@@ -253,10 +253,10 @@
     */
    @PreAuthorize("@ss.hasPermi('system:user:edit')")
    @Log(title = "用户管理", businessType = BusinessType.GRANT)
    @PutMapping("/authRole")
    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
    @PostMapping("/authRole/insertAuthRole")
    public AjaxResult insertAuthRole(@RequestBody SysUser user)
    {
        userService.insertUserAuth(userId, roleIds);
        userService.insertUserAuth(user.getUserId(), user.getRoleIds());
        return success();
    }
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
@@ -118,7 +118,7 @@
     */
    @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
    @Log(title = "代码生成", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/editSave")
    public AjaxResult editSave(@Validated @RequestBody GenTable genTable)
    {
        genTableService.validateEdit(genTable);
@@ -131,7 +131,7 @@
     */
    @PreAuthorize("@ss.hasPermi('tool:gen:remove')")
    @Log(title = "代码生成", businessType = BusinessType.DELETE)
    @DeleteMapping("/{tableIds}")
    @GetMapping("/remove/{tableIds}")
    public AjaxResult remove(@PathVariable Long[] tableIds)
    {
        genTableService.deleteGenTableByIds(tableIds);
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/reportInfo.java
@@ -1,19 +1,36 @@
package com.ruoyi.project.domain.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("专家信息")
public class reportInfo {
    @ApiModelProperty("主键")
    private Long id;
    @ApiModelProperty("人员编号")
    private String reportNo;
    @ApiModelProperty("身份证")
    private String idcrad;
    @ApiModelProperty("身份证")
    private String title;
    @ApiModelProperty("人员姓名")
    private String reportName;
    @ApiModelProperty("开户银行")
    private String depositbank;
    @ApiModelProperty("分行名称")
    private String branchbankname;
    @ApiModelProperty("银行卡号")
    private String bankcardno;
    @ApiModelProperty("公司")
    private String unitname;
}
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceExternalpersonServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.vo.OrgansOfHospital;
@@ -10,8 +11,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.ArrayList;
import java.util.Map;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.mapper.ServiceExternalpersonMapper;
import com.ruoyi.project.domain.ServiceExternalperson;
@@ -19,13 +22,12 @@
/**
 * 外围单位人员Service业务层处理
 *
 *
 * @author ruoyi
 * @date 2021-11-24
 */
@Service
public class ServiceExternalpersonServiceImpl extends ServiceImpl<ServiceExternalpersonMapper, ServiceExternalperson> implements IServiceExternalpersonService
{
public class ServiceExternalpersonServiceImpl extends ServiceImpl<ServiceExternalpersonMapper, ServiceExternalperson> implements IServiceExternalpersonService {
    @Autowired
@@ -33,21 +35,21 @@
    /**
     * 查询外围单位人员列表
     *
     *
     * @param serviceExternalperson 外围单位人员
     * @return 外围单位人员
     */
    @Override
    public List<ServiceExternalperson> queryList(ServiceExternalperson serviceExternalperson) {
        LambdaQueryWrapper<ServiceExternalperson> wrappers = Wrappers.lambdaQuery();
        if (StringUtils.isNotBlank(serviceExternalperson.getUserno())){
            wrappers.eq(ServiceExternalperson::getUserno ,serviceExternalperson.getUserno());
        if (StringUtils.isNotBlank(serviceExternalperson.getUserno())) {
            wrappers.eq(ServiceExternalperson::getUserno, serviceExternalperson.getUserno());
        }
        if (StringUtils.isNotBlank(serviceExternalperson.getUsername())){
            wrappers.like(ServiceExternalperson::getUsername ,serviceExternalperson.getUsername());
        if (StringUtils.isNotBlank(serviceExternalperson.getUsername())) {
            wrappers.like(ServiceExternalperson::getUsername, serviceExternalperson.getUsername());
        }
        if (StringUtils.isNotBlank(serviceExternalperson.getUsertype())){
            wrappers.eq(ServiceExternalperson::getUsertype ,serviceExternalperson.getUsertype());
        if (StringUtils.isNotBlank(serviceExternalperson.getUsertype())) {
            wrappers.eq(ServiceExternalperson::getUsertype, serviceExternalperson.getUsertype());
        }
        return this.list(wrappers);
    }
@@ -57,7 +59,7 @@
        ArrayList<reportInfo> list = new ArrayList<reportInfo>();
        List<ServiceExternalperson> serviceExternalpeople = serviceExternalpersonMapper.getAllpeople(usertype);
        for(ServiceExternalperson s : serviceExternalpeople){
        for (ServiceExternalperson s : serviceExternalpeople) {
            reportInfo r = new reportInfo();
            r.setId(s.getId());
            r.setReportNo(s.getUserno());
@@ -65,6 +67,9 @@
            r.setBankcardno(s.getBankcardno());
            r.setDepositbank(s.getDepositbank());
            r.setBranchbankname(s.getBranchbankname());
            r.setUnitname(s.getUnitname());
            r.setIdcrad(s.getIdcardno());
            r.setTitle(s.getTitle());
            list.add(r);
        }
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
@@ -105,7 +105,7 @@
     */
    @PreAuthorize("@ss.hasPermi('monitor:job:edit')")
    @Log(title = "定时任务", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException
    {
        if (!CronUtils.isValid(job.getCronExpression()))
@@ -133,7 +133,7 @@
     */
    @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
    @Log(title = "定时任务", businessType = BusinessType.UPDATE)
    @PutMapping("/changeStatus")
    @PostMapping("/changeStatus")
    public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
    {
        SysJob newJob = jobService.selectJobById(job.getJobId());
@@ -146,7 +146,7 @@
     */
    @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
    @Log(title = "定时任务", businessType = BusinessType.UPDATE)
    @PutMapping("/run")
    @PostMapping("/run")
    public AjaxResult run(@RequestBody SysJob job) throws SchedulerException
    {
        jobService.run(job);
@@ -158,7 +158,7 @@
     */
    @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
    @Log(title = "定时任务", businessType = BusinessType.DELETE)
    @DeleteMapping("/{jobIds}")
    @GetMapping("/remove/{jobIds}")
    public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException
    {
        jobService.deleteJobByIds(jobIds);
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
@@ -1,13 +1,5 @@
package com.ruoyi.quartz.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -16,6 +8,14 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.quartz.domain.SysJobLog;
import com.ruoyi.quartz.service.ISysJobLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
 * 调度日志操作处理
@@ -70,7 +70,7 @@
     */
    @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
    @Log(title = "定时任务调度日志", businessType = BusinessType.DELETE)
    @DeleteMapping("/{jobLogIds}")
    @GetMapping("/remove/{jobLogIds}")
    public AjaxResult remove(@PathVariable Long[] jobLogIds)
    {
        return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
@@ -81,7 +81,7 @@
     */
    @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
    @Log(title = "调度日志", businessType = BusinessType.CLEAN)
    @DeleteMapping("/clean")
    @GetMapping("/clean")
    public AjaxResult clean()
    {
        jobLogService.cleanJobLog();