liusheng
2024-04-22 63ebc0007e9958bd6680c6841a7460b053275790
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
@@ -9,6 +9,8 @@
import com.ruoyi.common.enums.OrganEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
@@ -78,7 +80,7 @@
     * 查询捐献见证列表
     */
    @ApiOperation("获取捐献见证列表")
    //@PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
    //// @PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonationwitness serviceDonationwitness) {
        startPage();
@@ -99,7 +101,7 @@
     * 导出捐献见证列表
     */
    @ApiOperation("导出捐献见证列表")
    //@PreAuthorize("@ss.hasPermi('project:donationwitness:export')")
    //// @PreAuthorize("@ss.hasPermi('project:donationwitness:export')")
    @Log(title = "捐献见证", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonationwitness serviceDonationwitness) {
@@ -112,7 +114,7 @@
     * 获取捐献见证详细信息
     */
    @ApiOperation("通过id获取见证信息")
    //@PreAuthorize("@ss.hasPermi('project:donationwitness:query')")
    //// @PreAuthorize("@ss.hasPermi('project:donationwitness:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceDonationwitnessService.getById(id));
@@ -122,12 +124,22 @@
     * 新增捐献见证
     */
    @ApiOperation("新增捐献见证")
    //@PreAuthorize("@ss.hasPermi('project:donationwitness:add')")
    //// @PreAuthorize("@ss.hasPermi('project:donationwitness:add')")
    @Log(title = "捐献见证", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonationwitness serviceDonationwitness) {
        boolean save = serviceDonationwitnessService.save(serviceDonationwitness);
        log.info("新增捐献见证是否成功:{},id为:{},infoId为:{}", save, serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());
//        if (save) {
//            //生成“捐献者编号”
//            ServiceDonatebaseinfo serviceDonatebaseinfo = serviceDonatebaseinfoService.getById(serviceDonationwitness.getInfoid());
//            log.info("serviceDonatebaseinfo的信息为{}", serviceDonatebaseinfo);
//            String donorno = serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo);
//            log.info("生成的捐献者编号为:{}", donorno);
//            serviceDonatebaseinfo.setDonorno(donorno);
//            serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo);
//        }
        return AjaxResult.success(serviceDonationwitness);
    }
@@ -135,11 +147,13 @@
     * 修改捐献见证
     */
    @ApiOperation("修改捐献见证")
    //@PreAuthorize("@ss.hasPermi('project:donationwitness:edit')")
    //// @PreAuthorize("@ss.hasPermi('project:donationwitness:edit')")
    @Log(title = "捐献见证", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonationwitness serviceDonationwitness) {
        log.info("新增捐献见证id为:{},infoId为:{}", serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());
        int last = -1;
        if (StringUtils.isNotEmpty(serviceDonationwitness.getDonorno())) {
            last = serviceDonationwitness.getDonorno().lastIndexOf("*");
@@ -156,7 +170,7 @@
     * 删除捐献见证
     */
    @ApiOperation("删除捐献见证")
    //@PreAuthorize("@ss.hasPermi('project:donationwitness:remove')")
    //// @PreAuthorize("@ss.hasPermi('project:donationwitness:remove')")
    @Log(title = "捐献见证", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {