变更

liusheng

2024-07-22 9e99e7e192c62c2274f8f5362b354cbf55c3d80f

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

@@ -12,6 +12,7 @@
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.service.IBaseOnlyvalueService;
@@ -80,7 +81,7 @@
     * 查询捐献见证列表
     */
    @ApiOperation("获取捐献见证列表")
    //@PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
    //// @PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonationwitness serviceDonationwitness) {
        startPage();
@@ -101,7 +102,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) {
@@ -114,7 +115,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));
@@ -124,21 +125,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);
        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);
        }
        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);
    }

@@ -146,11 +148,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("*");
@@ -167,7 +171,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) {
@@ -545,6 +549,13 @@
        Boolean i = null;
        for (ServiceDonationwitness serviceDonationwitness : serviceDonationwitnessList) {
            log.info("捐献见证管理id是否为空 : {},基础表的id为 : {}", serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());
            ServiceDonationwitness sd2 = new ServiceDonationwitness();
            sd2.setInfoid(serviceDonationwitness.getInfoid());
            sd2.setDel_flag(0);
            List<ServiceDonationwitness> serviceDonationwitnesses = serviceDonationwitnessService.queryList(sd2);
            if (!CollectionUtils.isEmpty(serviceDonationwitnesses)) {
                serviceDonationwitness.setId(serviceDonationwitnesses.get(0).getId());
            }
            if (serviceDonationwitness.getId() == null) {
                i = serviceDonationwitnessService.save(serviceDonationwitness);
            } else {