From 9c9b4bec68df57356425441c62466651150e3b6e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 14 三月 2024 09:28:51 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java | 110 +++
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java | 41 +
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundtaxMapper.java | 24
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonateorganMapper.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java | 23
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java | 579 ++++++++++++++++++-
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java | 6
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml | 3
ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml | 125 ++--
ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml | 135 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java | 21
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java | 84 --
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java | 6
ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml | 43 +
ruoyi-project/src/main/resources/mapper/project/ServiceOrganallocationMapper.xml | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceOrganallocation.java | 11
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 14
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundtaxService.java | 24
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 120 ++-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java | 133 ++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java | 191 ++++++
22 files changed, 1,455 insertions(+), 244 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
index 2ac03a4..7bceb2a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
@@ -55,17 +55,18 @@
public TableDataInfo list(ServiceDonateorgan serviceDonateorgan) {
startPage();
List<ServiceDonateorgan> list = serviceDonateorganService.queryList(serviceDonateorgan);
- if (!CollectionUtils.isEmpty(list)) {
- List<ServiceDonateorganVO> serviceDonateorganVOS = DtoConversionUtils.sourceToTarget(list, ServiceDonateorganVO.class);
-// for (ServiceDonateorganVO serviceDonateorganVO : serviceDonateorganVOS) {
-// ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
-// serviceOrganallocation.setOrganid(serviceDonateorganVO.getId());
-// List<ServiceOrganallocation> serviceOrganallocations = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation);
-// serviceDonateorganVO.setServiceOrganallocations(serviceOrganallocations);
-// }
- return getDataTable(serviceDonateorganVOS);
- }
+ return getDataTable(list);
+ }
+
+ /**
+ * 鍣ㄥ畼鍒嗛厤绱
+ */
+ @ApiOperation("鍣ㄥ畼鍒嗛厤绱")
+ @GetMapping("/countList")
+ public TableDataInfo countList(ServiceDonateorgan serviceDonateorgan) {
+ startPage();
+ List<ServiceDonateorgan> list = serviceDonateorganService.countList(serviceDonateorgan);
return getDataTable(list);
}
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 63356ee..3cdcc28 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
@@ -6,9 +6,12 @@
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.page.TableSupport;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -63,8 +66,7 @@
serviceDonorchargeorganVO.setAnnexFilesList(rbDetailFiles);
}
}
-
- return getDataTable(serviceDonorchargeorganVOList);
+ return getDataTable2(serviceDonorchargeorganVOList, list);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java
new file mode 100644
index 0000000..40d4b46
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java
@@ -0,0 +1,110 @@
+package com.ruoyi.web.controller.project;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+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.poi.ExcelUtil;
+import com.ruoyi.project.domain.ServiceFundtax;
+import com.ruoyi.project.service.IServiceFundtaxService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 涓撳璐圭敤绠楃◣鐢宠涓籆ontroller
+ *
+ * @author ruoyi
+ * @date 2024-03-13
+ */
+@Api("涓撳璐圭敤绠楃◣鐢宠涓�")
+@RestController
+@RequestMapping("/system/fundtax")
+public class ServiceFundtaxController extends BaseController
+{
+ @Autowired
+ private IServiceFundtaxService serviceFundtaxService;
+
+ /**
+ * 鏌ヨ涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�
+ */
+ @ApiOperation("鏌ヨ涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�")
+ @PreAuthorize("@ss.hasPermi('system:fundtax:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(ServiceFundtax serviceFundtax)
+ {
+ startPage();
+ List<ServiceFundtax> list = serviceFundtaxService.queryList(serviceFundtax);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�
+ */
+ @ApiOperation("瀵煎嚭涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�")
+ @PreAuthorize("@ss.hasPermi('system:fundtax:export')")
+ @Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(ServiceFundtax serviceFundtax)
+ {
+ List<ServiceFundtax> list = serviceFundtaxService.queryList(serviceFundtax);
+ ExcelUtil<ServiceFundtax> util = new ExcelUtil<ServiceFundtax>(ServiceFundtax.class);
+ return util.exportExcel(list, "涓撳璐圭敤绠楃◣鐢宠涓绘暟鎹�");
+ }
+
+ /**
+ * 鑾峰彇涓撳璐圭敤绠楃◣鐢宠涓昏缁嗕俊鎭�
+ */
+ @ApiOperation("鑾峰彇涓撳璐圭敤绠楃◣鐢宠涓昏缁嗕俊鎭�")
+ @PreAuthorize("@ss.hasPermi('system:fundtax:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return AjaxResult.success(serviceFundtaxService.getById(id));
+ }
+
+ /**
+ * 鏂板涓撳璐圭敤绠楃◣鐢宠涓�
+ */
+ @ApiOperation("鏂板涓撳璐圭敤绠楃◣鐢宠涓�")
+ @PreAuthorize("@ss.hasPermi('system:fundtax:add')")
+ @Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.INSERT)
+ @PostMapping
+ @RepeatSubmit
+ public AjaxResult add(@RequestBody ServiceFundtax serviceFundtax)
+ {
+ return toAjax(serviceFundtaxService.save(serviceFundtax));
+ }
+
+ /**
+ * 淇敼涓撳璐圭敤绠楃◣鐢宠涓�
+ */
+ @ApiOperation("淇敼涓撳璐圭敤绠楃◣鐢宠涓�")
+ @PreAuthorize("@ss.hasPermi('system:fundtax:edit')")
+ @Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.UPDATE)
+ @PutMapping
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceFundtax serviceFundtax)
+ {
+ return toAjax(serviceFundtaxService.updateById(serviceFundtax));
+ }
+
+ /**
+ * 鍒犻櫎涓撳璐圭敤绠楃◣鐢宠涓�
+ */
+ @ApiOperation("鍒犻櫎涓撳璐圭敤绠楃◣鐢宠涓�")
+ @PreAuthorize("@ss.hasPermi('system:fundtax:remove')")
+ @Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(serviceFundtaxService.removeByIds(Arrays.asList(ids)));
+ }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index fa43c44..fdc90ae 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -91,6 +91,20 @@
}
/**
+ * 鍝嶅簲璇锋眰鍒嗛〉鏁版嵁
+ */
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ protected TableDataInfo getDataTable2(List<?> list,List<?> list2)
+ {
+ TableDataInfo rspData = new TableDataInfo();
+ rspData.setCode(HttpStatus.SUCCESS);
+ rspData.setMsg("鏌ヨ鎴愬姛");
+ rspData.setRows(list);
+ rspData.setTotal(new PageInfo(list2).getTotal());
+ return rspData;
+ }
+
+ /**
* 鍝嶅簲鎵归噺淇濆瓨鏁版嵁
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
new file mode 100644
index 0000000..2cec013
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
@@ -0,0 +1,41 @@
+package com.ruoyi.common.utils;
+
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.common.core.page.PageDomain;
+import com.ruoyi.common.core.page.TableSupport;
+import com.ruoyi.common.utils.sql.SqlUtil;
+
+/**
+ * 鍒嗛〉宸ュ叿绫�
+ *
+ * @author ruoyi
+ */
+public class PageUtils extends PageHelper {
+ /**
+ * 璁剧疆璇锋眰鍒嗛〉鏁版嵁
+ */
+ public static void startPage() {
+ PageDomain pageDomain = TableSupport.buildPageRequest();
+ Integer pageNum = pageDomain.getPageNum();
+ Integer pageSize = pageDomain.getPageSize();
+ String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+ Boolean reasonable = pageDomain.getReasonable();
+ PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
+ }
+
+ /**
+ * 璁剧疆璇锋眰鍒嗛〉鏁版嵁
+ */
+ public static void startPageByPost(Integer pageNum, Integer pageSize) {
+ if (pageNum == null) pageNum = 1;
+ if (pageSize == null) pageSize = 10;
+ PageHelper.startPage(pageNum, pageSize, "").setReasonable(true);
+ }
+
+ /**
+ * 娓呯悊鍒嗛〉鐨勭嚎绋嬪彉閲�
+ */
+ public static void clearPage() {
+ PageHelper.clearPage();
+ }
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
index 9330b0e..efed42a 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.domain;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
@@ -317,5 +318,27 @@
private String caseno;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date starttime;
+
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date endtime;
+
+ @TableField(exist = false)
+ private String city;
+
+ /**
+ * 鎶ュ憡鑰呯紪鍙�
+ */
+ @TableField(exist = false)
+ private String reporterno;
+
+
}
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
index bed40be..fb08ee6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java
@@ -98,8 +98,8 @@
* 璐圭敤褰曞叆鏃堕棿
*/
@ApiModelProperty("璐圭敤褰曞叆鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "璐圭敤褰曞叆鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "璐圭敤褰曞叆鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date organtime;
/**
@@ -177,7 +177,7 @@
* 鎺ユ敹鏃ユ湡
*/
@ApiModelProperty("鎺ユ敹鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date receiveTime;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java
new file mode 100644
index 0000000..8211f58
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java
@@ -0,0 +1,191 @@
+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;
+
+/**
+ * 涓撳璐圭敤绠楃◣鐢宠涓诲璞� service_fundtax
+ *
+ * @author ruoyi
+ * @date 2024-03-13
+ */
+@Data
+@ApiModel("涓撳璐圭敤绠楃◣鐢宠涓�")
+public class ServiceFundtax extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 涓婚敭id */
+ @ApiModelProperty("涓婚敭id")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /** 鐢宠缂栧彿 */
+ @ApiModelProperty("鐢宠缂栧彿")
+ @Excel(name = "鐢宠缂栧彿")
+ private String applyno;
+
+ /** 绠楃◣鏃堕棿 */
+ @ApiModelProperty("绠楃◣鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "绠楃◣鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date taxedtime;
+
+ /** 鐢宠浜虹紪鍙� */
+ @ApiModelProperty("鐢宠浜虹紪鍙�")
+ @Excel(name = "鐢宠浜虹紪鍙�")
+ private String userno;
+
+ /** 鐢宠浜哄鍚� */
+ @ApiModelProperty("鐢宠浜哄鍚�")
+ @Excel(name = "鐢宠浜哄鍚�")
+ private String username;
+
+ /** 閮ㄩ棬缂栧彿 */
+ @ApiModelProperty("閮ㄩ棬缂栧彿")
+ @Excel(name = "閮ㄩ棬缂栧彿")
+ private String deptmentno;
+
+ /** 閮ㄩ棬鍚嶇О */
+ @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ @Excel(name = "閮ㄩ棬鍚嶇О")
+ private String deptmentname;
+
+ /** 閮ㄩ棬涓荤宸ュ彿 */
+ @ApiModelProperty("閮ㄩ棬涓荤宸ュ彿")
+ @Excel(name = "閮ㄩ棬涓荤宸ュ彿")
+ private String managerno;
+
+ /** 閮ㄩ棬涓荤鍚嶅瓧 */
+ @ApiModelProperty("閮ㄩ棬涓荤鍚嶅瓧")
+ @Excel(name = "閮ㄩ棬涓荤鍚嶅瓧")
+ private String managername;
+
+ /** 绋庡墠閲戦鍚堣 */
+ @ApiModelProperty("绋庡墠閲戦鍚堣")
+ @Excel(name = "绋庡墠閲戦鍚堣")
+ private BigDecimal pretaxamount;
+
+ /** 绋庡悗閲戦鍚堣 */
+ @ApiModelProperty("绋庡悗閲戦鍚堣")
+ @Excel(name = "绋庡悗閲戦鍚堣")
+ private BigDecimal taxedamount;
+
+ /** 璐圭敤鎬婚噾棰� */
+ @ApiModelProperty("璐圭敤鎬婚噾棰�")
+ @Excel(name = "璐圭敤鎬婚噾棰�")
+ private BigDecimal taxamount;
+
+ /** 鍖诲鎴愭湰鍚堣 */
+ @ApiModelProperty("鍖诲鎴愭湰鍚堣")
+ @Excel(name = "鍖诲鎴愭湰鍚堣")
+ private BigDecimal medicalcost;
+
+ /** 閬椾綋淇鏀寔鎴愭湰鍚堣 */
+ @ApiModelProperty("閬椾綋淇鏀寔鎴愭湰鍚堣")
+ @Excel(name = "閬椾綋淇鏀寔鎴愭湰鍚堣")
+ private BigDecimal bodymaintaincost;
+
+ /** 鍣ㄥ畼鑾峰彇鎴愭湰鍚堣 */
+ @ApiModelProperty("鍣ㄥ畼鑾峰彇鎴愭湰鍚堣")
+ @Excel(name = "鍣ㄥ畼鑾峰彇鎴愭湰鍚堣")
+ private BigDecimal organgaincost;
+
+ /** 鍣ㄥ畼鍖诲鏀寔鎴愭湰 */
+ @ApiModelProperty("鍣ㄥ畼鍖诲鏀寔鎴愭湰")
+ @Excel(name = "鍣ㄥ畼鍖诲鏀寔鎴愭湰")
+ private BigDecimal organmaintaincost;
+
+ /** 璁板綍鐘舵�� */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private Long recordstatus;
+
+ /** 棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡 */
+ @ApiModelProperty("棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
+ @Excel(name = "棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
+ private Long checkstatus;
+
+ /** 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑 */
+ @ApiModelProperty("褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑")
+ @Excel(name = "褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑")
+ private Long flowlevel;
+
+ /** 璐㈠姟閫�鍥�199锛涗笂浼犲尰闄�100锛� */
+ @ApiModelProperty("璐㈠姟閫�鍥�199锛涗笂浼犲尰闄�100锛�")
+ @Excel(name = "璐㈠姟閫�鍥�199锛涗笂浼犲尰闄�100锛�")
+ private Long backflowlevel;
+
+ /** 鍙戞斁鐘舵�� */
+ @ApiModelProperty("鍙戞斁鐘舵��")
+ @Excel(name = "鍙戞斁鐘舵��")
+ private String isdistribute;
+
+ /** 浠樻鏃ユ湡 */
+ @ApiModelProperty("浠樻鏃ユ湡")
+ @Excel(name = "浠樻鏃ユ湡")
+ private String riqi;
+
+ /** 涓績绛惧瓧 */
+ @ApiModelProperty("涓績绛惧瓧")
+ @Excel(name = "涓績绛惧瓧")
+ private String opochecker;
+
+ /** 璐㈠姟鍓櫌闀跨瀛� */
+ @ApiModelProperty("璐㈠姟鍓櫌闀跨瀛�")
+ @Excel(name = "璐㈠姟鍓櫌闀跨瀛�")
+ private String finvicepresident;
+
+ /** 涓氬姟鍓櫌闀跨瀛� */
+ @ApiModelProperty("涓氬姟鍓櫌闀跨瀛�")
+ @Excel(name = "涓氬姟鍓櫌闀跨瀛�")
+ private String busvicepresident;
+
+ /** 闄㈤暱瀹℃壒 */
+ @ApiModelProperty("闄㈤暱瀹℃壒")
+ @Excel(name = "闄㈤暱瀹℃壒")
+ private String president;
+
+ /** 鍔炲叕瀹や富浠荤瀛� */
+ @ApiModelProperty("鍔炲叕瀹や富浠荤瀛�")
+ @Excel(name = "鍔炲叕瀹や富浠荤瀛�")
+ private String officedirector;
+
+ /** 璐㈠姟瀹や富浠荤瀛� */
+ @ApiModelProperty("璐㈠姟瀹や富浠荤瀛�")
+ @Excel(name = "璐㈠姟瀹や富浠荤瀛�")
+ private String financedirector;
+
+ /** 璐㈠姟瀹℃牳 */
+ @ApiModelProperty("璐㈠姟瀹℃牳")
+ @Excel(name = "璐㈠姟瀹℃牳")
+ private String financechecher;
+
+ /** 鏁版嵁鏄惁鍏佽杩涘叆shared琛� 0锛氬惁 1锛氭槸锛�2锛氬凡杩涘叆 */
+ @ApiModelProperty("鏁版嵁鏄惁鍏佽杩涘叆shared琛� 0锛氬惁 1锛氭槸锛�2锛氬凡杩涘叆")
+ @Excel(name = "鏁版嵁鏄惁鍏佽杩涘叆shared琛� 0锛氬惁 1锛氭槸锛�2锛氬凡杩涘叆")
+ private String uploadflag;
+
+ /** 涓婁紶鏃堕棿 */
+ @ApiModelProperty("涓婁紶鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "涓婁紶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date uploadtime;
+
+ /** 鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐� */
+ @ApiModelProperty("鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐�")
+ @Excel(name = "鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐�")
+ private String updownremark;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceOrganallocation.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceOrganallocation.java
index e0de834..f489ea9 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceOrganallocation.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceOrganallocation.java
@@ -1,14 +1,9 @@
package com.ruoyi.project.domain;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
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;
@@ -16,6 +11,8 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+
/**
* 鍣ㄥ畼鍒嗛厤瀵硅薄 service_organallocation
*
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java
index 6e60c6e..e1083d9 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java
@@ -1,90 +1,595 @@
package com.ruoyi.project.domain.vo;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+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.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@Data
-public class EthicalReviewVO {
+public class EthicalReviewVO extends BaseEntity {
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty("$column.columnComment")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ @TableId(type = IdType.AUTO)
private Long id;
- private String donorno;
- private String recordstate;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
private String name;
+
+ /**
+ * 鎬у埆
+ */
+ @ApiModelProperty("鎬у埆")
private String sex;
- //private Long idcardtype;
+
+ /**
+ * 璇佷欢绫诲瀷
+ */
+ @ApiModelProperty("璇佷欢绫诲瀷")
+ private Long idcardtype;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
private String idcardno;
+
+ /**
+ * 骞撮緞
+ */
+ @ApiModelProperty("骞撮緞")
private Long age;
- private String birthday;
+
+ /**
+ * 骞撮緞鍗曚綅
+ */
+ @ApiModelProperty("骞撮緞鍗曚綅")
+ private String ageunit;
+
+ /**
+ * 鍑虹敓鏃ユ湡
+ */
+ @ApiModelProperty("鍑虹敓鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date birthday;
+
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
+ @ApiModelProperty("鑱旂郴鐢佃瘽")
+ private String phone;
+
+ /**
+ * 鐜颁綇鍦板潃
+ */
+ @ApiModelProperty("鐜颁綇鍦板潃")
+ private String residenceaddress;
+
+ /**
+ * 鍥界睄
+ */
+ @ApiModelProperty("鍥界睄")
private String nationality;
+
+ /**
+ * 鐪�(鍖�/甯�)
+ */
+ @ApiModelProperty("鐪�(鍖�/甯�)")
+ @Excel(name = "鐪�(鍖�/甯�)")
+ private String residenceprovince;
+
+ /**
+ * 绫嶈疮
+ */
+ @ApiModelProperty("绫嶈疮")
+ @Excel(name = "绫嶈疮")
+ private String nativeplace;
+
+ /**
+ * 鐜颁綇鍦板潃鐪佸悕绉�
+ */
+ @ApiModelProperty("鐜颁綇鍦板潃鐪佸悕绉�")
+ private String residenceprovincename;
+
+ /**
+ * 姘戞棌
+ */
+ @ApiModelProperty("姘戞棌")
private String nation;
+
+ /**
+ * 鑱屼笟
+ */
+ @ApiModelProperty("鑱屼笟")
+ private String occupation;
+
+ /**
+ * 甯�(宸�)
+ */
+ @ApiModelProperty("甯�(宸�)")
+ private String residencecity;
+
+ /**
+ * 甯傚悕绉�
+ */
+ @ApiModelProperty("甯傚悕绉�")
+ private String residencecityname;
+
+ /**
+ * 瀛﹀巻
+ */
+ @ApiModelProperty("瀛﹀巻")
+ private String education;
+
+ /**
+ * 鍘匡紙甯�/鍖猴級
+ */
+ @ApiModelProperty("鍘匡紙甯�/鍖猴級")
+ private String residencetown;
+
+ /**
+ * 鎵�灞炶閬擄紙闀囷級鍚嶇О
+ */
+ @ApiModelProperty("鎵�灞炶閬擄紙闀囷級鍚嶇О")
+ private String residencetownname;
+
+ /**
+ * 绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+ */
+ @ApiModelProperty("绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
+ private String residencecommunity;
+
+ /**
+ * 绀惧尯锛堟潙锛夊悕绉�
+ */
+ @ApiModelProperty("绀惧尯锛堟潙锛夊悕绉�")
+ private String residencecommunityname;
+
+ /**
+ * 鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+ */
+ @ApiModelProperty("鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
+ private String residencecountycode;
+
+ /**
+ * 鎵�灞炲尯鍩熷悕绉�
+ */
+ @ApiModelProperty("鎵�灞炲尯鍩熷悕绉�")
+ private String residencecountyname;
+
+ /**
+ * 鎴风睄鍦板潃
+ */
+ @ApiModelProperty("鎴风睄鍦板潃")
private String registeraddress;
+
+ /**
+ * 鐪�(鍖�/甯�)
+ */
+ @ApiModelProperty("鐪�(鍖�/甯�)")
private String registerprovince;
+
+ /**
+ * 鎴风睄鍦板潃鐪佸悕绉�
+ */
+ @ApiModelProperty("鎴风睄鍦板潃鐪佸悕绉�")
private String registerprovincename;
+
+ /**
+ * 甯�(宸�)
+ */
+ @ApiModelProperty("甯�(宸�)")
private String registercity;
+
+ /**
+ * 甯傚悕绉�
+ */
+ @ApiModelProperty("甯傚悕绉�")
private String registercityname;
+
+ /**
+ * 鍘匡紙甯�/鍖猴級
+ */
+ @ApiModelProperty("鍘匡紙甯�/鍖猴級")
private String registertown;
+
+ /**
+ * 鎵�灞炶閬擄紙闀囷級鍚嶇О
+ */
+ @ApiModelProperty("鎵�灞炶閬擄紙闀囷級鍚嶇О")
private String registertownname;
+
+ /**
+ * 绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+ */
+ @ApiModelProperty("绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
private String registercommunity;
+
+ /**
+ * 绀惧尯锛堟潙锛夊悕绉�
+ */
+ @ApiModelProperty("绀惧尯锛堟潙锛夊悕绉�")
private String registercommunityname;
+
+ /**
+ * 鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+ */
+ @ApiModelProperty("鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
private String registercountycode;
+
+ /**
+ * 鎵�灞炲尯鍩熷悕绉�
+ */
+ @ApiModelProperty("鎵�灞炲尯鍩熷悕绉�")
private String registercountyname;
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+
+ /**
+ * 娌荤枟鍖婚櫌
+ */
+ @ApiModelProperty("娌荤枟鍖婚櫌")
private String treatmenthospitalno;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋�")
+ @Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋�")
private String treatmenthospitalname;
+
+ /**
+ * 绉戝
+ */
+ @ApiModelProperty("绉戝")
private String treatmentdeptname;
+
+ /**
+ * 鐤剧梾璇婃柇
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇")
private String diagnosisno;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
private String diagnosisname;
- private String reporterno;
- private String reportername;
- private String reporterphone;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date reporttime;
+
+ /**
+ * 琛�鍨�
+ */
+ @ApiModelProperty("琛�鍨� ")
private String bloodtype;
- private Long rhyin;
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty("浣忛櫌鍙�")
private String inpatientno;
+
+ /**
+ * Rh闃存��
+ */
+ @ApiModelProperty("Rh闃存��")
+ private String rhyin;
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /**
+ * 鎹愮尞绫诲埆
+ */
+ @ApiModelProperty("鎹愮尞绫诲埆")
+ private String donationcategory;
+
+ /**
+ * 鐥呮儏姒傚喌
+ */
+ @ApiModelProperty("鐥呮儏姒傚喌")
private String illnessoverview;
+
+ /**
+ * 鐤剧梾绫诲瀷
+ */
+ @ApiModelProperty("鐤剧梾绫诲瀷")
private String diseasetype;
+
+ /**
+ * 浼犳煋鐥呮儏鍐�
+ */
+ @ApiModelProperty("浼犳煋鐥呮儏鍐�")
+ private String infectious;
+
+ /**
+ * 鏈汉鎰忔効
+ */
+ @ApiModelProperty("鏈汉鎰忔効 ")
+ private String selfwill;
+
+ /**
+ * 鍏朵粬鎯呭喌
+ */
+ @ApiModelProperty("鍏朵粬鎯呭喌")
+ private String othercases;
+
+ /**
+ * 浜插睘鎰忔効
+ */
+ @ApiModelProperty("浜插睘鎰忔効")
+ private Long kinshipwill;
+
+ /**
+ * 鍏朵粬
+ */
+ @ApiModelProperty("鍏朵粬")
+ private String diseasetypeOther;
+
+ /**
+ * 浜插睘鍏崇郴鐘跺喌
+ */
+ @ApiModelProperty("浜插睘鍏崇郴鐘跺喌")
+ private String kinship;
+
+ /**
+ * 淇℃伅鏉ユ簮
+ */
+ @ApiModelProperty("淇℃伅鏉ユ簮")
+ private String infosources;
+
+ /**
+ * 绾㈠崄瀛椾細鏈烘瀯缂栧彿 閫夎嚜鏈烘瀯琛�
+ */
+ @ApiModelProperty("绾㈠崄瀛椾細鏈烘瀯缂栧彿 閫夎嚜鏈烘瀯琛�")
+ private String redorganno;
+
+ /**
+ * 绾㈠崄瀛椾細鏈烘瀯鍚嶇О
+ */
+ @ApiModelProperty("绾㈠崄瀛椾細鏈烘瀯鍚嶇О")
+ private String redorganname;
+
+ /**
+ * 绾㈠崄瀛椾細鑱旂郴浜�
+ */
+ @ApiModelProperty("绾㈠崄瀛椾細鑱旂郴浜�")
+ private String contactperson;
+
+ /**
+ * 鍏朵粬
+ */
+ @ApiModelProperty("鍏朵粬")
+ private String infectiousOther;
+
+ /**
+ * 绾㈠崄瀛椾細鑱旂郴鐢佃瘽
+ */
+ @ApiModelProperty("绾㈠崄瀛椾細鑱旂郴鐢佃瘽")
+ private String contactnumber;
+
+ /**
+ * 鎶ュ憡鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎶ュ憡鑰呯紪鍙�")
+ private String reporterno;
+
+ /**
+ * 鎶ュ憡鑰呭鍚�
+ */
+ @ApiModelProperty("鎶ュ憡鑰呭鍚�")
+ @Excel(name = "鎶ュ憡鑰呭鍚�")
+ private String reportername;
+
+ /**
+ * 鐥呬汉鐘跺喌
+ */
+ @ApiModelProperty("鐥呬汉鐘跺喌")
private String patientstate;
- private Long fcid;
-// private String expertopinion;
-// private String expertconclusion;
-// private String expertname;
-// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-// private Date conclusiontime;
-// private String conclusionannex;
-// private String conclusionorder;
- private Long infoid;
- private String fcdonorno;
- private String flowname;
- private String flowannex;
- private String flowcontent;
- private String flowconclusion;
- private Long delFlag;
- private String createBy;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createTime;
- private String updateBy;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateTime;
+ /**
+ * 鎶ュ憡鑰呰仈绯荤數璇�
+ */
+ @ApiModelProperty("鎶ュ憡鑰呰仈绯荤數璇�")
+ private String reporterphone;
- private String basecreateby;
+ /**
+ * 淇℃伅鏉ユ簮鍏朵粬
+ */
+ @ApiModelProperty("淇℃伅鏉ユ簮鍏朵粬")
+ private String infosourcesOther;
+
+ /**
+ * 鎶ュ憡鏃堕棿
+ */
+ @ApiModelProperty("鎶ュ憡鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鎶ュ憡鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date reporttime;
+
+ /**
+ * 鍏朵粬
+ */
+ @ApiModelProperty("鍏朵粬")
+ private String kinshipOther;
+
+ /**
+ * 涓昏浜插睘
+ */
+ @ApiModelProperty("涓昏浜插睘")
+ private String majorrelatives;
+
+ /**
+ * 涓庢崘璧犺�呭叧绯�
+ */
+ @ApiModelProperty("涓庢崘璧犺�呭叧绯�")
+ private String familyrelations;
+
+ /**
+ * 鑾峰彇缁勭粐缂栧彿
+ */
+ @ApiModelProperty("鑾峰彇缁勭粐缂栧彿")
+ private String acquisitiontissueno;
+
+ /**
+ * 鑾峰彇缁勭粐鍚嶇О
+ */
+ @ApiModelProperty("鑾峰彇缁勭粐鍚嶇О")
+ private String acquisitiontissuename;
+
+ /**
+ * 淇℃伅鍛樺鍚�
+ */
+ @ApiModelProperty("淇℃伅鍛樺鍚�")
+ private String infoname;
+
+ /**
+ * 淇℃伅鍛樿仈绯绘柟寮�
+ */
+ @ApiModelProperty("淇℃伅鍛樿仈绯绘柟寮�")
+ private String infophone;
+
+ /**
+ * 鑱旂郴鏃堕棿
+ */
+ @ApiModelProperty("鑱旂郴鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date contacttime;
+
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(exist = false)
private Date starttime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(exist = false)
private Date endtime;
+
+ @TableField(exist = false)
private String city;
+
+
+ private Long deptid;
+
+ @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ @Excel(name = "閮ㄩ棬鍚嶇О")
+ private String deptname;
+
+ @ApiModelProperty("缁勯暱缂栫爜")
+ @Excel(name = "缁勯暱缂栫爜")
+ private String leaderno;
+
+ @ApiModelProperty("缁勯暱鍚嶇О")
+ @Excel(name = "缁勯暱鍚嶇О")
+ private String leadername;
+
+ @ApiModelProperty("涓氬姟鍦板尯")
+ @Excel(name = "涓氬姟鍦板尯")
+ private String businessarea;
+
+
+ @ApiModelProperty("闄勪欢鍦板潃")
+ @Excel(name = "闄勪欢鍦板潃")
+ private String annexfiles;
+
+
+ @ApiModelProperty("宸ヤ綔娴�")
+ @Excel(name = "宸ヤ綔娴�")
private Integer workflow;
+
+
+ @ApiModelProperty("缁堟妗堜緥锛�0寮�鍚紝1缁堟 榛樿鍊硷細0")
+ @Excel(name = "缁堟妗堜緥")
private Integer terminationCase;
+
+ @ApiModelProperty("妗堜緥鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date donatetime;
+
+ @ApiModelProperty("妗堜緥搴忓彿")
+ private String donateno;
+
+ @ApiModelProperty("service_ethicalreviewopinions鐨勪富閿�")
+ private Long fcid;
+
+ @ApiModelProperty("delFlag")
+ private Long delFlag;
+
+ /**
+ * 涓撳鎰忚
+ */
+ @ApiModelProperty("涓撳鎰忚")
+ @Excel(name = "涓撳鎰忚")
+ private String expertopinion;
+
+ /**
+ * 涓撳缁撹 瑙佸瓧鍏� sys_0_1
+ */
+ @ApiModelProperty("涓撳缁撹 瑙佸瓧鍏� sys_0_1 ")
+ @Excel(name = "涓撳缁撹 瑙佸瓧鍏� sys_0_1 ")
+ private Long expertconclusion;
+
+
+ /**
+ * 涓撳鍚嶅瓧
+ */
+ @ApiModelProperty("涓撳鍚嶅瓧")
+ @Excel(name = "涓撳鍚嶅瓧")
+ private String expertname;
+
+ /**
+ * 缁撹鏃堕棿
+ */
+ @ApiModelProperty("缁撹鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "缁撹鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date conclusiontime;
+
+ /**
+ * 缁撹闄勪欢 鍙┖ 澶氫釜鐢�;鍙烽殧寮�
+ */
+ @ApiModelProperty("缁撹闄勪欢 鍙┖ 澶氫釜鐢�;鍙烽殧寮�")
+ @Excel(name = "缁撹闄勪欢 鍙┖ 澶氫釜鐢�;鍙烽殧寮�")
+ private String conclusionannex;
+
+
+ /**
+ * 缁撹椤哄簭
+ */
+ @ApiModelProperty("缁撹椤哄簭")
+ @Excel(name = "缁撹椤哄簭")
+ private Long conclusionorder;
+
+ /**
+ * Basecreateby
+ */
+ @ApiModelProperty("Basecreateby")
+ @TableField(exist = false)
+ private String basecreateby;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonateorganMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonateorganMapper.java
index 7d7c5c9..48f1a49 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonateorganMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonateorganMapper.java
@@ -75,4 +75,6 @@
String getOrganNameByNo(String organno);
List<ServiceDonateorgan> selectAll(TimeVO timeVO);
+
+ List<ServiceDonateorgan> countList(ServiceDonateorgan serviceDonateorgan);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundtaxMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundtaxMapper.java
new file mode 100644
index 0000000..f4b5b12
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundtaxMapper.java
@@ -0,0 +1,24 @@
+package com.ruoyi.project.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.project.domain.ServiceFundtax;
+
+import java.util.List;
+
+/**
+ * 涓撳璐圭敤绠楃◣鐢宠涓籑apper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-03-13
+ */
+public interface ServiceFundtaxMapper extends BaseMapper<ServiceFundtax>
+{
+ /**
+ * 鏌ヨ涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�
+ *
+ * @param serviceFundtax 涓撳璐圭敤绠楃◣鐢宠涓�
+ * @return 涓撳璐圭敤绠楃◣鐢宠涓婚泦鍚�
+ */
+ public List<ServiceFundtax> selectServiceFundtaxList(ServiceFundtax serviceFundtax);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java
index d6ea92e..a5c2481 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java
@@ -76,5 +76,7 @@
Boolean editArrayData(List<ServiceDonateorgan> serviceDonateorgans);
+ List<ServiceDonateorgan> countList(ServiceDonateorgan serviceDonateorgan);
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundtaxService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundtaxService.java
new file mode 100644
index 0000000..4a6741b
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundtaxService.java
@@ -0,0 +1,24 @@
+package com.ruoyi.project.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.domain.ServiceFundtax;
+
+import java.util.List;
+
+/**
+ * 涓撳璐圭敤绠楃◣鐢宠涓籗ervice鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-03-13
+ */
+public interface IServiceFundtaxService extends IService<ServiceFundtax>
+{
+
+ /**
+ * 鏌ヨ涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�
+ *
+ * @param serviceFundtax 涓撳璐圭敤绠楃◣鐢宠涓�
+ * @return 涓撳璐圭敤绠楃◣鐢宠涓婚泦鍚�
+ */
+ public List<ServiceFundtax> queryList(ServiceFundtax serviceFundtax);
+}
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 72578eb..54bcc4e 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
@@ -14,6 +14,7 @@
import com.ruoyi.project.domain.vo.countByRecordStateVO;
import com.ruoyi.project.mapper.*;
import com.ruoyi.project.service.*;
+import com.ruoyi.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -71,6 +72,8 @@
@Autowired
private IServiceDonatecompletioninfoService serviceDonatecompletioninfoService;
+ @Autowired
+ private SysUserMapper sysUserMapper;
/**
@@ -285,17 +288,17 @@
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());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatebaseinfo.getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donatebaseinfo.put("createperson", sysUser.getNickName());
+ }
}
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());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatebaseinfo.getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donatebaseinfo.put("updateperson", sysUser.getNickName());
+ }
}
donatebaseinfo.put("process", "");
//灏佽serviceDonateorgan娼滃湪鎹愮尞杩斿洖鏁版嵁
@@ -312,17 +315,18 @@
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());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceMedicalevaluations.get(0).getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ medicalevaluation.put("createperson", sysUser.getNickName());
+ }
}
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());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceMedicalevaluations.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ medicalevaluation.put("updateperson", sysUser.getNickName());
+ }
+
}
medicalevaluation.put("process", "");
}
@@ -341,17 +345,18 @@
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());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceRelativesconfirmations.get(0).getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ relativesconfirmation.put("createperson", sysUser.getNickName());
+ }
+
}
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());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceRelativesconfirmations.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ relativesconfirmation.put("updateperson", sysUser.getNickName());
+ }
}
relativesconfirmation.put("process", "");
}
@@ -371,17 +376,19 @@
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());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceEthicalreviewopinionsList.get(0).getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donateflowcharts.put("createperson", sysUser.getNickName());
+ }
+
}
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());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceEthicalreviewopinionsList.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donateflowcharts.put("updateperson", sysUser.getNickName());
+ }
+
}
donateflowcharts.put("process", "");
}
@@ -401,17 +408,18 @@
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());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.get(0).getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donateorgansService.put("createperson", sysUser.getNickName());
+ }
+
}
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());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donateorgansService.put("updateperson", sysUser.getNickName());
+ }
}
donateorgansService.put("process", "");
}
@@ -429,17 +437,17 @@
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());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonationwitness.getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donationwitness.put("createperson", sysUser.getNickName());
+ }
}
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());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonationwitness.getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donationwitness.put("updateperson", sysUser.getNickName());
+ }
}
donationwitness.put("process", "");
@@ -460,17 +468,17 @@
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());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatecompletioninfos.get(0).getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donatecompletioninfo.put("createperson", sysUser.getNickName());
+ }
}
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());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatecompletioninfos.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donatecompletioninfo.put("updateperson", sysUser.getNickName());
+ }
}
donatecompletioninfo.put("process", "");
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
index 5baef9a..0948119 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
@@ -6,7 +6,10 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.*;
@@ -145,15 +148,6 @@
map_accept.put(org_accept.getCity(), map_accept.getOrDefault(org_accept.getCity(), 0) + 1);
}
}
-// List<BasePrcaddressDict> city = basePrcaddressDictMapper.getAllCityOfZJ();
-// for(BasePrcaddressDict c : city){
-// NumberOfOrgans numberOfOrgans = new NumberOfOrgans();
-// numberOfOrgans.setDistrict(c.getAreaname());
-// numberOfOrgans.setNumberOfHospitals(baseOrganizationMapper.getOrganizationByCity(c.getAreanumber()));
-// numberOfOrgans.setDonateNumber(map_donate.getOrDefault(c.getAreaname(),0));
-// numberOfOrgans.setAcceptNumber(map_accept.getOrDefault(c.getAreaname(),0));
-// list.add(numberOfOrgans);
-// }
List<String> regions = new ArrayList<String>();
regions.add("0");
@@ -771,17 +765,6 @@
log.info("serviceDonateorgan鐨勬暟鎹负: {}", serviceDonateorgan);
boolean save = this.save(serviceDonateorgan);
-
-// //淇濆瓨service_organallocation
-// ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
-// serviceOrganallocation.setAgeunit(serviceDonateorgan.getAgeunit());
-// serviceOrganallocation.setApplicanttime(serviceDonateorgan.getApplicanttime());
-// serviceOrganallocation.setIdcardno(serviceDonateorgan.getIdcardno());
-// serviceOrganallocation.setIdcardtype(Long.valueOf(serviceDonateorgan.getIdcardtype()));
-// serviceOrganallocation.setOrganid(serviceDonateorgan.getId());
-// serviceOrganallocation.setOrgannumber(serviceDonateorgan.getOrgannumber());
-// log.info("serviceOrganallocation鐨勬暟鎹负: {}", serviceOrganallocation);
-// serviceOrganallocationService.save(serviceOrganallocation);
}
return serviceDonateorgans;
}
@@ -799,52 +782,6 @@
return true;
}
-
-// @Override
-// public List<DonateByRegionVO> OrgansOfHospitalByMonth() {
-// List<BaseOrganization> baseOrganizations = baseOrganizationMapper.getHospitalList();
-// List<DonateByRegionVO> l = new ArrayList<>();
-// List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.getAllDonateBaseInfo();
-//
-// for(BaseOrganization b : baseOrganizations){
-// HashMap<String, Integer> map_baseinfo_count = new HashMap<String, Integer>();
-// HashMap<String, Integer> map_completion_count = new HashMap<String, Integer>();
-// //List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.getBaseInfoByHospital(b.getOrganizationid());
-// List<ServiceDonatebaseinfo> serviceDonatebaseinfoOfThisHospital = new ArrayList<>();
-// for(ServiceDonatebaseinfo sd : serviceDonatebaseinfos){
-// if(b.getOrganizationid().equals(sd.getTreatmenthospitalno())){
-// serviceDonatebaseinfoOfThisHospital.add(sd);
-// }
-// }
-// for(ServiceDonatebaseinfo s : serviceDonatebaseinfoOfThisHospital){
-// Date dt = s.getReporttime();
-// SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-// String date = formatter.format(dt);
-// String month = date.substring(0, 7);
-// map_baseinfo_count.put(month, map_baseinfo_count.getOrDefault(month,0) + 1);
-// ServiceDonatecompletioninfo sc = serviceDonatecompletioninfoMapper.getByInfoId(s.getId());
-// if(sc != null){
-// map_completion_count.put(month, map_completion_count.getOrDefault(month,0) + 1);
-// }
-// else{
-// map_completion_count.put(month, map_completion_count.getOrDefault(month,0));
-// }
-//
-// }
-//
-// for(Map.Entry<String, Integer> entry: map_baseinfo_count.entrySet()) {
-// DonateByRegionVO d = new DonateByRegionVO();
-// d.setHospitalNumber(b.getOrganizationid());
-// d.setHospitalName(b.getOrganizationname());
-// d.setRegionLevel(b.getRegionallevel());
-// d.setMonth(entry.getKey());
-// d.setBaseInfoCount(entry.getValue());
-// d.setCompletionCount(map_completion_count.get(entry.getKey()));
-// l.add(d);
-// }
-// }
-// return l;
-// }
@Override
public List<DonateNumberByMonth> getDonatePeopleByMonth(TimeVO timeVO) {
@@ -979,5 +916,20 @@
return l;
}
+ @Override
+ public List<ServiceDonateorgan> countList(ServiceDonateorgan serviceDonateorgan) {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ List<SysRole> l = user.getRoles();
+ Boolean b = false;
+ for (SysRole r : l) {
+ if (r.getRoleId().longValue() == 3) {
+ b = true;
+ }
+ }
+ if (b) {
+ serviceDonateorgan.setCreateBy(user.getUserName());
+ }
+ return serviceDonateorganMapper.countList(serviceDonateorgan);
+ }
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java
new file mode 100644
index 0000000..fe98469
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java
@@ -0,0 +1,133 @@
+package com.ruoyi.project.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.project.domain.ServiceFundtax;
+import com.ruoyi.project.mapper.ServiceFundtaxMapper;
+import com.ruoyi.project.service.IServiceFundtaxService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 涓撳璐圭敤绠楃◣鐢宠涓籗ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2024-03-13
+ */
+@Service
+public class ServiceFundtaxServiceImpl extends ServiceImpl<ServiceFundtaxMapper, ServiceFundtax> implements IServiceFundtaxService
+{
+
+
+ /**
+ * 鏌ヨ涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�
+ *
+ * @param serviceFundtax 涓撳璐圭敤绠楃◣鐢宠涓�
+ * @return 涓撳璐圭敤绠楃◣鐢宠涓�
+ */
+ @Override
+ public List<ServiceFundtax> queryList(ServiceFundtax serviceFundtax) {
+ LambdaQueryWrapper<ServiceFundtax> wrappers = Wrappers.lambdaQuery();
+ if (StringUtils.isNotBlank(serviceFundtax.getApplyno())){
+ wrappers.eq(ServiceFundtax::getApplyno ,serviceFundtax.getApplyno());
+ }
+ if (serviceFundtax.getTaxedtime() != null){
+ wrappers.eq(ServiceFundtax::getTaxedtime ,serviceFundtax.getTaxedtime());
+ }
+ if (StringUtils.isNotBlank(serviceFundtax.getUserno())){
+ wrappers.eq(ServiceFundtax::getUserno ,serviceFundtax.getUserno());
+ }
+ if (StringUtils.isNotBlank(serviceFundtax.getUsername())){
+ wrappers.like(ServiceFundtax::getUsername ,serviceFundtax.getUsername());
+ }
+ if (StringUtils.isNotBlank(serviceFundtax.getDeptmentno())){
+ wrappers.eq(ServiceFundtax::getDeptmentno ,serviceFundtax.getDeptmentno());
+ }
+ if (StringUtils.isNotBlank(serviceFundtax.getDeptmentname())){
+ wrappers.like(ServiceFundtax::getDeptmentname ,serviceFundtax.getDeptmentname());
+ }
+ if (StringUtils.isNotBlank(serviceFundtax.getManagerno())){
+ wrappers.eq(ServiceFundtax::getManagerno ,serviceFundtax.getManagerno());
+ }
+ if (StringUtils.isNotBlank(serviceFundtax.getManagername())){
+ wrappers.like(ServiceFundtax::getManagername ,serviceFundtax.getManagername());
+ }
+ if (serviceFundtax.getPretaxamount() != null){
+ wrappers.eq(ServiceFundtax::getPretaxamount ,serviceFundtax.getPretaxamount());
+ }
+ if (serviceFundtax.getTaxedamount() != null){
+ wrappers.eq(ServiceFundtax::getTaxedamount ,serviceFundtax.getTaxedamount());
+ }
+ if (serviceFundtax.getTaxamount() != null){
+ wrappers.eq(ServiceFundtax::getTaxamount ,serviceFundtax.getTaxamount());
+ }
+ if (serviceFundtax.getMedicalcost() != null){
+ wrappers.eq(ServiceFundtax::getMedicalcost ,serviceFundtax.getMedicalcost());
+ }
+ if (serviceFundtax.getBodymaintaincost() != null){
+ wrappers.eq(ServiceFundtax::getBodymaintaincost ,serviceFundtax.getBodymaintaincost());
+ }
+ if (serviceFundtax.getOrgangaincost() != null){
+ wrappers.eq(ServiceFundtax::getOrgangaincost ,serviceFundtax.getOrgangaincost());
+ }
+ if (serviceFundtax.getOrganmaintaincost() != null){
+ wrappers.eq(ServiceFundtax::getOrganmaintaincost ,serviceFundtax.getOrganmaintaincost());
+ }
+ if (StringUtils.isNotBlank(serviceFundtax.getRemark())){
+ wrappers.eq(ServiceFundtax::getRemark ,serviceFundtax.getRemark());
+ }
+ if (serviceFundtax.getRecordstatus() != null){
+ wrappers.eq(ServiceFundtax::getRecordstatus ,serviceFundtax.getRecordstatus());
+ }
+ if (serviceFundtax.getCheckstatus() != null){
+ wrappers.eq(ServiceFundtax::getCheckstatus ,serviceFundtax.getCheckstatus());
+ }
+ if (serviceFundtax.getFlowlevel() != null){
+ wrappers.eq(ServiceFundtax::getFlowlevel ,serviceFundtax.getFlowlevel());
+ }
+ if (serviceFundtax.getBackflowlevel() != null){
+ wrappers.eq(ServiceFundtax::getBackflowlevel ,serviceFundtax.getBackflowlevel());
+ }
+ if (StringUtils.isNotBlank(serviceFundtax.getIsdistribute())){
+ wrappers.eq(ServiceFundtax::getIsdistribute ,serviceFundtax.getIsdistribute());
+ }
+ if (StringUtils.isNotBlank(serviceFundtax.getRiqi())){
+ wrappers.eq(ServiceFundtax::getRiqi ,serviceFundtax.getRiqi());
+ }
+ if (StringUtils.isNotBlank(serviceFundtax.getOpochecker())){
+ wrappers.eq(ServiceFundtax::getOpochecker ,serviceFundtax.getOpochecker());
+ }
+ if (StringUtils.isNotBlank(serviceFundtax.getFinvicepresident())){
+ wrappers.eq(ServiceFundtax::getFinvicepresident ,serviceFundtax.getFinvicepresident());
+ }
+ if (StringUtils.isNotBlank(serviceFundtax.getBusvicepresident())){
+ wrappers.eq(ServiceFundtax::getBusvicepresident ,serviceFundtax.getBusvicepresident());
+ }
+ if (StringUtils.isNotBlank(serviceFundtax.getPresident())){
+ wrappers.eq(ServiceFundtax::getPresident ,serviceFundtax.getPresident());
+ }
+ if (StringUtils.isNotBlank(serviceFundtax.getOfficedirector())){
+ wrappers.eq(ServiceFundtax::getOfficedirector ,serviceFundtax.getOfficedirector());
+ }
+ if (StringUtils.isNotBlank(serviceFundtax.getFinancedirector())){
+ wrappers.eq(ServiceFundtax::getFinancedirector ,serviceFundtax.getFinancedirector());
+ }
+ if (StringUtils.isNotBlank(serviceFundtax.getFinancechecher())){
+ wrappers.eq(ServiceFundtax::getFinancechecher ,serviceFundtax.getFinancechecher());
+ }
+ if (StringUtils.isNotBlank(serviceFundtax.getUploadflag())){
+ wrappers.eq(ServiceFundtax::getUploadflag ,serviceFundtax.getUploadflag());
+ }
+ if (serviceFundtax.getUploadtime() != null){
+ wrappers.eq(ServiceFundtax::getUploadtime ,serviceFundtax.getUploadtime());
+ }
+ if (StringUtils.isNotBlank(serviceFundtax.getUpdownremark())){
+ wrappers.eq(ServiceFundtax::getUpdownremark ,serviceFundtax.getUpdownremark());
+ }
+ return this.list(wrappers);
+ }
+
+}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
index 6bb212e..55cf5c7 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
@@ -529,5 +529,48 @@
and OrganGetTime >= #{starttime} and OrganGetTime <= #{endtime}
</select>
+ <select id="countList" parameterType="com.ruoyi.project.domain.ServiceOrganallocation" resultMap="ServiceDonateorganResult">
+ select service_donateorgan.* from service_donateorgan
+ LEFT JOIN service_donatebaseinfo on service_donateorgan.InfoID=service_donatebaseinfo.ID
+ LEFT JOIN base_organization on base_organization.OrganizationID = service_donatebaseinfo.TreatmentHospitalNo
+ <where>
+ <if test="id != null "> and service_donateorgan.ID = #{id}</if>
+ <if test="organnumber != null and organnumber != ''"> and service_donateorgan.OrganNumber = #{organnumber}</if>
+ <if test="applicantuserid != null and applicantuserid != ''"> and service_donateorgan.ApplicantUserID = #{applicantuserid}</if>
+ <if test="applicantusername != null and applicantusername != ''"> and service_donateorgan.ApplicantUserName like concat('%', #{applicantusername}, '%')</if>
+ <if test="applicanttime != null "> and service_donateorgan.ApplicantTime = #{applicanttime}</if>
+ <if test="checkuserid != null and checkuserid != ''"> and service_donateorgan.CheckUserID = #{checkuserid}</if>
+ <if test="checkusername != null and checkusername != ''"> and service_donateorgan.CheckUserName like concat('%', #{checkusername}, '%')</if>
+ <if test="checktime != null "> and service_donateorgan.CheckTime = #{checktime}</if>
+ <if test="checksuggestion != null and checksuggestion != ''"> and service_donateorgan.CheckSuggestion = #{checksuggestion}</if>
+ <if test="allocationstatus != null "> and service_donateorgan.AllocationStatus = #{allocationstatus}</if>
+ <if test="name != null and name != ''"> and service_donateorgan.Name like concat('%', #{name}, '%')</if>
+ <if test="sex != null "> and service_donateorgan.Sex = #{sex}</if>
+ <if test="idcardtype != null "> and service_donateorgan.IDCardType = #{idcardtype}</if>
+ <if test="idcardno != null and idcardno != ''"> and service_donateorgan.IDCardNo = #{idcardno}</if>
+ <if test="age != null "> and service_donateorgan.Age = #{age}</if>
+ <if test="ageunit != null and ageunit != ''"> and service_donateorgan.AgeUnit = #{ageunit}</if>
+ <if test="birthday != null and birthday != ''"> and service_donateorgan.Birthday = #{birthday}</if>
+ <if test="phone != null and phone != ''"> and service_donateorgan.Phone = #{phone}</if>
+ <if test="residenceaddress != null and residenceaddress != ''"> and service_donateorgan.ResidenceAddress = #{residenceaddress}</if>
+ <if test="residenceprovince != null and residenceprovince != ''"> and service_donateorgan.ResidenceProvince = #{residenceprovince}</if>
+ <if test="residenceprovincename != null and residenceprovincename != ''"> and service_donateorgan.ResidenceProvinceName like concat('%', #{residenceprovincename}, '%')</if>
+ <if test="residencecity != null and residencecity != ''"> and service_donateorgan.ResidenceCity = #{residencecity}</if>
+ <if test="residencecityname != null and residencecityname != ''"> and service_donateorgan.ResidenceCityName like concat('%', #{residencecityname}, '%')</if>
+ <if test="residencetown != null and residencetown != ''"> and service_donateorgan.ResidenceTown = #{residencetown}</if>
+ <if test="residencetownname != null and residencetownname != ''"> and service_donateorgan.ResidenceTownName like concat('%', #{residencetownname}, '%')</if>
+ <if test="residencecommunity != null and residencecommunity != ''"> and service_donateorgan.ResidenceCommunity = #{residencecommunity}</if>
+ <if test="residencecommunityname != null and residencecommunityname != ''"> and service_donateorgan.ResidenceCommunityName like concat('%', #{residencecommunityname}, '%')</if>
+ <if test="residencecountycode != null and residencecountycode != ''"> and service_donateorgan.ResidenceCountyCode = #{residencecountycode}</if>
+ <if test="residencecountyname != null and residencecountyname != ''"> and service_donateorgan.ResidenceCountyName like concat('%', #{residencecountyname}, '%')</if>
+ <if test="createBy != null and createBy != ''"> and service_donateorgan.create_by = #{createBy}</if>
+ <if test="starttime != null "> and `service_donateorgan`.ApplicantTime >= #{starttime} </if>
+ <if test="endtime != null "> and `service_donateorgan`.ApplicantTime <= #{endtime}</if>
+ <if test="reporterno != null and reporterno != ''"> and `service_donatebaseinfo`.ReporterNo = #{reporterno}</if>
+ <if test="city != null and city != ''"> and `base_organization`.`City` = #{city}</if>
+ </where>
+
+ order by create_time desc
+ </select>
</mapper>
\ No newline at end of file
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index d0b28e3..2feaa6e 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -168,6 +168,7 @@
`base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
<where>
+ service_donationwitness.del_flag=0
<if test="donorno != null and donorno != ''">and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
<if test="name != null and name != ''">and `service_donatebaseinfo`.`Name` like concat('%', #{name}, '%')
</if>
@@ -187,7 +188,7 @@
#{reporterno}
</if>
<if test="city != null and city != ''">and `base_organization`.`City` = #{city}</if>
- <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
+ <if test="workflow != null ">and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
</where>
order by `service_donationwitness`.`create_time` desc
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
index c13d8e5..ceb3664 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
@@ -56,65 +56,68 @@
</select>
<select id="selectVOList" resultType="com.ruoyi.project.domain.vo.EthicalReviewVO">
SELECT
- `service_donatebaseinfo`.`ID` AS `ID`,
- `service_donatebaseinfo`.`Name` AS `Name`,
- `service_donatebaseinfo`.`Sex` AS `Sex`,
- `service_donatebaseinfo`.`IDCardNo` AS `IDCardNo`,
- `service_donatebaseinfo`.`Age` AS `Age`,
- `service_donatebaseinfo`.`Birthday` AS `Birthday`,
- `service_donatebaseinfo`.`Nationality` AS `Nationality`,
- `service_donatebaseinfo`.`Nation` AS `Nation`,
- `service_donatebaseinfo`.`RegisterAddress` AS `RegisterAddress`,
- `service_donatebaseinfo`.`RegisterProvince` AS `RegisterProvince`,
- `service_donatebaseinfo`.`RegisterProvinceName` AS `RegisterProvinceName`,
- `service_donatebaseinfo`.`RegisterCity` AS `RegisterCity`,
- `service_donatebaseinfo`.`RegisterCityName` AS `RegisterCityName`,
- `service_donatebaseinfo`.`RegisterTown` AS `RegisterTown`,
- `service_donatebaseinfo`.`RegisterTownName` AS `RegisterTownName`,
- `service_donatebaseinfo`.`RegisterCommunity` AS `RegisterCommunity`,
- `service_donatebaseinfo`.`RegisterCommunityName` AS `RegisterCommunityName`,
- `service_donatebaseinfo`.`RegisterCountyCode` AS `RegisterCountyCode`,
- `service_donatebaseinfo`.`RegisterCountyName` AS `RegisterCountyName`,
- `service_donatebaseinfo`.`RecordState` AS `RecordState`,
- `service_donatebaseinfo`.`TreatmentHospitalNo` AS `TreatmentHospitalNo`,
- `service_donatebaseinfo`.`TreatmentHospitalName` AS `TreatmentHospitalName`,
- `service_donatebaseinfo`.`TreatmentDeptName` AS `TreatmentDeptName`,
- `service_donatebaseinfo`.`DiagnosisNo` AS `DiagnosisNo`,
- `service_donatebaseinfo`.`DiagnosisName` AS `DiagnosisName`,
- `service_donatebaseinfo`.`DonorNo` AS `DonorNo`,
- `service_donatebaseinfo`.`ReporterNo` AS `ReporterNo`,
- `service_donatebaseinfo`.`ReporterName` AS `ReporterName`,
- `service_donatebaseinfo`.`ReporterPhone` AS `ReporterPhone`,
- `service_donatebaseinfo`.`ReportTime` AS `ReportTime`,
- `service_donatebaseinfo`.`BloodType` AS `BloodType`,
- `service_donatebaseinfo`.`RhYin` AS `RhYin`,
- `service_donatebaseinfo`.`InpatientNo` AS `InpatientNo`,
- `service_donatebaseinfo`.`IllnessOverview` AS `IllnessOverview`,
- `service_donatebaseinfo`.`DiseaseType` AS `DiseaseType`,
- `service_donatebaseinfo`.`PatientState` AS `PatientState`,
- `service_donatebaseinfo`.`create_by` AS `basecreateby`,
- `service_donatebaseinfo`.`workflow` AS `workflow;`,
- `service_donatebaseinfo`.`termination_case` AS `terminationCase;`,
- `service_donateflowchart`.`ID` AS `fcID`,
- `service_donateflowchart`.`InfoID` AS `InfoID`,
- `service_donateflowchart`.`DonorNo` AS `fcDonorNo`,
- `service_donateflowchart`.`del_flag` AS `delFlag`,
- `service_donateflowchart`.`create_by` AS `createBy`,
- `service_donateflowchart`.`create_time` AS `createTime`,
- `service_donateflowchart`.`update_by` AS `updateBy`,
- `service_donateflowchart`.`update_time` AS `updateTime`,
- `service_donateflowchart`.`FlowName` AS `FlowName`,
- `service_donateflowchart`.`FlowAnnex` AS `FlowAnnex`,
- `service_donateflowchart`.`FlowContent` AS `FlowContent`,
- `service_donateflowchart`.`FlowConclusion` AS `FlowConclusion`
+ service_donatebaseinfo.ID as id,
+ service_donatebaseinfo.`Name` as name,
+ service_donatebaseinfo.IDCardNo as idcardno,
+ service_donatebaseinfo.IDCardType as idcardtype,
+ service_donatebaseinfo.Sex as sex,
+ service_donatebaseinfo.Age as age,
+ service_donatebaseinfo.AgeUnit as ageUnit,
+ service_donatebaseinfo.Birthday as irthday,
+ service_donatebaseinfo.Phone as phone,
+ service_donatebaseinfo.Nationality as nationality,
+ service_donatebaseinfo.NativePlace as nativePlace,
+ service_donatebaseinfo.Nation as nation,
+ service_donatebaseinfo.RegisterAddress as registerAddress,
+ service_donatebaseinfo.RegisterProvince as registerProvince,
+ service_donatebaseinfo.RegisterProvinceName as registerProvinceName,
+ service_donatebaseinfo.RegisterCity as registerCity,
+ service_donatebaseinfo.RegisterCityName aS registerCityName,
+ service_donatebaseinfo.RegisterTown as registerTown,
+ service_donatebaseinfo.RegisterTownName as registerTownName,
+ service_donatebaseinfo.RegisterCommunity as registerCommunity,
+ service_donatebaseinfo.RegisterCommunityName as registerCommunityName,
+ service_donatebaseinfo.RegisterCountyCode as registerCountyCode,
+ service_donatebaseinfo.RegisterCountyName as registerCountyName,
+ service_donatebaseinfo.RecordState as recordState,
+ service_donatebaseinfo.TreatmentHospitalNo as treatmentHospitalNo,
+ service_donatebaseinfo.TreatmentHospitalName as treatmentHospitalName,
+ service_donatebaseinfo.TreatmentDeptName as treatmentDeptName,
+ service_donatebaseinfo.DiagnosisNo as diagnosisNo,
+ service_donatebaseinfo.DiagnosisName as diagnosisName,
+ service_donatebaseinfo.BloodType as bloodType,
+ service_donatebaseinfo.RhYin as rhYin,
+ service_donatebaseinfo.InpatientNo as inpatientNo,
+ service_donatebaseinfo.DonorNo as donorNo,
+ service_donatebaseinfo.DonationCategory as donationcategory,
+ service_donatebaseinfo.IllnessOverview as illnessoverview,
+ service_donatebaseinfo.DiseaseType as diseasetype,
+ service_donatebaseinfo.DiseaseType_Other as diseasetypeOther,
+ service_donatebaseinfo.create_by as createBy,
+ service_donatebaseinfo.create_time as createTime,
+ service_donatebaseinfo.del_flag as delFlag,
+ service_donatebaseinfo.workflow,
+ service_donatebaseinfo.termination_case as terminationCase,
+ service_donatebaseinfo.donatetime,
+ service_donatebaseinfo.donateno,
+ service_donatebaseinfo.deptid,
+ service_donatebaseinfo.deptname,
+ service_ethicalreviewopinions.ID as fcid,
+ service_ethicalreviewopinions.ExpertOpinion as expertopinion,
+ service_ethicalreviewopinions.ExpertConclusion as expertconclusion,
+ service_ethicalreviewopinions.ExpertName as expertname,
+ service_ethicalreviewopinions.ConclusionTime as conclusiontime,
+ service_ethicalreviewopinions.ConclusionAnnex as conclusionannex,
+ service_ethicalreviewopinions.ConclusionOrder as conclusionorder
FROM
+ service_donatebaseinfo
+ LEFT JOIN
+ service_ethicalreviewopinions
+ ON
+ service_donatebaseinfo.ID = service_ethicalreviewopinions.InfoID
+ LEFT JOIN base_organization ON
+ base_organization.OrganizationID = service_donatebaseinfo.TreatmentHospitalNo
- `service_donatebaseinfo`
- LEFT JOIN `service_donateflowchart` ON
- `service_donatebaseinfo`.`ID` = `service_donateflowchart`.`InfoID`
- AND `service_donateflowchart`.`FlowName` = '浼︾悊瀹℃煡'
- LEFT JOIN `base_organization` ON
- `base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
<where>
<if test="donorno != null and donorno != ''">and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
<if test="name != null and name != ''">and `service_donatebaseinfo`.`Name` like concat('%', #{name}, '%')
@@ -129,17 +132,17 @@
<if test="basecreateby != null and basecreateby != ''">and `service_donatebaseinfo`.`create_by` =
#{basecreateby}
</if>
- <if test="starttime != null ">and `service_donateflowchart`.create_time >= #{starttime}</if>
- <if test="endtime != null ">and `service_donateflowchart`.create_time <= #{endtime}</if>
+ <if test="starttime != null ">and `service_ethicalreviewopinions`.ConclusionTime >= #{starttime}</if>
+ <if test="endtime != null ">and `service_ethicalreviewopinions`.ConclusionTime <= #{endtime}</if>
<if test="reporterno != null and reporterno != ''">and `service_donatebaseinfo`.ReporterNo =
#{reporterno}
</if>
<if test="city != null and city != ''">and `base_organization`.`City` = #{city}</if>
- <if test="fcid != null ">and `service_donateflowchart`.`ID` = #{fcid}</if>
+ <if test="fcid != null ">and `service_ethicalreviewopinions`.`ID` = #{fcid}</if>
<if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
</where>
- order by `service_donateflowchart`.`create_time` desc
+ order by `service_ethicalreviewopinions`.`ConclusionTime` desc
</select>
<select id="countNumber" resultType="java.lang.Integer">
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml
new file mode 100644
index 0000000..ba62d6f
--- /dev/null
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml
@@ -0,0 +1,135 @@
+<?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">
+<mapper namespace="com.ruoyi.project.mapper.ServiceFundtaxMapper">
+
+ <resultMap type="com.ruoyi.project.domain.ServiceFundtax" id="ServiceFundtaxResult">
+ <result property="id" column="ID"/>
+ <result property="applyno" column="ApplyNo"/>
+ <result property="taxedtime" column="taxedtime"/>
+ <result property="userno" column="UserNo"/>
+ <result property="username" column="UserName"/>
+ <result property="deptmentno" column="DeptmentNo"/>
+ <result property="deptmentname" column="DeptmentName"/>
+ <result property="managerno" column="ManagerNo"/>
+ <result property="managername" column="ManagerName"/>
+ <result property="pretaxamount" column="Pretaxamount"/>
+ <result property="taxedamount" column="TaxedAmount"/>
+ <result property="taxamount" column="TaxAmount"/>
+ <result property="medicalcost" column="MedicalCost"/>
+ <result property="bodymaintaincost" column="BodyMaintainCost"/>
+ <result property="organgaincost" column="OrganGainCost"/>
+ <result property="organmaintaincost" column="OrganMaintainCost"/>
+ <result property="remark" column="Remark"/>
+ <result property="recordstatus" column="RecordStatus"/>
+ <result property="checkstatus" column="checkstatus"/>
+ <result property="flowlevel" column="FlowLevel"/>
+ <result property="backflowlevel" column="backFlowLevel"/>
+ <result property="isdistribute" column="Isdistribute"/>
+ <result property="riqi" column="riqi"/>
+ <result property="opochecker" column="OPOchecker"/>
+ <result property="finvicepresident" column="FinVicePresident"/>
+ <result property="busvicepresident" column="BusVicePresident"/>
+ <result property="president" column="president"/>
+ <result property="officedirector" column="OfficeDirector"/>
+ <result property="financedirector" column="FinanceDirector"/>
+ <result property="financechecher" column="FinanceChecher"/>
+ <result property="delFlag" 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="uploadflag" column="uploadflag"/>
+ <result property="uploadtime" column="uploadtime"/>
+ <result property="updownremark" column="updownremark"/>
+ </resultMap>
+
+ <sql id="selectServiceFundtaxVo">
+ select ID,
+ ApplyNo,
+ taxedtime,
+ UserNo,
+ UserName,
+ DeptmentNo,
+ DeptmentName,
+ ManagerNo,
+ ManagerName,
+ Pretaxamount,
+ TaxedAmount,
+ TaxAmount,
+ MedicalCost,
+ BodyMaintainCost,
+ OrganGainCost,
+ OrganMaintainCost,
+ Remark,
+ RecordStatus,
+ checkstatus,
+ FlowLevel,
+ backFlowLevel,
+ Isdistribute,
+ riqi,
+ OPOchecker,
+ FinVicePresident,
+ BusVicePresident,
+ president,
+ OfficeDirector,
+ FinanceDirector,
+ FinanceChecher,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ uploadflag,
+ uploadtime,
+ updownremark
+ from service_fundtax
+ </sql>
+
+ <select id="selectServiceFundtaxList" parameterType="com.ruoyi.project.domain.ServiceFundtax"
+ resultMap="ServiceFundtaxResult">
+ <include refid="selectServiceFundtaxVo"/>
+ <where>
+ <if test="applyno != null and applyno != ''">and ApplyNo = #{applyno}</if>
+ <if test="taxedtime != null ">and taxedtime = #{taxedtime}</if>
+ <if test="userno != null and userno != ''">and UserNo = #{userno}</if>
+ <if test="username != null and username != ''">and UserName like concat('%', #{username}, '%')</if>
+ <if test="deptmentno != null and deptmentno != ''">and DeptmentNo = #{deptmentno}</if>
+ <if test="deptmentname != null and deptmentname != ''">and DeptmentName like concat('%', #{deptmentname},
+ '%')
+ </if>
+ <if test="managerno != null and managerno != ''">and ManagerNo = #{managerno}</if>
+ <if test="managername != null and managername != ''">and ManagerName like concat('%', #{managername},
+ '%')
+ </if>
+ <if test="pretaxamount != null ">and Pretaxamount = #{pretaxamount}</if>
+ <if test="taxedamount != null ">and TaxedAmount = #{taxedamount}</if>
+ <if test="taxamount != null ">and TaxAmount = #{taxamount}</if>
+ <if test="medicalcost != null ">and MedicalCost = #{medicalcost}</if>
+ <if test="bodymaintaincost != null ">and BodyMaintainCost = #{bodymaintaincost}</if>
+ <if test="organgaincost != null ">and OrganGainCost = #{organgaincost}</if>
+ <if test="organmaintaincost != null ">and OrganMaintainCost = #{organmaintaincost}</if>
+ <if test="remark != null and remark != ''">and Remark = #{remark}</if>
+ <if test="recordstatus != null ">and RecordStatus = #{recordstatus}</if>
+ <if test="checkstatus != null ">and checkstatus = #{checkstatus}</if>
+ <if test="flowlevel != null ">and FlowLevel = #{flowlevel}</if>
+ <if test="backflowlevel != null ">and backFlowLevel = #{backflowlevel}</if>
+ <if test="isdistribute != null and isdistribute != ''">and Isdistribute = #{isdistribute}</if>
+ <if test="riqi != null and riqi != ''">and riqi = #{riqi}</if>
+ <if test="opochecker != null and opochecker != ''">and OPOchecker = #{opochecker}</if>
+ <if test="finvicepresident != null and finvicepresident != ''">and FinVicePresident = #{finvicepresident}
+ </if>
+ <if test="busvicepresident != null and busvicepresident != ''">and BusVicePresident = #{busvicepresident}
+ </if>
+ <if test="president != null and president != ''">and president = #{president}</if>
+ <if test="officedirector != null and officedirector != ''">and OfficeDirector = #{officedirector}</if>
+ <if test="financedirector != null and financedirector != ''">and FinanceDirector = #{financedirector}</if>
+ <if test="financechecher != null and financechecher != ''">and FinanceChecher = #{financechecher}</if>
+ <if test="uploadflag != null and uploadflag != ''">and uploadflag = #{uploadflag}</if>
+ <if test="uploadtime != null ">and uploadtime = #{uploadtime}</if>
+ <if test="updownremark != null and updownremark != ''">and updownremark = #{updownremark}</if>
+ </where>
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceOrganallocationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceOrganallocationMapper.xml
index ac1d167..8ae4e86 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceOrganallocationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceOrganallocationMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceOrganallocationMapper">
-
+
<resultMap type="com.ruoyi.project.domain.ServiceOrganallocation" id="ServiceOrganallocationResult">
<result property="id" column="ID" />
<result property="organid" column="OrganID" />
--
Gitblit v1.9.3