ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java
@@ -28,8 +28,7 @@ @Api("器官分配管理") @RestController @RequestMapping("/project/organallocation") public class ServiceOrganallocationController extends BaseController { public class ServiceOrganallocationController extends BaseController { @Autowired private IServiceOrganallocationService serviceOrganallocationService; @@ -39,8 +38,7 @@ @ApiOperation("器官分配信息列表") //@PreAuthorize("@ss.hasPermi('project:organallocation:list')") @GetMapping("/list") public TableDataInfo list(ServiceOrganallocation serviceOrganallocation) { public TableDataInfo list(ServiceOrganallocation serviceOrganallocation) { startPage(); //List<ServiceOrganallocation> list = serviceOrganallocationService.queryList(serviceOrganallocation); List<ServiceOrganallocation> list = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation); @@ -54,8 +52,7 @@ //@PreAuthorize("@ss.hasPermi('project:organallocation:export')") @Log(title = "器官分配", businessType = BusinessType.EXPORT) @GetMapping("/export") public AjaxResult export(ServiceOrganallocation serviceOrganallocation) { public AjaxResult export(ServiceOrganallocation serviceOrganallocation) { List<ServiceOrganallocation> list = serviceOrganallocationService.queryList(serviceOrganallocation); ExcelUtil<ServiceOrganallocation> util = new ExcelUtil<ServiceOrganallocation>(ServiceOrganallocation.class); return util.exportExcel(list, "器官分配数据"); @@ -67,8 +64,7 @@ @ApiOperation("通过id获取器官分配信息") //@PreAuthorize("@ss.hasPermi('project:organallocation:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { public AjaxResult getInfo(@PathVariable("id") Long id) { return AjaxResult.success(serviceOrganallocationService.getById(id)); } @@ -80,9 +76,20 @@ @Log(title = "器官分配", businessType = BusinessType.INSERT) @PostMapping @RepeatSubmit public AjaxResult add(@RequestBody ServiceOrganallocation serviceOrganallocation) { public AjaxResult add(@RequestBody ServiceOrganallocation serviceOrganallocation) { return toAjax(serviceOrganallocationService.save(serviceOrganallocation)); } /** * 新增器官分配 */ @ApiOperation("新增器官分配集合信息") @Log(title = "器官分配集合", businessType = BusinessType.INSERT) @PostMapping("/add") @RepeatSubmit public AjaxResult addArrayData(@RequestBody List<ServiceOrganallocation> serviceOrganallocations) { return AjaxResult.success(serviceOrganallocationService.saveDate(serviceOrganallocations)); } /** @@ -93,9 +100,20 @@ @Log(title = "器官分配", businessType = BusinessType.UPDATE) @PostMapping("/edit") @RepeatSubmit public AjaxResult edit(@RequestBody ServiceOrganallocation serviceOrganallocation) { public AjaxResult edit(@RequestBody ServiceOrganallocation serviceOrganallocation) { return toAjax(serviceOrganallocationService.updateById(serviceOrganallocation)); } /** * 修改器官分配 */ @ApiOperation("修改器官分配信息") //@PreAuthorize("@ss.hasPermi('project:organallocation:edit')") @Log(title = "器官分配", businessType = BusinessType.UPDATE) @PostMapping("/editarraydata") @RepeatSubmit public AjaxResult editArrayData(@RequestBody List<ServiceOrganallocation> serviceOrganallocations) { return AjaxResult.success(serviceOrganallocationService.editArrayData(serviceOrganallocations)); } /** @@ -105,8 +123,7 @@ //@PreAuthorize("@ss.hasPermi('project:organallocation:remove')") @Log(title = "器官分配", businessType = BusinessType.DELETE) @GetMapping("/remove/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(serviceOrganallocationService.removeByIds(Arrays.asList(ids))); } } ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
@@ -382,4 +382,9 @@ private Integer workflow; @ApiModelProperty("终止案例：0开启，1终止 默认值：0") @Excel(name = "终止案例") private Integer terminationCase; } ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceOrganallocationService.java
@@ -11,8 +11,7 @@ * @author ruoyi * @date 2021-11-10 */ public interface IServiceOrganallocationService extends IService<ServiceOrganallocation> { public interface IServiceOrganallocationService extends IService<ServiceOrganallocation> { /** * 查询器官分配列表 @@ -23,4 +22,8 @@ public List<ServiceOrganallocation> queryList(ServiceOrganallocation serviceOrganallocation); List<ServiceOrganallocation> selectServiceOrganallocationList(ServiceOrganallocation serviceOrganallocation); List<ServiceOrganallocation> saveDate(List<ServiceOrganallocation> serviceOrganallocations); Boolean editArrayData(List<ServiceOrganallocation> serviceOrganallocations); } ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
@@ -273,8 +273,8 @@ } //封装serviceDonateorgan潜在捐献数据 Map<String, String> donateorgan = new HashMap<>(); donateorgan.put("createtime", serviceDonatebaseinfo.getCreateTime().toString()); donateorgan.put("updatetime", serviceDonatebaseinfo.getUpdateTime().toString()); donateorgan.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getCreateTime())); donateorgan.put("updatetime", serviceDonatebaseinfo.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getUpdateTime()) : ""); donateorgan.put("process", ""); //封装serviceDonateorgan潜在捐献返回数据 map.put("donateorgan", donateorgan); @@ -286,8 +286,8 @@ serviceMedicalevaluation.setInfoid(id); List<ServiceMedicalevaluation> serviceMedicalevaluations = serviceMedicalevaluationService.queryList(serviceMedicalevaluation); if (!CollectionUtils.isEmpty(serviceMedicalevaluations)) { medicalevaluation.put("createtime", serviceMedicalevaluations.get(0).getCreateTime().toString()); medicalevaluation.put("updatetime", serviceMedicalevaluations.get(0).getUpdateTime().toString()); medicalevaluation.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceMedicalevaluations.get(0).getCreateTime())); medicalevaluation.put("updatetime", serviceMedicalevaluations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceMedicalevaluations.get(0).getUpdateTime()) : null); medicalevaluation.put("process", ""); } } @@ -301,8 +301,8 @@ serviceRelativesconfirmation.setInfoid(id); List<ServiceRelativesconfirmation> serviceRelativesconfirmations = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation); if (!CollectionUtils.isEmpty(serviceRelativesconfirmations)) { relativesconfirmation.put("createtime", serviceRelativesconfirmations.get(0).getCreateTime().toString()); relativesconfirmation.put("updatetime", serviceRelativesconfirmations.get(0).getUpdateTime().toString()); relativesconfirmation.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceRelativesconfirmations.get(0).getCreateTime())); relativesconfirmation.put("updatetime", serviceRelativesconfirmations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceRelativesconfirmations.get(0).getUpdateTime()) : ""); relativesconfirmation.put("process", ""); } } @@ -317,8 +317,8 @@ serviceEthicalreviewopinions.setInfoid(id); List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = serviceEthicalreviewopinionsService.queryList(serviceEthicalreviewopinions); if (!CollectionUtils.isEmpty(serviceEthicalreviewopinionsList)) { ethicalreviewopinions.put("createtime", serviceEthicalreviewopinionsList.get(0).getCreateTime().toString()); ethicalreviewopinions.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime().toString()); ethicalreviewopinions.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getCreateTime())); ethicalreviewopinions.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getUpdateTime()) : ""); ethicalreviewopinions.put("process", ""); } } @@ -332,8 +332,8 @@ serviceOrganallocation.setOrganid(id); List<ServiceOrganallocation> serviceOrganallocations = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation); if (!CollectionUtils.isEmpty(serviceOrganallocations)) { organallocationService.put("createtime", serviceOrganallocations.get(0).getCreateTime().toString()); organallocationService.put("updatetime", serviceOrganallocations.get(0).getUpdateTime().toString()); organallocationService.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceOrganallocations.get(0).getCreateTime())); organallocationService.put("updatetime", serviceOrganallocations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceOrganallocations.get(0).getUpdateTime()) : ""); organallocationService.put("process", ""); } } @@ -345,8 +345,8 @@ if (serviceDonatebaseinfo.getWorkflow() >= 5) { ServiceDonationwitness serviceDonationwitness = serviceDonationwitnessService.getByInfoId(id); if (!ObjectUtils.isEmpty(serviceDonationwitness)) { donationwitness.put("createtime", serviceDonationwitness.getCreateTime().toString()); donationwitness.put("updatetime", serviceDonationwitness.getUpdateTime().toString()); donationwitness.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonationwitness.getCreateTime())); donationwitness.put("updatetime", serviceDonationwitness.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonationwitness.getUpdateTime()) : ""); donationwitness.put("process", ""); } } @@ -360,8 +360,8 @@ serviceDonatecompletioninfo.setInfoid(id); List<ServiceDonatecompletioninfo> serviceDonatecompletioninfos = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo); if (!CollectionUtils.isEmpty(serviceDonatecompletioninfos)) { donatecompletioninfo.put("createtime", serviceDonatecompletioninfos.get(0).getCreateTime().toString()); donatecompletioninfo.put("updatetime", serviceDonatecompletioninfos.get(0).getUpdateTime().toString()); donatecompletioninfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatecompletioninfos.get(0).getCreateTime())); donatecompletioninfo.put("updatetime", serviceDonatecompletioninfos.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatecompletioninfos.get(0).getUpdateTime()) : ""); donatecompletioninfo.put("process", ""); } } ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -681,7 +681,7 @@ } @Override @Transactional @Transactional(rollbackFor = Exception.class) public Long addOrUpdateNew(ServiceFundVO serviceFundVO) { Long id = null; //将数据保存到fund表 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceOrganallocationServiceImpl.java
@@ -1,9 +1,11 @@ package com.ruoyi.project.service.impl; import java.util.ArrayList; import java.util.List; import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,6 +16,11 @@ import com.ruoyi.project.mapper.ServiceOrganallocationMapper; import com.ruoyi.project.domain.ServiceOrganallocation; import com.ruoyi.project.service.IServiceOrganallocationService; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.DefaultTransactionDefinition; /** * 器官分配Service业务层处理 @@ -22,8 +29,7 @@ * @date 2021-11-10 */ @Service public class ServiceOrganallocationServiceImpl extends ServiceImpl<ServiceOrganallocationMapper, ServiceOrganallocation> implements IServiceOrganallocationService { public class ServiceOrganallocationServiceImpl extends ServiceImpl<ServiceOrganallocationMapper, ServiceOrganallocation> implements IServiceOrganallocationService { @Autowired ServiceOrganallocationMapper serviceOrganallocationMapper; @@ -146,4 +152,29 @@ return serviceOrganallocationMapper.selectServiceOrganallocationList(serviceOrganallocation); } @Override @Transactional(rollbackFor = Exception.class) public List<ServiceOrganallocation> saveDate(List<ServiceOrganallocation> serviceOrganallocations) { for (ServiceOrganallocation serviceOrganallocation : serviceOrganallocations) { this.save(serviceOrganallocation); } //将带ID的数据返回 return serviceOrganallocations; } @Override @Transactional(rollbackFor = Exception.class) public Boolean editArrayData(List<ServiceOrganallocation> serviceOrganallocations) { for (ServiceOrganallocation serviceOrganallocation : serviceOrganallocations) { if (serviceOrganallocation.getId() == null) { throw new BaseException("id为空了 ：" + serviceOrganallocation); } this.updateById(serviceOrganallocation); } //将带ID的数据返回 return true; } } ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -69,6 +69,7 @@ <result property="del_flag" column="del_flag" /> <result property="createBy" column="create_by" /> <result property="createTime" column="create_time" /> <result property="terminationCase" column="termination_case" /> <result property="updateBy" column="update_by" /> <result property="updateTime" column="update_time" /> <result property="nation" column="Nation" />
