From 34a716e48e49743083953113bfc2e8011d52444f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 15 九月 2025 19:08:05 +0800
Subject: [PATCH] 日志修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java | 491 ++++++++++++++++++++++++++++++------------------------
1 files changed, 272 insertions(+), 219 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
index 1084d1a..526a61d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
@@ -4,25 +4,31 @@
import java.text.SimpleDateFormat;
import java.util.*;
+import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.enums.OrganEnum;
-import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
+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.ServiceDonationwitnessorgan;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
+import com.ruoyi.project.service.IBaseOnlyvalueService;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
import com.ruoyi.project.service.IServiceDonateorganService;
+import com.ruoyi.web.controller.common.OnlyValueCommon;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,17 +45,20 @@
/**
* 鎹愮尞瑙佽瘉Controller
- *
+ *
* @author ruoyi
* @date 2021-11-17
*/
+@Slf4j
@Api("鎹愮尞瑙佽瘉绠＄悊")
@RestController
@RequestMapping("/project/donationwitness")
-public class ServiceDonationwitnessController extends BaseController
-{
+public class ServiceDonationwitnessController extends BaseController {
@Autowired
private IServiceDonationwitnessService serviceDonationwitnessService;
+
+ @Autowired
+ private IBaseOnlyvalueService baseOnlyvalueService;
@Autowired
private IServiceDonateorganService serviceDonateorganService;
@@ -57,6 +66,8 @@
@Autowired
private IServiceDonatebaseinfoService serviceDonatebaseinfoService;
+ @Autowired
+ private OnlyValueCommon onlyValueCommon;
private static Configuration configuration = null;
@@ -70,10 +81,9 @@
* 鏌ヨ鎹愮尞瑙佽瘉鍒楄〃
*/
@ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
@GetMapping("/list")
- public TableDataInfo list(ServiceDonationwitness serviceDonationwitness)
- {
+ public TableDataInfo list(ServiceDonationwitness serviceDonationwitness) {
startPage();
List<ServiceDonationwitness> list = serviceDonationwitnessService.queryList(serviceDonationwitness);
return getDataTable(list);
@@ -81,8 +91,7 @@
@ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍒楄〃-鏂�")
@GetMapping("/listnew")
- public TableDataInfo listnew(DonationWitnessVO donationWitnessVO)
- {
+ public TableDataInfo listnew(DonationWitnessVO donationWitnessVO) {
startPage();
List<DonationWitnessVO> list = serviceDonationwitnessService.selectVOList(donationWitnessVO);
return getDataTable(list);
@@ -93,11 +102,10 @@
* 瀵煎嚭鎹愮尞瑙佽瘉鍒楄〃
*/
@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)
- {
+ public AjaxResult export(ServiceDonationwitness serviceDonationwitness) {
List<ServiceDonationwitness> list = serviceDonationwitnessService.queryList(serviceDonationwitness);
ExcelUtil<ServiceDonationwitness> util = new ExcelUtil<ServiceDonationwitness>(ServiceDonationwitness.class);
return util.exportExcel(list, "鎹愮尞瑙佽瘉鏁版嵁");
@@ -107,10 +115,9 @@
* 鑾峰彇鎹愮尞瑙佽瘉璇︾粏淇℃伅
*/
@ApiOperation("閫氳繃id鑾峰彇瑙佽瘉淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donationwitness:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:donationwitness:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceDonationwitnessService.getById(id));
}
@@ -118,25 +125,45 @@
* 鏂板鎹愮尞瑙佽瘉
*/
@ApiOperation("鏂板鎹愮尞瑙佽瘉")
- //@PreAuthorize("@ss.hasPermi('project:donationwitness:add')")
+ //// @PreAuthorize("@ss.hasPermi('project:donationwitness:add')")
@Log(title = "鎹愮尞瑙佽瘉", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceDonationwitness serviceDonationwitness)
- {
- return toAjax(serviceDonationwitnessService.save(serviceDonationwitness));
+ 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);
}
/**
* 淇敼鎹愮尞瑙佽瘉
*/
@ApiOperation("淇敼鎹愮尞瑙佽瘉")
- //@PreAuthorize("@ss.hasPermi('project:donationwitness:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:donationwitness:edit')")
@Log(title = "鎹愮尞瑙佽瘉", businessType = BusinessType.UPDATE)
- @PutMapping
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceDonationwitness serviceDonationwitness)
- {
+ @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("*");
+ }
+ //鎹愮尞鑰呯紪鍙锋渶鍚庝竴浣嶆槸 * ,鎵嶅彲浠ュ線鍞竴閲岃〃鍔犳暟鎹�
+ if (last == serviceDonationwitness.getDonorno().length()) {
+ onlyValueCommon.addOnlyValue("donationwitness");
+ }
+
return toAjax(serviceDonationwitnessService.updateById(serviceDonationwitness));
}
@@ -144,18 +171,16 @@
* 鍒犻櫎鎹愮尞瑙佽瘉
*/
@ApiOperation("鍒犻櫎鎹愮尞瑙佽瘉")
- //@PreAuthorize("@ss.hasPermi('project:donationwitness:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:donationwitness:remove')")
@Log(title = "鎹愮尞瑙佽瘉", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceDonationwitnessService.removeByIds(Arrays.asList(ids)));
}
@GetMapping(value = "/getByInfoId/{infoid}")
- public AjaxResult getByInfoId(@PathVariable("infoid") Long infoid)
- {
+ public AjaxResult getByInfoId(@PathVariable("infoid") Long infoid) {
return AjaxResult.success(serviceDonationwitnessService.getByInfoId(infoid));
}
@@ -171,7 +196,7 @@
System.out.println(filePath);
//璁剧疆妯℃湰瑁呯疆鏂规硶鍜岃矾寰�,FreeMarker鏀寔澶氱妯℃澘瑁呰浇鏂规硶銆傚彲浠ラ噸servlet锛宑lasspath锛屾暟鎹簱鏁欑▼瑁呰浇锛�
configuration.setDirectoryForTemplateLoading(new File(filePath));
- Template t=null;
+ Template t = null;
try {
//鎹愮尞琛�.ftl涓鸿瑁呰浇鐨勬ā鏉�
t = configuration.getTemplate("浜轰綋鍣ㄥ畼鎹愮尞鑾峰彇瑙佽瘉鐧昏琛�.ftl");
@@ -179,13 +204,13 @@
e.printStackTrace();
}
String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());
- String name = "浜轰綋鍣ㄥ畼鎹愮尞鑾峰彇瑙佽瘉鐧昏琛╛"+dataMap.get("XM")+"_"+ newTime;
+ String name = "浜轰綋鍣ㄥ畼鎹愮尞鑾峰彇瑙佽瘉鐧昏琛╛" + dataMap.get("XM") + "_" + newTime;
//杈撳嚭鏂囨。璺緞鍙婂悕绉�
- File outFile = new File(RuoYiConfig.getProfile()+"/download/wordtemplate/"+name+".doc");
+ File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
Writer out = null;
try {
- out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile),"utf-8"));
+ out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));
} catch (FileNotFoundException e1) {
e1.printStackTrace();
@@ -195,123 +220,126 @@
} catch (TemplateException e) {
e.printStackTrace();
}
- Map<String ,Object> map = new HashMap<>();
- map.put("downloadUrl","/profile/download/wordtemplate/"+name+".doc");
+ Map<String, Object> map = new HashMap<>();
+ map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
+
/**
* 娉ㄦ剰dataMap閲屽瓨鏀剧殑鏁版嵁Key鍊艰涓庢ā鏉夸腑鐨勫弬鏁扮浉瀵瑰簲
+ *
* @param dataMap
*/
- private void getData(Map dataMap, Long id){
+ private void getData(Map dataMap, Long id) {
DonationWitnessVO donationWitnessVO = new DonationWitnessVO();
List<DonationWitnessVO> list = serviceDonationwitnessService.selectVOList(donationWitnessVO);
DonationWitnessVO donationWitness = new DonationWitnessVO();
- for(DonationWitnessVO v : list){
- if(v.getDwid() != null && v.getDwid().longValue() == id){
+ for (DonationWitnessVO v : list) {
+ if (v.getDwid() != null && v.getDwid().longValue() == id) {
donationWitness = v;
}
}
SimpleDateFormat sformat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- dataMap.put("JXBH",donationWitness.getDonorno());
- dataMap.put("XM",donationWitness.getName());
- dataMap.put("JXYY",donationWitness.getTreatmenthospitalname() == null ? "" : donationWitness.getTreatmenthospitalname());
- dataMap.put("SWPD1",donationWitness.getDeathjudgedocto() == null ? "" : donationWitness.getDeathjudgedocto());
- dataMap.put("SWPD2",donationWitness.getDeathjudgedoctt() == null ? "" : donationWitness.getDeathjudgedoctt());
- dataMap.put("SWYY",donationWitness.getDeathreason() == null ? "" : donationWitness.getDeathreason());
- dataMap.put("SWSJ",donationWitness.getDeathtime() == null ? "": sformat.format(donationWitness.getDeathtime()));
- if(donationWitness.getDwdonationcategory().contains("DBD")){
- dataMap.put("ZGYL",(char) 8730);
- }else{
- dataMap.put("ZGYL","鈻�");
+ dataMap.put("JXBH", donationWitness.getDonorno());
+ dataMap.put("XM", donationWitness.getName());
+ dataMap.put("JXYY", donationWitness.getTreatmenthospitalname() == null ? "" : donationWitness.getTreatmenthospitalname());
+ dataMap.put("SWPD1", donationWitness.getDeathjudgedocto() == null ? "" : donationWitness.getDeathjudgedocto());
+ dataMap.put("SWPD2", donationWitness.getDeathjudgedoctt() == null ? "" : donationWitness.getDeathjudgedoctt());
+ dataMap.put("SWYY", donationWitness.getDeathreason() == null ? "" : donationWitness.getDeathreason());
+ dataMap.put("SWSJ", donationWitness.getDeathtime() == null ? "" : sformat.format(donationWitness.getDeathtime()));
+ if (donationWitness.getDwdonationcategory().contains("DBD")) {
+ dataMap.put("ZGYL", (char) 8730);
+ } else {
+ dataMap.put("ZGYL", "鈻�");
}
- if(donationWitness.getDwdonationcategory().contains("DCD")){
- dataMap.put("ZGEL",(char) 8730);
- }else{
- dataMap.put("ZGEL","鈻�");
+ if (donationWitness.getDwdonationcategory().contains("DCD")) {
+ dataMap.put("ZGEL", (char) 8730);
+ } else {
+ dataMap.put("ZGEL", "鈻�");
}
- if(donationWitness.getDwdonationcategory().contains("DBCD")){
- dataMap.put("ZGSL",(char) 8730);
- }else{
- dataMap.put("ZGSL","鈻�");
+ if (donationWitness.getDwdonationcategory().contains("DBCD")) {
+ dataMap.put("ZGSL", (char) 8730);
+ } else {
+ dataMap.put("ZGSL", "鈻�");
}
- if(donationWitness.getOrgandonation().contains("C22")){
- dataMap.put("GZ",(char) 8730);
- }else{
- dataMap.put("GZ","鈻�");
+ if (donationWitness.getOrgandonation().contains("C22")) {
+ dataMap.put("GZ", (char) 8730);
+ } else {
+ dataMap.put("GZ", "鈻�");
}
- if(donationWitness.getOrgandonation().contains("C64L")){
- dataMap.put("ZS",(char) 8730);
- }else{
- dataMap.put("ZS","鈻�");
+ if (donationWitness.getOrgandonation().contains("C64L")) {
+ dataMap.put("ZS", (char) 8730);
+ } else {
+ dataMap.put("ZS", "鈻�");
}
- if(donationWitness.getOrgandonation().contains("C64R")){
- dataMap.put("YS",(char) 8730);
- }else{
- dataMap.put("YS","鈻�");
+ if (donationWitness.getOrgandonation().contains("C64R")) {
+ dataMap.put("YS", (char) 8730);
+ } else {
+ dataMap.put("YS", "鈻�");
}
- if(donationWitness.getOrgandonation().contains("C38")){
- dataMap.put("XZ",(char) 8730);
- }else{
- dataMap.put("XZ","鈻�");
+ if (donationWitness.getOrgandonation().contains("C38")) {
+ dataMap.put("XZ", (char) 8730);
+ } else {
+ dataMap.put("XZ", "鈻�");
}
- if(donationWitness.getOrgandonation().contains("C34")){
- dataMap.put("FZ",(char) 8730);
- }else{
- dataMap.put("FZ","鈻�");
+ if (donationWitness.getOrgandonation().contains("C34")) {
+ dataMap.put("FZ", (char) 8730);
+ } else {
+ dataMap.put("FZ", "鈻�");
}
- if(donationWitness.getOrgandonation().contains("C25")){
- dataMap.put("YX",(char) 8730);
- }else{
- dataMap.put("YX","鈻�");
+ if (donationWitness.getOrgandonation().contains("C25")) {
+ dataMap.put("YX", (char) 8730);
+ } else {
+ dataMap.put("YX", "鈻�");
}
- if(donationWitness.getOrgandonation().contains("C17")){
- dataMap.put("XC",(char) 8730);
- }else{
- dataMap.put("XC","鈻�");
+ if (donationWitness.getOrgandonation().contains("C17")) {
+ dataMap.put("XC", (char) 8730);
+ } else {
+ dataMap.put("XC", "鈻�");
}
- if(donationWitness.getOrgandonation().contains("C69L")){
- dataMap.put("ZYZZ",(char) 8730);
- }else{
- dataMap.put("ZYZZ","鈻�");
+ if (donationWitness.getOrgandonation().contains("C69L")) {
+ dataMap.put("ZYZZ", (char) 8730);
+ } else {
+ dataMap.put("ZYZZ", "鈻�");
}
- if(donationWitness.getOrgandonation().contains("C69R")){
- dataMap.put("YYZZ",(char) 8730);
- }else{
- dataMap.put("YYZZ","鈻�");
+ if (donationWitness.getOrgandonation().contains("C69R")) {
+ dataMap.put("YYZZ", (char) 8730);
+ } else {
+ dataMap.put("YYZZ", "鈻�");
}
String hqzz = serviceDonatebaseinfoService.gethqzz(donationWitness.getInfoid());
dataMap.put("HQZZ", hqzz == null ? "" : hqzz);
- dataMap.put("KSSJ",donationWitness.getOperationbegtime() == null ? "" : sformat.format(donationWitness.getOperationbegtime()));
- dataMap.put("JSSJ",donationWitness.getOperationendtime() == null ? "" : sformat.format(donationWitness.getOperationendtime()));
+ dataMap.put("KSSJ", donationWitness.getOperationbegtime() == null ? "" : sformat.format(donationWitness.getOperationbegtime()));
+ dataMap.put("JSSJ", donationWitness.getOperationendtime() == null ? "" : sformat.format(donationWitness.getOperationendtime()));
- dataMap.put("FZDMCG",donationWitness.getAbdominalaortacannulatime() == null ? "" : sformat.format(donationWitness.getAbdominalaortacannulatime()));
- dataMap.put("FZDMGZ",donationWitness.getAbdominalaortaperfusiontime() == null ? "" : sformat.format(donationWitness.getAbdominalaortaperfusiontime()));
- dataMap.put("MJMCG",donationWitness.getPortalveincannulatime() == null ? "" : sformat.format(donationWitness.getPortalveincannulatime()));
- dataMap.put("MJMGZ",donationWitness.getPortalveinperfusiontime() == null ? "" : sformat.format(donationWitness.getPortalveinperfusiontime()));
- dataMap.put("FDMCG",donationWitness.getPulmonaryarterycannulatime() == null ? "" : sformat.format(donationWitness.getPulmonaryarterycannulatime()));
- dataMap.put("FDMGZ",donationWitness.getPulmonaryarteryperfusiontime() == null ? "" : sformat.format(donationWitness.getPulmonaryarteryperfusiontime()));
- dataMap.put("ZDMCG",donationWitness.getAortacannulatime() == null ? "" : sformat.format(donationWitness.getAortacannulatime()));
- dataMap.put("ZDMGZ",donationWitness.getAortaperfusiontime() == null ? "" : sformat.format(donationWitness.getAortaperfusiontime()));
+ dataMap.put("FZDMCG", donationWitness.getAbdominalaortacannulatime() == null ? "" : sformat.format(donationWitness.getAbdominalaortacannulatime()));
+ dataMap.put("FZDMGZ", donationWitness.getAbdominalaortaperfusiontime() == null ? "" : sformat.format(donationWitness.getAbdominalaortaperfusiontime()));
+ dataMap.put("MJMCG", donationWitness.getPortalveincannulatime() == null ? "" : sformat.format(donationWitness.getPortalveincannulatime()));
+ dataMap.put("MJMGZ", donationWitness.getPortalveinperfusiontime() == null ? "" : sformat.format(donationWitness.getPortalveinperfusiontime()));
+ dataMap.put("FDMCG", donationWitness.getPulmonaryarterycannulatime() == null ? "" : sformat.format(donationWitness.getPulmonaryarterycannulatime()));
+ dataMap.put("FDMGZ", donationWitness.getPulmonaryarteryperfusiontime() == null ? "" : sformat.format(donationWitness.getPulmonaryarteryperfusiontime()));
+ dataMap.put("ZDMCG", donationWitness.getAortacannulatime() == null ? "" : sformat.format(donationWitness.getAortacannulatime()));
+ dataMap.put("ZDMGZ", donationWitness.getAortaperfusiontime() == null ? "" : sformat.format(donationWitness.getAortaperfusiontime()));
- if(donationWitness.getIsrestoreremains() == 0){
- dataMap.put("HFYT","鈻�");
- dataMap.put("BHFYT",(char) 8730);
- }else if(donationWitness.getIsrestoreremains() == 1){
- dataMap.put("HFYT",(char) 8730);
- dataMap.put("BHFYT","鈻�");
+ if (donationWitness.getIsrestoreremains() != null && donationWitness.getIsrestoreremains() == 0) {
+ dataMap.put("HFYT", "鈻�");
+ dataMap.put("BHFYT", (char) 8730);
+ } else if (donationWitness.getIsrestoreremains() != null && donationWitness.getIsrestoreremains() == 1) {
+ dataMap.put("HFYT", (char) 8730);
+ dataMap.put("BHFYT", "鈻�");
}
- if(donationWitness.getIsspendremember() == 0){
- dataMap.put("MA","鈻�");
- dataMap.put("BMA",(char) 8730);
- }else if(donationWitness.getIsspendremember() == 1){
- dataMap.put("MA",(char) 8730);
- dataMap.put("BMA","鈻�");
+ if (donationWitness.getIsspendremember() != null && donationWitness.getIsspendremember() == 0) {
+ dataMap.put("MA", "鈻�");
+ dataMap.put("BMA", (char) 8730);
+ } else if (donationWitness.getIsspendremember() != null && donationWitness.getIsspendremember() == 1) {
+ dataMap.put("MA", (char) 8730);
+ dataMap.put("BMA", "鈻�");
}
ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
@@ -322,8 +350,8 @@
Boolean qg = false;
Boolean zg = false;
Boolean yg = false;
- Boolean zs = false;
- Boolean ys = false;
+ Boolean zs = false;
+ Boolean ys = false;
Boolean qf = false;
Boolean zf = false;
Boolean yf = false;
@@ -332,165 +360,165 @@
Boolean zyjm = false;
Boolean yyjm = false;
- if(donateorganList.size() > 0){
- for(int i = 0; i<donateorganList.size(); i++){
- if(donateorganList.get(i).getOrganno().equals(OrganEnum.XZ.getCode())){
- dataMap.put("XZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("XZFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ if (donateorganList.size() > 0) {
+ for (int i = 0; i < donateorganList.size(); i++) {
+ if (donateorganList.get(i).getOrganno().equals(OrganEnum.XZ.getCode())) {
+ dataMap.put("XZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("XZFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("XZRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
xz = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.QG.getCode())){
- dataMap.put("GZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("QGZFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.QG.getCode())) {
+ dataMap.put("GZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("QGZFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("GZRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
qg = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.ZG.getCode())){
- dataMap.put("ZGZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("ZGZFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.ZG.getCode())) {
+ dataMap.put("ZGZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("ZGZFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("ZGZRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
zg = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.YG.getCode())){
- dataMap.put("YGZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("YGZFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.YG.getCode())) {
+ dataMap.put("YGZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("YGZFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("YGZRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
yg = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.ZS.getCode())){
- dataMap.put("ZSZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("ZSZFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.ZS.getCode())) {
+ dataMap.put("ZSZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("ZSZFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("ZSZRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
zs = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.YS.getCode())){
- dataMap.put("YSZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("YSZFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.YS.getCode())) {
+ dataMap.put("YSZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("YSZFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("YSZRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
ys = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.QF.getCode())){
- dataMap.put("QYFZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("QYFZFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.QF.getCode())) {
+ dataMap.put("QYFZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("QYFZFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("QYFZRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
qf = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.ZF.getCode())){
- dataMap.put("ZFZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("ZFZFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.ZF.getCode())) {
+ dataMap.put("ZFZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("ZFZFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
- dataMap.put("ZFZRQ",donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
+ dataMap.put("ZFZRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
zf = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.YF.getCode())){
- dataMap.put("YFZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("YFZFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.YF.getCode())) {
+ dataMap.put("YFZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("YFZFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("YFZRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
yf = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.YX.getCode())){
- dataMap.put("YXYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("YXFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.YX.getCode())) {
+ dataMap.put("YXYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("YXFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("YXRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
yx = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.XC.getCode())){
- dataMap.put("XCYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("XCYY",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.XC.getCode())) {
+ dataMap.put("XCYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("XCYY", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("XCRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
xc = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.ZYJM.getCode())){
- dataMap.put("ZYYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("ZYFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.ZYJM.getCode())) {
+ dataMap.put("ZYYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("ZYFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("ZYRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
zyjm = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.YYJM.getCode())){
- dataMap.put("YYYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("YYFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.YYJM.getCode())) {
+ dataMap.put("YYYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("YYFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
- dataMap.put("YYRQ",donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
+ dataMap.put("YYRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
yyjm = true;
}
}
- if(xz.booleanValue() == false){
- dataMap.put("XZYY","");
- dataMap.put("XZFZR","");
- dataMap.put("XZRQ","");
+ if (xz.booleanValue() == false) {
+ dataMap.put("XZYY", "");
+ dataMap.put("XZFZR", "");
+ dataMap.put("XZRQ", "");
}
- if(qg.booleanValue() == false){
- dataMap.put("GZYY","");
- dataMap.put("QGZFZR","");
- dataMap.put("GZRQ","");
+ if (qg.booleanValue() == false) {
+ dataMap.put("GZYY", "");
+ dataMap.put("QGZFZR", "");
+ dataMap.put("GZRQ", "");
}
- if(zg.booleanValue() == false){
- dataMap.put("ZGZYY","");
- dataMap.put("ZGZFZR","");
- dataMap.put("ZGZRQ","");
+ if (zg.booleanValue() == false) {
+ dataMap.put("ZGZYY", "");
+ dataMap.put("ZGZFZR", "");
+ dataMap.put("ZGZRQ", "");
}
- if(yg.booleanValue() == false){
- dataMap.put("YGZYY","");
- dataMap.put("YGZFZR","");
- dataMap.put("YGZRQ","");
+ if (yg.booleanValue() == false) {
+ dataMap.put("YGZYY", "");
+ dataMap.put("YGZFZR", "");
+ dataMap.put("YGZRQ", "");
}
- if(zs.booleanValue() == false){
- dataMap.put("ZSZYY","");
- dataMap.put("ZSZFZR","");
- dataMap.put("ZSZRQ","");
+ if (zs.booleanValue() == false) {
+ dataMap.put("ZSZYY", "");
+ dataMap.put("ZSZFZR", "");
+ dataMap.put("ZSZRQ", "");
}
- if(ys.booleanValue() == false){
- dataMap.put("YSZYY","");
- dataMap.put("YSZFZR","");
- dataMap.put("YSZRQ","");
+ if (ys.booleanValue() == false) {
+ dataMap.put("YSZYY", "");
+ dataMap.put("YSZFZR", "");
+ dataMap.put("YSZRQ", "");
}
- if(qf.booleanValue() == false){
- dataMap.put("QYFZYY","");
- dataMap.put("QYFZFZR","");
- dataMap.put("QYFZRQ","");
+ if (qf.booleanValue() == false) {
+ dataMap.put("QYFZYY", "");
+ dataMap.put("QYFZFZR", "");
+ dataMap.put("QYFZRQ", "");
}
- if(zf.booleanValue() == false){
- dataMap.put("ZFZYY","");
- dataMap.put("ZFZFZR","");
- dataMap.put("ZFZRQ","");
+ if (zf.booleanValue() == false) {
+ dataMap.put("ZFZYY", "");
+ dataMap.put("ZFZFZR", "");
+ dataMap.put("ZFZRQ", "");
}
- if(yf.booleanValue() == false){
- dataMap.put("YFZYY","");
- dataMap.put("YFZFZR","");
- dataMap.put("YFZRQ","");
+ if (yf.booleanValue() == false) {
+ dataMap.put("YFZYY", "");
+ dataMap.put("YFZFZR", "");
+ dataMap.put("YFZRQ", "");
}
- if(yx.booleanValue() == false){
- dataMap.put("YXYY","");
- dataMap.put("YXFZR","");
- dataMap.put("YXRQ","");
+ if (yx.booleanValue() == false) {
+ dataMap.put("YXYY", "");
+ dataMap.put("YXFZR", "");
+ dataMap.put("YXRQ", "");
}
- if(xc.booleanValue() == false){
- dataMap.put("XCYY","");
- dataMap.put("XCFZR","");
- dataMap.put("XCRQ","");
+ if (xc.booleanValue() == false) {
+ dataMap.put("XCYY", "");
+ dataMap.put("XCFZR", "");
+ dataMap.put("XCRQ", "");
}
- if(zyjm.booleanValue() == false){
- dataMap.put("ZYYY","");
- dataMap.put("ZYFZR","");
- dataMap.put("ZYRQ","");
+ if (zyjm.booleanValue() == false) {
+ dataMap.put("ZYYY", "");
+ dataMap.put("ZYFZR", "");
+ dataMap.put("ZYRQ", "");
}
- if(yyjm.booleanValue() == false){
- dataMap.put("YYYY","");
- dataMap.put("YYFZR","");
- dataMap.put("YYRQ","");
+ if (yyjm.booleanValue() == false) {
+ dataMap.put("YYYY", "");
+ dataMap.put("YYFZR", "");
+ dataMap.put("YYRQ", "");
}
}
@@ -506,10 +534,35 @@
@ApiOperation("鏁版嵁澶у睆鑾峰彇鍗犳瘮缁熻")
@GetMapping(value = "/getStats")
- public AjaxResult getStats(TimeVO timeVO)
- {
+ public AjaxResult getStats(TimeVO timeVO) {
return AjaxResult.success(serviceDonationwitnessService.getStats(timeVO));
}
+ @RepeatSubmit
+ @ApiOperation("鏂板鎴栦慨鏀规崘鐚璇佺鐞�")
+ @Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.UPDATE)
+ @PostMapping("/saveOrUpdateDonationwitness")
+ public AjaxResult saveOrUpdateDonationwitness(@RequestBody List<ServiceDonationwitness> serviceDonationwitnessList) {
+ if (CollectionUtils.isEmpty(serviceDonationwitnessList)) {
+ throw new BaseException("璇锋鏌ラ渶瑕佹柊澧炴垨淇敼鐨勬崘鐚璇佺鐞嗗弬鏁版槸鍚﹀畬鏁�");
+ }
+ 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 {
+ i = serviceDonationwitnessService.updateById(serviceDonationwitness);
+ }
+ }
+ return toAjax(i);
+ }
}
--
Gitblit v1.9.3