From a54e249f9fedf3633825dd7a6846621df7b110b9 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期三, 18 十月 2023 12:00:55 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java | 424 +++++++++++++++++++++++++++------------------------- 1 files changed, 219 insertions(+), 205 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 d1a0571..a9d8a31 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 @@ -6,12 +6,18 @@ import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.enums.OrganEnum; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.project.domain.BaseOnlyvalue; import com.ruoyi.project.domain.ServiceDonatecompletioninfo; import com.ruoyi.project.domain.ServiceDonateorgan; import com.ruoyi.project.domain.vo.DonationWitnessVO; import com.ruoyi.project.domain.vo.TimeVO; +import com.ruoyi.project.mapper.BaseOnlyvalueMapper; +import com.ruoyi.project.service.IBaseOnlyvalueService; import com.ruoyi.project.service.IServiceDonatebaseinfoService; import com.ruoyi.project.service.IServiceDonateorganService; +import com.ruoyi.project.service.impl.BaseOnlyvalueServiceImpl; +import com.ruoyi.web.controller.common.OnlyValueCommon; import freemarker.template.Configuration; import freemarker.template.Template; import freemarker.template.TemplateException; @@ -19,6 +25,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; 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; @@ -39,17 +46,19 @@ /** * 鎹愮尞瑙佽瘉Controller - * + * * @author ruoyi * @date 2021-11-17 */ @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; @@ -72,8 +83,7 @@ @ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍒楄〃") //@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); @@ -96,8 +105,7 @@ //@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, "鎹愮尞瑙佽瘉鏁版嵁"); @@ -109,8 +117,7 @@ @ApiOperation("閫氳繃id鑾峰彇瑙佽瘉淇℃伅") //@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)); } @@ -122,8 +129,8 @@ @Log(title = "鎹愮尞瑙佽瘉", businessType = BusinessType.INSERT) @PostMapping @RepeatSubmit - public AjaxResult add(@RequestBody ServiceDonationwitness serviceDonationwitness) - { + public AjaxResult add(@RequestBody ServiceDonationwitness serviceDonationwitness) { + return toAjax(serviceDonationwitnessService.save(serviceDonationwitness)); } @@ -134,9 +141,17 @@ //@PreAuthorize("@ss.hasPermi('project:donationwitness:edit')") @Log(title = "鎹愮尞瑙佽瘉", businessType = BusinessType.UPDATE) @PostMapping("/edit") - @RepeatSubmit - public AjaxResult edit(@RequestBody ServiceDonationwitness serviceDonationwitness) - { + @RepeatSubmit + public AjaxResult edit(@RequestBody ServiceDonationwitness serviceDonationwitness) { + 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)); } @@ -147,15 +162,13 @@ //@PreAuthorize("@ss.hasPermi('project:donationwitness:remove')") @Log(title = "鎹愮尞瑙佽瘉", businessType = BusinessType.DELETE) @GetMapping("/remove/{ids}") - public AjaxResult remove(@PathVariable Long[] 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 +184,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 +192,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 +208,125 @@ } 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"); 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() == 0) { + dataMap.put("HFYT", "鈻�"); + dataMap.put("BHFYT", (char) 8730); + } else if (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() == 0) { + dataMap.put("MA", "鈻�"); + dataMap.put("BMA", (char) 8730); + } else if (donationWitness.getIsspendremember() == 1) { + dataMap.put("MA", (char) 8730); + dataMap.put("BMA", "鈻�"); } ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan(); @@ -322,8 +337,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 +347,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,8 +521,7 @@ @ApiOperation("鏁版嵁澶у睆鑾峰彇鍗犳瘮缁熻") @GetMapping(value = "/getStats") - public AjaxResult getStats(TimeVO timeVO) - { + public AjaxResult getStats(TimeVO timeVO) { return AjaxResult.success(serviceDonationwitnessService.getStats(timeVO)); } -- Gitblit v1.9.3