ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
@@ -11,6 +11,7 @@ import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.project.domain.ServiceDonatebaseinfo; import com.ruoyi.project.domain.ServiceDonatecompletioninfo; import com.ruoyi.project.domain.ServiceDonateorgan; import com.ruoyi.project.domain.ServiceDonateorganBase; @@ -18,10 +19,7 @@ import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO; import com.ruoyi.project.domain.vo.DonationCompletionVO; import com.ruoyi.project.domain.vo.ServiceDonatecompletioninfoVO; import com.ruoyi.project.service.IServiceDonatecompletioninfoService; import com.ruoyi.project.service.IServiceDonatecomporganService; import com.ruoyi.project.service.IServiceDonateorganBaseService; import com.ruoyi.project.service.IServiceDonateorganService; import com.ruoyi.project.service.*; import freemarker.template.Configuration; import freemarker.template.Template; import freemarker.template.TemplateException; @@ -56,6 +54,9 @@ @Autowired private IServiceDonatecomporganService serviceDonatecomporganService; @Autowired private IServiceDonatebaseinfoService serviceDonatebaseinfoService; private static Configuration configuration = null; @@ -158,6 +159,12 @@ @PostMapping("/edit") public AjaxResult edit(@RequestBody ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) { boolean edit = serviceDonatecompletioninfoService.edit(serviceDonatecompletioninfoVO); if(edit&&serviceDonatecompletioninfoVO.getCompleteState()=="3"){ ServiceDonatebaseinfo donatebaseinfo=new ServiceDonatebaseinfo(); donatebaseinfo.setWorkflow(99); donatebaseinfo.setId(serviceDonatecompletioninfoVO.getInfoid()); serviceDonatebaseinfoService.updateById(donatebaseinfo); } return toAjax(edit); }
@@ -9,6 +9,7 @@ import com.ruoyi.common.enums.OrganEnum; import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.project.domain.ServiceDonatebaseinfo; import com.ruoyi.project.domain.vo.ServiceDonationwitnessVO; import com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO; import com.ruoyi.project.domain.ServiceDonateorgan; @@ -142,6 +143,12 @@ public AjaxResult edit(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO) { log.info("新增捐献见证id为：{},infoId为：{}", serviceDonationwitnessVO.getId(), serviceDonationwitnessVO.getInfoid()); Boolean edit = serviceDonationwitnessService.edit(serviceDonationwitnessVO); if(edit&&serviceDonationwitnessVO.getWitnessState()=="3"){ ServiceDonatebaseinfo donatebaseinfo=new ServiceDonatebaseinfo(); donatebaseinfo.setWorkflow(6); donatebaseinfo.setId(serviceDonationwitnessVO.getInfoid()); serviceDonatebaseinfoService.updateById(donatebaseinfo); } return toAjax(edit); }
@@ -148,6 +148,7 @@ //先通过caseNo查询是否存在 ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo(); serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo()); serviceDonatebaseinfo1.setWorkflow(2); List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo); if (CollectionUtils.isNotEmpty(serviceDonatebaseinfos) && serviceDonatebaseinfos.size() > 0) { serviceDonatebaseinfo1.setId(serviceDonatebaseinfos.get(0).getId()); @@ -157,6 +158,7 @@ } //创建 serviceDonatebaseinfo1.setDonatetime(new Date()); return serviceDonatebaseinfoService.save(serviceDonatebaseinfo1); }
