代码提交

liusheng

2024-04-24 a894bc6373154d5cfd28b7f46df3c4cfa01a7b9b

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

@@ -31,7 +31,7 @@
@Slf4j
@Api("捐献器官获取")
@RestController
@RequestMapping("/system/donationwitnessorgan")
@RequestMapping("/project/donationwitnessorgan")
public class ServiceDonationwitnessorganController extends BaseController {
    @Autowired
    private IServiceDonationwitnessorganService serviceDonationwitnessorganService;
@@ -40,7 +40,7 @@
     * 查询捐献器官获取列表
     */
    @ApiOperation("查询捐献器官获取列表")
    @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:list')")
//    // @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
        startPage();
@@ -52,7 +52,7 @@
     * 导出捐献器官获取列表
     */
    @ApiOperation("导出捐献器官获取列表")
    @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:export')")
//    // @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:export')")
    @Log(title = "捐献器官获取", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
@@ -65,8 +65,8 @@
     * 获取捐献器官获取详细信息
     */
    @ApiOperation("获取捐献器官获取详细信息")
    @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:query')")
    @GetMapping(value = "/{id}")
//    // @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceDonationwitnessorganService.getById(id));
    }
@@ -75,21 +75,22 @@
     * 新增捐献器官获取
     */
    @ApiOperation("新增捐献器官获取")
    @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:add')")
//    // @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:add')")
    @Log(title = "捐献器官获取", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
        return toAjax(serviceDonationwitnessorganService.save(serviceDonationwitnessorgan));
        boolean save = serviceDonationwitnessorganService.save(serviceDonationwitnessorgan);
        return AjaxResult.success(serviceDonationwitnessorgan);
    }

    /**
     * 修改捐献器官获取
     */
    @ApiOperation("修改捐献器官获取")
    @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:edit')")
//    // @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:edit')")
    @Log(title = "捐献器官获取", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
        return toAjax(serviceDonationwitnessorganService.updateById(serviceDonationwitnessorgan));
@@ -99,15 +100,14 @@
     * 删除捐献器官获取
     */
    @ApiOperation("删除捐献器官获取")
    @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:remove')")
//    // @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:remove')")
    @Log(title = "捐献器官获取", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceDonationwitnessorganService.removeByIds(Arrays.asList(ids)));
    }


    @RepeatSubmit
    @ApiOperation("新增或修改捐献器官获取")
    @Log(title = "捐献器官获取", businessType = BusinessType.UPDATE)
    @PostMapping("/saveOrUpdateDonationwitnessorgan")
@@ -118,6 +118,16 @@
        Boolean i = null;
        for (ServiceDonationwitnessorgan serviceDonationwitnessorgan : serviceDonationwitnessorganList) {
            log.info("捐献器官获取id是否为空 : {},基础表的id为 : {}", serviceDonationwitnessorgan.getId(), serviceDonationwitnessorgan.getInfoid());
            //根据infoid和器官编号，判断这个器官是否已经存进表中
            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)) {
                serviceDonationwitnessorgan.setId(serviceDonationwitnessorgans.get(0).getId());
            }
            if (serviceDonationwitnessorgan.getId() == null) {
                i = serviceDonationwitnessorganService.save(serviceDonationwitnessorgan);
            } else {