From 0c5e744bd9b52147c7fc273ec8fe7bd7afea0ebb Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 05 三月 2024 15:42:21 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java | 27 ++
ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseOrganizationService.java | 4
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java | 15 +
ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml | 14 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java | 20 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java | 177 ++++++++++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOrganizationServiceImpl.java | 115 +++++----
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 112 +++++++++
ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseOrganizationMapper.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java | 16 +
ruoyi-project/src/main/resources/mapper/project/BaseOrganizationMapper.xml | 168 ++++++++-----
12 files changed, 553 insertions(+), 137 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
index 9266c9a..06321bc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.BaseOrganization;
import com.ruoyi.project.service.IBaseOrganizationService;
@@ -85,10 +86,21 @@
@RepeatSubmit
public AjaxResult add(@RequestBody BaseOrganization baseOrganization) {
log.info("鏂板鏈烘瀯淇℃伅{}锛�", baseOrganization);
- String organization = onlyValueCommon.addOnlyValue("organization");
- //"0"+鍦板競缂栫爜+鍖婚櫌绫诲瀷+搴忓彿
- baseOrganization.setOrganizationid("0" + baseOrganization.getRegionallevel() + baseOrganization.getHospitalnature() + organization);
-
+ //"0"+鍦板競缂栫爜+鍖婚櫌绫诲瀷
+ String str = "0" + baseOrganization.getRegionallevel() + baseOrganization.getHospitalnature();
+ String maxOrganizationID = baseOrganizationService.getMaxOrganizationID(str + "__");
+ if (StringUtils.isNotBlank(maxOrganizationID)) {
+ String result = maxOrganizationID.substring(str.length());
+ //鑾峰彇搴忓彿锛�+1锛岀敓鎴愭柊鐨勫簭鍙�
+ int xh = Integer.valueOf(result) + 1;
+ if (String.valueOf(xh).length() > 1) {
+ baseOrganization.setOrganizationid(str + xh);
+ } else {
+ baseOrganization.setOrganizationid(str + "0" + xh);
+ }
+ } else {
+ baseOrganization.setOrganizationid(str + str + "01");
+ }
boolean save = baseOrganizationService.save(baseOrganization);
log.info("鏂板鏈烘瀯淇℃伅baseOrganization鐨処D{}锛�", baseOrganization.getId());
return AjaxResult.success(baseOrganization);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
index f14aba7..45dee61 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.project;
+import com.alibaba.fastjson.JSON;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -7,8 +8,10 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonorchargeorgan;
+import com.ruoyi.project.domain.ServiceDonorchargeorganVO;
import com.ruoyi.project.service.IServiceDonorchargeorganService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -18,6 +21,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -78,7 +82,11 @@
@Log(title = "鎹愮尞鍣ㄥ畼", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceDonorchargeorgan serviceDonorchargeorgan) {
+ public AjaxResult add(@RequestBody ServiceDonorchargeorganVO serviceDonorchargeorganvo) {
+ if (!CollectionUtils.isEmpty(serviceDonorchargeorganvo.getAnnexFilesList())) {
+ serviceDonorchargeorganvo.setAnnexFiles(JSON.toJSONString(serviceDonorchargeorganvo.getAnnexFilesList()));
+ }
+ ServiceDonorchargeorgan serviceDonorchargeorgan = DtoConversionUtils.sourceToTarget(serviceDonorchargeorganvo, ServiceDonorchargeorgan.class);
boolean save = serviceDonorchargeorganService.save(serviceDonorchargeorgan);
return AjaxResult.success(serviceDonorchargeorgan);
}
@@ -91,7 +99,11 @@
@Log(title = "鎹愮尞鍣ㄥ畼", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceDonorchargeorgan serviceDonorchargeorgan) {
+ public AjaxResult edit(@RequestBody ServiceDonorchargeorganVO serviceDonorchargeorganVO) {
+ if (!CollectionUtils.isEmpty(serviceDonorchargeorganVO.getAnnexFilesList())) {
+ serviceDonorchargeorganVO.setAnnexFiles(JSON.toJSONString(serviceDonorchargeorganVO.getAnnexFilesList()));
+ }
+ ServiceDonorchargeorgan serviceDonorchargeorgan = DtoConversionUtils.sourceToTarget(serviceDonorchargeorganVO, ServiceDonorchargeorgan.class);
return toAjax(serviceDonorchargeorganService.updateById(serviceDonorchargeorgan));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java
index e2307d1..1535841 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java
@@ -59,14 +59,12 @@
@ApiOperation("鏌ヨ鏈娑堟伅鏁伴噺")
@GetMapping("/noreadcount")
public AjaxResult noreadcount() {
-// LoginUser loginUser = getLoginUser();
-// ServiceSystemmessage serviceSystemmessage = new ServiceSystemmessage();
-// serviceSystemmessage.setReceiveuserno(loginUser.getUsername());
-// serviceSystemmessage.setIsread(0);
-// List<ServiceSystemmessage> list = serviceSystemmessageService.queryList(serviceSystemmessage);
-// return AjaxResult.success(list.size());
- // log.info("涓嶇敤绠℃垜锛屾鍦ㄦ祴璇曠▼搴�");
- return null;
+ LoginUser loginUser = getLoginUser();
+ ServiceSystemmessage serviceSystemmessage=new ServiceSystemmessage();
+ serviceSystemmessage.setReceiveuserno(loginUser.getUsername());
+ serviceSystemmessage.setIsread(0);
+ List<ServiceSystemmessage> list = serviceSystemmessageService.queryList(serviceSystemmessage);
+ return AjaxResult.success(list.size());
}
/**
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
index d776cbf..ea904fd 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
@@ -31,6 +31,12 @@
@TableId(type = IdType.AUTO)
private Long id;
+ @ApiModelProperty("鍏宠仈service_donorpayment琛ㄧ殑ID")
+ private Long paymentid;
+
+ @ApiModelProperty("鍏宠仈service_donorpayment琛ㄧ殑paymentno")
+ private String paymentno;
+
/**
* 鍏宠仈service_donorcharge琛ㄧ殑ID
*/
@@ -138,5 +144,26 @@
@Excel(name = "鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑")
private String organchargedesc;
+ /**
+ * 浜嬩欢缂栧彿
+ */
+ @ApiModelProperty("浜嬩欢缂栧彿")
+ @Excel(name = "浜嬩欢缂栧彿")
+ private String caseno;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 绁ㄦ嵁闄勪欢
+ */
+ @ApiModelProperty("绁ㄦ嵁闄勪欢")
+ @Excel(name = "绁ㄦ嵁闄勪欢")
+ private String annexFiles;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java
new file mode 100644
index 0000000..3d3a5f0
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java
@@ -0,0 +1,177 @@
+package com.ruoyi.project.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鎹愮尞鍣ㄥ畼瀵硅薄 service_donorchargeorgan
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+@Data
+@ApiModel("鎹愮尞鍣ㄥ畼")
+public class ServiceDonorchargeorganVO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty("$column.columnComment")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("鍏宠仈service_donorpayment琛ㄧ殑ID")
+ private Long paymentid;
+
+ @ApiModelProperty("鍏宠仈service_donorpayment琛ㄧ殑paymentno")
+ private String paymentno;
+
+ /**
+ * 鍏宠仈service_donorcharge琛ㄧ殑ID
+ */
+ @ApiModelProperty("鍏宠仈service_donorcharge琛ㄧ殑ID")
+ @Excel(name = "鍏宠仈service_donorcharge琛ㄧ殑ID")
+ private Long donorchargeid;
+
+ /**
+ * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+ */
+ @ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
+ @Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
+ private Long infoid;
+
+ /**
+ * 鎹愮尞浜哄悕瀛�
+ */
+ @ApiModelProperty("鎹愮尞浜哄悕瀛�")
+ @Excel(name = "鎹愮尞浜哄悕瀛�")
+ private String donorname;
+
+ /**
+ * 鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�
+ */
+ @ApiModelProperty("鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
+ @Excel(name = "鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
+ private String hospitalname;
+
+ /**
+ * 鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�
+ */
+ @ApiModelProperty("鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
+ @Excel(name = "鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
+ private String hospitalno;
+
+ /**
+ * 鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ
+ */
+ @ApiModelProperty("鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ")
+ @Excel(name = "鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ")
+ private String organno;
+
+ /**
+ * 鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ
+ */
+ @ApiModelProperty("鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ")
+ @Excel(name = "鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ")
+ private String organname;
+
+ /**
+ * 鍣ㄥ畼搴旀敹璐圭敤
+ */
+ @ApiModelProperty("鍣ㄥ畼搴旀敹璐圭敤")
+ @Excel(name = "鍣ㄥ畼搴旀敹璐圭敤")
+ private BigDecimal organcharge;
+
+ /**
+ * 璐圭敤褰曞叆鏃堕棿
+ */
+ @ApiModelProperty("璐圭敤褰曞叆鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璐圭敤褰曞叆鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date organtime;
+
+ /**
+ * 璐圭敤褰曞叆浜�
+ */
+ @ApiModelProperty("璐圭敤褰曞叆浜�")
+ @Excel(name = "璐圭敤褰曞叆浜�")
+ private String chargeoperator;
+
+ /**
+ * 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤
+ */
+ @ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤")
+ @Excel(name = "鍣ㄥ畼瀹為檯鏀跺埌璐圭敤")
+ private BigDecimal amount;
+
+ /**
+ * 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤鏃堕棿
+ */
+ @ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍣ㄥ畼瀹為檯鏀跺埌璐圭敤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date amounttime;
+
+ /**
+ * 鏀惰垂褰曞叆浜�
+ */
+ @ApiModelProperty("鏀惰垂褰曞叆浜�")
+ @Excel(name = "鏀惰垂褰曞叆浜�")
+ private String amountoperator;
+
+ /**
+ * 鍣ㄥ畼璐圭敤鏀跺彇鐘舵�侊細0锛氭湭鏀跺彇锛�1锛氬凡鏀跺彇锛�2锛氭斁寮�
+ */
+ @ApiModelProperty("鍣ㄥ畼璐圭敤鏀跺彇鐘舵�侊細0锛氭湭鏀跺彇锛�1锛氬凡鏀跺彇锛�2锛氭斁寮�")
+ @Excel(name = "鍣ㄥ畼璐圭敤鏀跺彇鐘舵�侊細0锛氭湭鏀跺彇锛�1锛氬凡鏀跺彇锛�2锛氭斁寮�")
+ private Long chargestate;
+
+ /**
+ * 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑
+ */
+ @ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑")
+ @Excel(name = "鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑")
+ private String organchargedesc;
+
+ /**
+ * 浜嬩欢缂栧彿
+ */
+ @ApiModelProperty("浜嬩欢缂栧彿")
+ @Excel(name = "浜嬩欢缂栧彿")
+ private String caseno;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 绁ㄦ嵁闄勪欢
+ */
+ @ApiModelProperty("绁ㄦ嵁闄勪欢")
+ @Excel(name = "绁ㄦ嵁闄勪欢")
+ private String annexFiles;
+
+ /**
+ * 绁ㄦ嵁闄勪欢
+ */
+ @ApiModelProperty("绁ㄦ嵁闄勪欢闆嗗悎")
+ @Excel(name = "绁ㄦ嵁闄勪欢闆嗗悎")
+ private List<String> annexFilesList;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseOrganizationMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseOrganizationMapper.java
index f20ff7d..ffc2154 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseOrganizationMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseOrganizationMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
import java.util.List;
import com.ruoyi.common.core.domain.entity.BasePrcaddressDict;
@@ -10,13 +11,12 @@
/**
* 鏈烘瀯绠＄悊Mapper鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2021-11-05
*/
@Mapper
-public interface BaseOrganizationMapper extends BaseMapper<BaseOrganization>
-{
+public interface BaseOrganizationMapper extends BaseMapper<BaseOrganization> {
/**
* 鏌ヨ鏈烘瀯绠＄悊鍒楄〃
*
@@ -36,4 +36,6 @@
List<BaseOrganization> getTransOrg();
String getNameByNo(String orgno);
+
+ String getMaxOrganizationID(String organizationid);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseOrganizationService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseOrganizationService.java
index ff10ad0..309139d 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseOrganizationService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseOrganizationService.java
@@ -20,4 +20,8 @@
* @return 鏈烘瀯绠＄悊闆嗗悎
*/
public List<BaseOrganization> queryList(BaseOrganization baseOrganization);
+
+
+ public String getMaxOrganizationID(String organizationid);
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOrganizationServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOrganizationServiceImpl.java
index 57e612d..455b619 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOrganizationServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOrganizationServiceImpl.java
@@ -1,14 +1,18 @@
package com.ruoyi.project.service.impl;
import java.util.List;
+
+import com.fasterxml.jackson.databind.ser.Serializers;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
import java.util.ArrayList;
import java.util.Map;
+
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.mapper.BaseOrganizationMapper;
import com.ruoyi.project.domain.BaseOrganization;
@@ -16,97 +20,102 @@
/**
* 鏈烘瀯绠＄悊Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2021-11-05
*/
@Service
-public class BaseOrganizationServiceImpl extends ServiceImpl<BaseOrganizationMapper, BaseOrganization> implements IBaseOrganizationService
-{
-
+public class BaseOrganizationServiceImpl extends ServiceImpl<BaseOrganizationMapper, BaseOrganization> implements IBaseOrganizationService {
+ @Autowired
+ private BaseOrganizationMapper baseOrganizationMapper;
/**
* 鏌ヨ鏈烘瀯绠＄悊鍒楄〃
- *
+ *
* @param baseOrganization 鏈烘瀯绠＄悊
* @return 鏈烘瀯绠＄悊
*/
@Override
public List<BaseOrganization> queryList(BaseOrganization baseOrganization) {
LambdaQueryWrapper<BaseOrganization> wrappers = Wrappers.lambdaQuery();
- if (StringUtils.isNotBlank(baseOrganization.getOrganizationname())){
- wrappers.like(BaseOrganization::getOrganizationname ,baseOrganization.getOrganizationname());
+ if (StringUtils.isNotBlank(baseOrganization.getOrganizationname())) {
+ wrappers.like(BaseOrganization::getOrganizationname, baseOrganization.getOrganizationname());
}
- if (StringUtils.isNotBlank(baseOrganization.getOrganizationid())){
- wrappers.eq(BaseOrganization::getOrganizationid ,baseOrganization.getOrganizationid());
+ if (StringUtils.isNotBlank(baseOrganization.getOrganizationid())) {
+ wrappers.eq(BaseOrganization::getOrganizationid, baseOrganization.getOrganizationid());
}
- if (StringUtils.isNotBlank(baseOrganization.getLogourl())){
- wrappers.eq(BaseOrganization::getLogourl ,baseOrganization.getLogourl());
+ if (StringUtils.isNotBlank(baseOrganization.getLogourl())) {
+ wrappers.eq(BaseOrganization::getLogourl, baseOrganization.getLogourl());
}
- if (baseOrganization.getRegistertime() != null){
- wrappers.eq(BaseOrganization::getRegistertime ,baseOrganization.getRegistertime());
+ if (baseOrganization.getRegistertime() != null) {
+ wrappers.eq(BaseOrganization::getRegistertime, baseOrganization.getRegistertime());
}
- if (StringUtils.isNotBlank(baseOrganization.getRegisteraddress())){
- wrappers.eq(BaseOrganization::getRegisteraddress ,baseOrganization.getRegisteraddress());
+ if (StringUtils.isNotBlank(baseOrganization.getRegisteraddress())) {
+ wrappers.eq(BaseOrganization::getRegisteraddress, baseOrganization.getRegisteraddress());
}
- if (StringUtils.isNotBlank(baseOrganization.getOfficeplace())){
- wrappers.eq(BaseOrganization::getOfficeplace ,baseOrganization.getOfficeplace());
+ if (StringUtils.isNotBlank(baseOrganization.getOfficeplace())) {
+ wrappers.eq(BaseOrganization::getOfficeplace, baseOrganization.getOfficeplace());
}
- if (StringUtils.isNotBlank(baseOrganization.getLegalperson())){
- wrappers.eq(BaseOrganization::getLegalperson ,baseOrganization.getLegalperson());
+ if (StringUtils.isNotBlank(baseOrganization.getLegalperson())) {
+ wrappers.eq(BaseOrganization::getLegalperson, baseOrganization.getLegalperson());
}
- if (StringUtils.isNotBlank(baseOrganization.getContactperson())){
- wrappers.eq(BaseOrganization::getContactperson ,baseOrganization.getContactperson());
+ if (StringUtils.isNotBlank(baseOrganization.getContactperson())) {
+ wrappers.eq(BaseOrganization::getContactperson, baseOrganization.getContactperson());
}
- if (StringUtils.isNotBlank(baseOrganization.getContactnumber())){
- wrappers.eq(BaseOrganization::getContactnumber ,baseOrganization.getContactnumber());
+ if (StringUtils.isNotBlank(baseOrganization.getContactnumber())) {
+ wrappers.eq(BaseOrganization::getContactnumber, baseOrganization.getContactnumber());
}
- if (StringUtils.isNotBlank(baseOrganization.getIntroduction())){
- wrappers.eq(BaseOrganization::getIntroduction ,baseOrganization.getIntroduction());
+ if (StringUtils.isNotBlank(baseOrganization.getIntroduction())) {
+ wrappers.eq(BaseOrganization::getIntroduction, baseOrganization.getIntroduction());
}
- if (StringUtils.isNotBlank(baseOrganization.getOrganizationtype())){
- wrappers.eq(BaseOrganization::getOrganizationtype ,baseOrganization.getOrganizationtype());
+ if (StringUtils.isNotBlank(baseOrganization.getOrganizationtype())) {
+ wrappers.eq(BaseOrganization::getOrganizationtype, baseOrganization.getOrganizationtype());
}
- if (StringUtils.isNotBlank(baseOrganization.getHospitalnature())){
- wrappers.eq(BaseOrganization::getHospitalnature ,baseOrganization.getHospitalnature());
+ if (StringUtils.isNotBlank(baseOrganization.getHospitalnature())) {
+ wrappers.eq(BaseOrganization::getHospitalnature, baseOrganization.getHospitalnature());
}
- if (StringUtils.isNotBlank(baseOrganization.getRegionallevel())){
- wrappers.eq(BaseOrganization::getRegionallevel ,baseOrganization.getRegionallevel());
+ if (StringUtils.isNotBlank(baseOrganization.getRegionallevel())) {
+ wrappers.eq(BaseOrganization::getRegionallevel, baseOrganization.getRegionallevel());
}
- if (StringUtils.isNotBlank(baseOrganization.getMedicalcode())){
- wrappers.eq(BaseOrganization::getMedicalcode ,baseOrganization.getMedicalcode());
+ if (StringUtils.isNotBlank(baseOrganization.getMedicalcode())) {
+ wrappers.eq(BaseOrganization::getMedicalcode, baseOrganization.getMedicalcode());
}
- if (StringUtils.isNotBlank(baseOrganization.getProvince())){
- wrappers.eq(BaseOrganization::getProvince ,baseOrganization.getProvince());
+ if (StringUtils.isNotBlank(baseOrganization.getProvince())) {
+ wrappers.eq(BaseOrganization::getProvince, baseOrganization.getProvince());
}
- if (StringUtils.isNotBlank(baseOrganization.getProvincename())){
- wrappers.like(BaseOrganization::getProvincename ,baseOrganization.getProvincename());
+ if (StringUtils.isNotBlank(baseOrganization.getProvincename())) {
+ wrappers.like(BaseOrganization::getProvincename, baseOrganization.getProvincename());
}
- if (StringUtils.isNotBlank(baseOrganization.getCity())){
- wrappers.eq(BaseOrganization::getCity ,baseOrganization.getCity());
+ if (StringUtils.isNotBlank(baseOrganization.getCity())) {
+ wrappers.eq(BaseOrganization::getCity, baseOrganization.getCity());
}
- if (StringUtils.isNotBlank(baseOrganization.getCityname())){
- wrappers.like(BaseOrganization::getCityname ,baseOrganization.getCityname());
+ if (StringUtils.isNotBlank(baseOrganization.getCityname())) {
+ wrappers.like(BaseOrganization::getCityname, baseOrganization.getCityname());
}
- if (StringUtils.isNotBlank(baseOrganization.getTown())){
- wrappers.eq(BaseOrganization::getTown ,baseOrganization.getTown());
+ if (StringUtils.isNotBlank(baseOrganization.getTown())) {
+ wrappers.eq(BaseOrganization::getTown, baseOrganization.getTown());
}
- if (StringUtils.isNotBlank(baseOrganization.getTownname())){
- wrappers.like(BaseOrganization::getTownname ,baseOrganization.getTownname());
+ if (StringUtils.isNotBlank(baseOrganization.getTownname())) {
+ wrappers.like(BaseOrganization::getTownname, baseOrganization.getTownname());
}
- if (StringUtils.isNotBlank(baseOrganization.getCommunity())){
- wrappers.eq(BaseOrganization::getCommunity ,baseOrganization.getCommunity());
+ if (StringUtils.isNotBlank(baseOrganization.getCommunity())) {
+ wrappers.eq(BaseOrganization::getCommunity, baseOrganization.getCommunity());
}
- if (StringUtils.isNotBlank(baseOrganization.getCommunityname())){
- wrappers.like(BaseOrganization::getCommunityname ,baseOrganization.getCommunityname());
+ if (StringUtils.isNotBlank(baseOrganization.getCommunityname())) {
+ wrappers.like(BaseOrganization::getCommunityname, baseOrganization.getCommunityname());
}
- if (StringUtils.isNotBlank(baseOrganization.getCountycode())){
- wrappers.eq(BaseOrganization::getCountycode ,baseOrganization.getCountycode());
+ if (StringUtils.isNotBlank(baseOrganization.getCountycode())) {
+ wrappers.eq(BaseOrganization::getCountycode, baseOrganization.getCountycode());
}
- if (StringUtils.isNotBlank(baseOrganization.getCountyname())){
- wrappers.like(BaseOrganization::getCountyname ,baseOrganization.getCountyname());
+ if (StringUtils.isNotBlank(baseOrganization.getCountyname())) {
+ wrappers.like(BaseOrganization::getCountyname, baseOrganization.getCountyname());
}
return this.list(wrappers);
}
+ @Override
+ public String getMaxOrganizationID(String organizationid) {
+ return baseOrganizationMapper.getMaxOrganizationID(organizationid);
+
+ }
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
index 2acbe3e..72578eb 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
@@ -54,8 +54,9 @@
@Autowired
private IServiceRelativesconfirmationService serviceRelativesconfirmationService;
- // @Autowired
-// private IServiceDonateflowchartService iServiceDonateflowchartService;
+ @Autowired
+ private IServiceFundflowruleService serviceFundflowruleService;
+
@Autowired
private IServiceEthicalreviewopinionsService iServiceEthicalreviewopinionsService;
@@ -273,13 +274,29 @@
Map<String, Object> map = new ConcurrentHashMap<>();
ServiceDonatebaseinfo serviceDonatebaseinfo = getById(id);
+
if (ObjectUtils.isEmpty(serviceDonatebaseinfo)) {
return null;
}
+
//灏佽serviceDonateorgan娼滃湪鎹愮尞鏁版嵁
Map<String, String> donatebaseinfo = new HashMap<>();
donatebaseinfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getCreateTime()));
donatebaseinfo.put("updatetime", serviceDonatebaseinfo.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getUpdateTime()) : "");
+ donatebaseinfo.put("createperson", null);
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getCreateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceDonatebaseinfo.getCreateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donatebaseinfo.put("createperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+ donatebaseinfo.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getUpdateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceDonatebaseinfo.getUpdateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donatebaseinfo.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ }
donatebaseinfo.put("process", "");
//灏佽serviceDonateorgan娼滃湪鎹愮尞杩斿洖鏁版嵁
map.put("donatebaseinfo", donatebaseinfo);
@@ -293,6 +310,20 @@
if (!CollectionUtils.isEmpty(serviceMedicalevaluations)) {
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("createperson", null);
+ if (StringUtils.isNotBlank(serviceMedicalevaluations.get(0).getCreateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceMedicalevaluations.get(0).getCreateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ medicalevaluation.put("createperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+ medicalevaluation.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceMedicalevaluations.get(0).getUpdateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceMedicalevaluations.get(0).getUpdateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ medicalevaluation.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ }
medicalevaluation.put("process", "");
}
}
@@ -308,6 +339,20 @@
if (!CollectionUtils.isEmpty(serviceRelativesconfirmations)) {
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("createperson", null);
+ if (StringUtils.isNotBlank(serviceRelativesconfirmations.get(0).getCreateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceRelativesconfirmations.get(0).getCreateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ relativesconfirmation.put("createperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+ relativesconfirmation.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceRelativesconfirmations.get(0).getUpdateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceRelativesconfirmations.get(0).getUpdateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ relativesconfirmation.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ }
relativesconfirmation.put("process", "");
}
}
@@ -324,6 +369,20 @@
if (!CollectionUtils.isEmpty(serviceEthicalreviewopinionsList)) {
donateflowcharts.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getCreateTime()));
donateflowcharts.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getUpdateTime()) : "");
+ donateflowcharts.put("createperson", null);
+ if (StringUtils.isNotBlank(serviceEthicalreviewopinionsList.get(0).getCreateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceEthicalreviewopinionsList.get(0).getCreateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donateflowcharts.put("createperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+ donateflowcharts.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceEthicalreviewopinionsList.get(0).getUpdateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceEthicalreviewopinionsList.get(0).getUpdateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donateflowcharts.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ }
donateflowcharts.put("process", "");
}
}
@@ -339,6 +398,21 @@
if (!CollectionUtils.isEmpty(serviceDonateorgans)) {
donateorgansService.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getCreateTime()));
donateorgansService.put("updatetime", serviceDonateorgans.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getUpdateTime()) : "");
+
+ donateorgansService.put("createperson", null);
+ if (StringUtils.isNotBlank(serviceDonateorgans.get(0).getCreateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceDonateorgans.get(0).getCreateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donateorgansService.put("createperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+ donateorgansService.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceDonateorgans.get(0).getUpdateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceDonateorgans.get(0).getUpdateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donateorgansService.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ }
donateorgansService.put("process", "");
}
}
@@ -352,6 +426,22 @@
if (!ObjectUtils.isEmpty(serviceDonationwitness)) {
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("createperson", null);
+ if (StringUtils.isNotBlank(serviceDonationwitness.getCreateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceDonationwitness.getCreateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donationwitness.put("createperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+ donationwitness.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceDonationwitness.getUpdateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceDonationwitness.getUpdateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donationwitness.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+
donationwitness.put("process", "");
}
}
@@ -367,6 +457,22 @@
if (!CollectionUtils.isEmpty(serviceDonatecompletioninfos)) {
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("createperson", null);
+ if (StringUtils.isNotBlank(serviceDonatecompletioninfos.get(0).getCreateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceDonatecompletioninfos.get(0).getCreateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donatecompletioninfo.put("createperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+ donatecompletioninfo.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceDonatecompletioninfos.get(0).getUpdateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceDonatecompletioninfos.get(0).getUpdateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donatecompletioninfo.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+
donatecompletioninfo.put("process", "");
}
}
@@ -377,5 +483,3 @@
return map;
}
}
-
-
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
index 35c0c02..a37c275 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
@@ -32,7 +32,8 @@
LambdaQueryWrapper<ServiceDonorchargeorgan> wrappers = Wrappers.lambdaQuery();
if (serviceDonorchargeorgan.getInfoid() != null) {
wrappers.eq(ServiceDonorchargeorgan::getInfoid, serviceDonorchargeorgan.getInfoid());
- }if (serviceDonorchargeorgan.getDonorchargeid() != null) {
+ }
+ if (serviceDonorchargeorgan.getDonorchargeid() != null) {
wrappers.eq(ServiceDonorchargeorgan::getDonorchargeid, serviceDonorchargeorgan.getDonorchargeid());
}
if (StringUtils.isNotBlank(serviceDonorchargeorgan.getDonorname())) {
@@ -71,9 +72,21 @@
if (serviceDonorchargeorgan.getChargestate() != null) {
wrappers.eq(ServiceDonorchargeorgan::getChargestate, serviceDonorchargeorgan.getChargestate());
}
+ if (serviceDonorchargeorgan.getPaymentid() != null) {
+ wrappers.eq(ServiceDonorchargeorgan::getPaymentid, serviceDonorchargeorgan.getPaymentid());
+ }
if (StringUtils.isNotBlank(serviceDonorchargeorgan.getOrganchargedesc())) {
wrappers.eq(ServiceDonorchargeorgan::getOrganchargedesc, serviceDonorchargeorgan.getOrganchargedesc());
}
+ if (StringUtils.isNotBlank(serviceDonorchargeorgan.getPaymentno())) {
+ wrappers.eq(ServiceDonorchargeorgan::getPaymentno, serviceDonorchargeorgan.getPaymentno());
+ }
+ if (StringUtils.isNotBlank(serviceDonorchargeorgan.getName())) {
+ wrappers.eq(ServiceDonorchargeorgan::getName, serviceDonorchargeorgan.getName());
+ }
+ if (StringUtils.isNotBlank(serviceDonorchargeorgan.getCaseno())) {
+ wrappers.eq(ServiceDonorchargeorgan::getCaseno, serviceDonorchargeorgan.getCaseno());
+ }
return this.list(wrappers);
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/BaseOrganizationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/BaseOrganizationMapper.xml
index ffd79ac..e162041 100644
--- a/ruoyi-project/src/main/resources/mapper/project/BaseOrganizationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/BaseOrganizationMapper.xml
@@ -1,73 +1,110 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.BaseOrganizationMapper">
-
+
<resultMap type="com.ruoyi.project.domain.BaseOrganization" id="BaseOrganizationResult">
- <result property="id" column="ID" />
- <result property="organizationname" column="OrganizationName" />
- <result property="organizationid" column="OrganizationID" />
- <result property="logourl" column="LogoUrl" />
- <result property="registertime" column="RegisterTime" />
- <result property="registeraddress" column="RegisterAddress" />
- <result property="officeplace" column="OfficePlace" />
- <result property="legalperson" column="LegalPerson" />
- <result property="contactperson" column="ContactPerson" />
- <result property="contactnumber" column="ContactNumber" />
- <result property="introduction" column="Introduction" />
- <result property="organizationtype" column="OrganizationType" />
- <result property="hospitalnature" column="HospitalNature" />
- <result property="regionallevel" column="RegionalLevel" />
- <result property="medicalcode" column="MedicalCode" />
- <result property="del_flag" column="del_flag" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="province" column="Province" />
- <result property="provincename" column="ProvinceName" />
- <result property="city" column="City" />
- <result property="cityname" column="CityName" />
- <result property="town" column="Town" />
- <result property="townname" column="TownName" />
- <result property="community" column="Community" />
- <result property="communityname" column="CommunityName" />
- <result property="countycode" column="CountyCode" />
- <result property="countyname" column="CountyName" />
+ <result property="id" column="ID"/>
+ <result property="organizationname" column="OrganizationName"/>
+ <result property="organizationid" column="OrganizationID"/>
+ <result property="logourl" column="LogoUrl"/>
+ <result property="registertime" column="RegisterTime"/>
+ <result property="registeraddress" column="RegisterAddress"/>
+ <result property="officeplace" column="OfficePlace"/>
+ <result property="legalperson" column="LegalPerson"/>
+ <result property="contactperson" column="ContactPerson"/>
+ <result property="contactnumber" column="ContactNumber"/>
+ <result property="introduction" column="Introduction"/>
+ <result property="organizationtype" column="OrganizationType"/>
+ <result property="hospitalnature" column="HospitalNature"/>
+ <result property="regionallevel" column="RegionalLevel"/>
+ <result property="medicalcode" column="MedicalCode"/>
+ <result property="del_flag" column="del_flag"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="province" column="Province"/>
+ <result property="provincename" column="ProvinceName"/>
+ <result property="city" column="City"/>
+ <result property="cityname" column="CityName"/>
+ <result property="town" column="Town"/>
+ <result property="townname" column="TownName"/>
+ <result property="community" column="Community"/>
+ <result property="communityname" column="CommunityName"/>
+ <result property="countycode" column="CountyCode"/>
+ <result property="countyname" column="CountyName"/>
</resultMap>
<sql id="selectBaseOrganizationVo">
- select ID, OrganizationName, OrganizationID, LogoUrl, RegisterTime, RegisterAddress, OfficePlace, LegalPerson, ContactPerson, ContactNumber, Introduction, OrganizationType, HospitalNature, RegionalLevel, MedicalCode, del_flag, create_by, create_time, update_by, update_time, Province, ProvinceName, City, CityName, Town, TownName, Community, CommunityName, CountyCode, CountyName from base_organization
+ select ID,
+ OrganizationName,
+ OrganizationID,
+ LogoUrl,
+ RegisterTime,
+ RegisterAddress,
+ OfficePlace,
+ LegalPerson,
+ ContactPerson,
+ ContactNumber,
+ Introduction,
+ OrganizationType,
+ HospitalNature,
+ RegionalLevel,
+ MedicalCode,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ Province,
+ ProvinceName,
+ City,
+ CityName,
+ Town,
+ TownName,
+ Community,
+ CommunityName,
+ CountyCode,
+ CountyName
+ from base_organization
</sql>
<select id="selectBaseOrganizationList" parameterType="BaseOrganization" resultMap="BaseOrganizationResult">
<include refid="selectBaseOrganizationVo"/>
<where>
- <if test="organizationname != null and organizationname != ''"> and OrganizationName like concat('%', #{organizationname}, '%')</if>
- <if test="organizationid != null and organizationid != ''"> and OrganizationID = #{organizationid}</if>
- <if test="logourl != null and logourl != ''"> and LogoUrl = #{logourl}</if>
- <if test="registertime != null "> and RegisterTime = #{registertime}</if>
- <if test="registeraddress != null and registeraddress != ''"> and RegisterAddress = #{registeraddress}</if>
- <if test="officeplace != null and officeplace != ''"> and OfficePlace = #{officeplace}</if>
- <if test="legalperson != null and legalperson != ''"> and LegalPerson = #{legalperson}</if>
- <if test="contactperson != null and contactperson != ''"> and ContactPerson = #{contactperson}</if>
- <if test="contactnumber != null and contactnumber != ''"> and ContactNumber = #{contactnumber}</if>
- <if test="introduction != null and introduction != ''"> and Introduction = #{introduction}</if>
- <if test="organizationtype != null and organizationtype != ''"> and OrganizationType = #{organizationtype}</if>
- <if test="hospitalnature != null and hospitalnature != ''"> and HospitalNature = #{hospitalnature}</if>
- <if test="regionallevel != null and regionallevel != ''"> and RegionalLevel = #{regionallevel}</if>
- <if test="medicalcode != null and medicalcode != ''"> and MedicalCode = #{medicalcode}</if>
- <if test="province != null and province != ''"> and Province = #{province}</if>
- <if test="provincename != null and provincename != ''"> and ProvinceName like concat('%', #{provincename}, '%')</if>
- <if test="city != null and city != ''"> and City = #{city}</if>
- <if test="cityname != null and cityname != ''"> and CityName like concat('%', #{cityname}, '%')</if>
- <if test="town != null and town != ''"> and Town = #{town}</if>
- <if test="townname != null and townname != ''"> and TownName like concat('%', #{townname}, '%')</if>
- <if test="community != null and community != ''"> and Community = #{community}</if>
- <if test="communityname != null and communityname != ''"> and CommunityName like concat('%', #{communityname}, '%')</if>
- <if test="countycode != null and countycode != ''"> and CountyCode = #{countycode}</if>
- <if test="countyname != null and countyname != ''"> and CountyName like concat('%', #{countyname}, '%')</if>
+ <if test="organizationname != null and organizationname != ''">and OrganizationName like concat('%',
+ #{organizationname}, '%')
+ </if>
+ <if test="organizationid != null and organizationid != ''">and OrganizationID = #{organizationid}</if>
+ <if test="logourl != null and logourl != ''">and LogoUrl = #{logourl}</if>
+ <if test="registertime != null ">and RegisterTime = #{registertime}</if>
+ <if test="registeraddress != null and registeraddress != ''">and RegisterAddress = #{registeraddress}</if>
+ <if test="officeplace != null and officeplace != ''">and OfficePlace = #{officeplace}</if>
+ <if test="legalperson != null and legalperson != ''">and LegalPerson = #{legalperson}</if>
+ <if test="contactperson != null and contactperson != ''">and ContactPerson = #{contactperson}</if>
+ <if test="contactnumber != null and contactnumber != ''">and ContactNumber = #{contactnumber}</if>
+ <if test="introduction != null and introduction != ''">and Introduction = #{introduction}</if>
+ <if test="organizationtype != null and organizationtype != ''">and OrganizationType = #{organizationtype}
+ </if>
+ <if test="hospitalnature != null and hospitalnature != ''">and HospitalNature = #{hospitalnature}</if>
+ <if test="regionallevel != null and regionallevel != ''">and RegionalLevel = #{regionallevel}</if>
+ <if test="medicalcode != null and medicalcode != ''">and MedicalCode = #{medicalcode}</if>
+ <if test="province != null and province != ''">and Province = #{province}</if>
+ <if test="provincename != null and provincename != ''">and ProvinceName like concat('%', #{provincename},
+ '%')
+ </if>
+ <if test="city != null and city != ''">and City = #{city}</if>
+ <if test="cityname != null and cityname != ''">and CityName like concat('%', #{cityname}, '%')</if>
+ <if test="town != null and town != ''">and Town = #{town}</if>
+ <if test="townname != null and townname != ''">and TownName like concat('%', #{townname}, '%')</if>
+ <if test="community != null and community != ''">and Community = #{community}</if>
+ <if test="communityname != null and communityname != ''">and CommunityName like concat('%',
+ #{communityname}, '%')
+ </if>
+ <if test="countycode != null and countycode != ''">and CountyCode = #{countycode}</if>
+ <if test="countyname != null and countyname != ''">and CountyName like concat('%', #{countyname}, '%')</if>
</where>
</select>
@@ -76,7 +113,8 @@
where OrganizationID = #{hospitalNo}
</select>
<select id="getOrganizationByCity" resultType="java.lang.Integer">
- select count(*) from base_organization
+ select count(*)
+ from base_organization
where City = #{cityNumber}
</select>
@@ -92,8 +130,16 @@
where OrganizationType = "4"
</select>
<select id="getNameByNo" resultType="java.lang.String">
- select OrganizationName from base_organization
- where OrganizationID =#{orgno}
+ select OrganizationName
+ from base_organization
+ where OrganizationID = #{orgno}
+ </select>
+
+ <select id="getMaxOrganizationID" resultType="java.lang.String">
+ select max(OrganizationID)
+ from base_organization
+ where OrganizationID like concat(#{organizationid})
+
</select>
</mapper>
\ No newline at end of file
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
index ee88a75..5c87490 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
@@ -7,6 +7,8 @@
<resultMap type="com.ruoyi.project.domain.ServiceDonorchargeorgan" id="ServiceDonorchargeorganResult">
<result property="id" column="ID"/>
<result property="donorchargeid" column="donorchargeid"/>
+ <result property="paymentid" column="paymentid"/>
+ <result property="paymentno" column="paymentno"/>
<result property="donorname" column="donorname"/>
<result property="hospitalname" column="HospitalName"/>
<result property="hospitalno" column="HospitalNo"/>
@@ -25,11 +27,16 @@
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
+ <result property="caseno" column="caseno"/>
+ <result property="name" column="name"/>
+ <result property="annexFiles" column="annex_files"/>
</resultMap>
<sql id="selectServiceDonorchargeorganVo">
select ID,
donorchargeid,
+ paymentid,
+ paymentno,
InfoID,
donorname,
HospitalName,
@@ -48,7 +55,10 @@
create_by,
create_time,
update_by,
- update_time
+ update_time,
+ caseno,
+ name,
+ annex_files
from service_donorchargeorgan
</sql>
@@ -57,6 +67,8 @@
<include refid="selectServiceDonorchargeorganVo"/>
<where>
<if test="infoid != null ">and InfoID = #{infoid}</if>
+ <if test="paymentid != null ">and paymentid = #{paymentid}</if>
+ <if test="paymentno != null ">and paymentno = #{paymentno}</if>
<if test="donorchargeid != null ">and donorchargeID = #{donorchargeid}</if>
<if test="donorname != null and donorname != ''">and donorname like concat('%', #{donorname}, '%')</if>
<if test="hospitalname != null and hospitalname != ''">and HospitalName like concat('%', #{hospitalname},
--
Gitblit v1.9.3