代码提交

liusheng

2024-04-22 5721a59583648d4660dfb186037b770707fb3d3c

代码提交

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

@@ -38,7 +38,7 @@
     * 查询捐献器官移植列表
     */
    @ApiOperation("查询捐献器官移植列表")
   // // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:list')")
    // // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonatecomporgan serviceDonatecomporgan) {
        startPage();
@@ -50,7 +50,7 @@
     * 导出捐献器官移植列表
     */
    @ApiOperation("导出捐献器官移植列表")
   // // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:export')")
    // // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:export')")
    @Log(title = "捐献器官移植", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonatecomporgan serviceDonatecomporgan) {
@@ -63,7 +63,7 @@
     * 获取捐献器官移植详细信息
     */
    @ApiOperation("获取捐献器官移植详细信息")
   // // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:query')")
    // // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceDonatecomporganService.getById(id));
@@ -73,7 +73,7 @@
     * 新增捐献器官移植
     */
    @ApiOperation("新增捐献器官移植")
   // // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:add')")
    // // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:add')")
    @Log(title = "捐献器官移植", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @RepeatSubmit
@@ -86,7 +86,7 @@
     * 修改捐献器官移植
     */
    @ApiOperation("修改捐献器官移植")
   // // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:edit')")
    // // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:edit')")
    @Log(title = "捐献器官移植", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit
@@ -98,17 +98,14 @@
     * 删除捐献器官移植
     */
    @ApiOperation("删除捐献器官移植")
   // // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:remove')")
    // // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:remove')")
    @Log(title = "捐献器官移植", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceDonatecomporganService.removeByIds(Arrays.asList(ids)));
    }


    @RepeatSubmit
    @ApiOperation("新增或修改捐献器官移植")
    @Log(title = "捐献完成", businessType = BusinessType.UPDATE)
    @PostMapping("/saveOrUpdateDonatecomporgan")
    public AjaxResult saveOrUpdateDonatecomporgan(@RequestBody List<ServiceDonatecomporgan> serviceDonatecomporganList) {
        if (CollectionUtils.isEmpty(serviceDonatecomporganList)) {
@@ -117,9 +114,15 @@
        Boolean i = null;
        for (ServiceDonatecomporgan serviceDonatecompletion : serviceDonatecomporganList) {
            log.info("捐献器官移植id是否为空 : {},基础表的id为 : {}", serviceDonatecompletion.getId(), serviceDonatecompletion.getInfoid());
            if (serviceDonatecompletion.getId() == null) {
            ServiceDonatecomporgan sd = new ServiceDonatecomporgan();
            sd.setInfoid(serviceDonatecompletion.getInfoid());
            sd.setOrganno(serviceDonatecompletion.getOrganno());
            sd.setDel_flag(0);
            List<ServiceDonatecomporgan> serviceDonatecomporgans = serviceDonatecomporganService.queryList(sd);
            if (serviceDonatecompletion.getId() == null && CollectionUtils.isEmpty(serviceDonatecomporgans)) {
                i = serviceDonatecomporganService.save(serviceDonatecompletion);
            } else {
                serviceDonatecompletion.setId(serviceDonatecomporgans.get(0).getId());
                i = serviceDonatecomporganService.updateById(serviceDonatecompletion);
            }
        }

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

@@ -122,6 +122,7 @@
            ServiceDonationwitnessorgan serviceDonationwitnessorgan2 = new ServiceDonationwitnessorgan();
            serviceDonationwitnessorgan2.setInfoid(serviceDonationwitnessorgan.getInfoid());
            serviceDonationwitnessorgan2.setOrganno(serviceDonationwitnessorgan.getOrganno());
            serviceDonationwitnessorgan2.setDel_flag(0);
            List<ServiceDonationwitnessorgan> serviceDonationwitnessorgans = serviceDonationwitnessorganService.queryList(serviceDonationwitnessorgan2);
            log.info("serviceDonationwitnessorgans的数量为 : {},infoid为：{}，Organno为：{}", serviceDonationwitnessorgans.size(), serviceDonationwitnessorgan.getInfoid(), serviceDonationwitnessorgan.getOrganno());
            if (!CollectionUtils.isEmpty(serviceDonationwitnessorgans)) {