From fb4d7127cd860b39e1c1c4242cfbbc09a659fc7a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 26 七月 2024 17:54:35 +0800
Subject: [PATCH] 变更
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java | 80 ++++++++++++++-----
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java | 3
ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml | 106 ++++++++++++++++----------
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java | 32 +++-----
4 files changed, 138 insertions(+), 83 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java
index 2f097ea..06aa241 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.domain;
import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -18,106 +19,143 @@
*/
@Data
@ApiModel("VIEW")
-public class VDonationworkflow extends BaseEntity
-{
+public class VDonationworkflow {
private static final long serialVersionUID = 1L;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
private Long id;
- /** 濮撳悕 */
+ /**
+ * 濮撳悕
+ */
@ApiModelProperty("濮撳悕")
@Excel(name = "濮撳悕")
private String name;
- /** 璇佷欢鍙风爜 */
+ /**
+ * 璇佷欢鍙风爜
+ */
@ApiModelProperty("璇佷欢鍙风爜")
@Excel(name = "璇佷欢鍙风爜")
private String idcardno;
- /** 宸ヤ綔娴� */
+ /**
+ * 宸ヤ綔娴�
+ */
@ApiModelProperty("宸ヤ綔娴�")
@Excel(name = "宸ヤ綔娴�")
private Long workflow;
- /** 缁堟妗堜緥锛�0寮�鍚� 1缁堟 榛樿 0 */
+ /**
+ * 缁堟妗堜緥锛�0寮�鍚� 1缁堟 榛樿 0
+ */
@ApiModelProperty("缁堟妗堜緥锛�0寮�鍚� 1缁堟 榛樿 0")
@Excel(name = "缁堟妗堜緥锛�0寮�鍚� 1缁堟 榛樿 0")
private Long terminationcase;
- /** 閮ㄩ棬/缁勭紪鍙� */
+ /**
+ * 閮ㄩ棬/缁勭紪鍙�
+ */
@ApiModelProperty("閮ㄩ棬/缁勭紪鍙�")
@Excel(name = "閮ㄩ棬/缁勭紪鍙�")
private Long deptid;
- /** 閮ㄩ棬/缁勫悕绉� */
+ /**
+ * 閮ㄩ棬/缁勫悕绉�
+ */
@ApiModelProperty("閮ㄩ棬/缁勫悕绉�")
@Excel(name = "閮ㄩ棬/缁勫悕绉�")
private String deptname;
- /** 鎶ュ憡鑰呯紪鍙� */
+ /**
+ * 鎶ュ憡鑰呯紪鍙�
+ */
@ApiModelProperty("鎶ュ憡鑰呯紪鍙�")
@Excel(name = "鎶ュ憡鑰呯紪鍙�")
private String reporterno;
- /** 鎶ュ憡鑰呭鍚� */
+ /**
+ * 鎶ュ憡鑰呭鍚�
+ */
@ApiModelProperty("鎶ュ憡鑰呭鍚�")
@Excel(name = "鎶ュ憡鑰呭鍚�")
private String reportername;
- /** 妗堜緥鏃堕棿 */
+ /**
+ * 妗堜緥鏃堕棿
+ */
@ApiModelProperty("妗堜緥鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "妗堜緥鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date donatetime;
- /** 鎶ュ憡鏃堕棿 */
+ /**
+ * 鎶ュ憡鏃堕棿
+ */
@ApiModelProperty("鎶ュ憡鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鎶ュ憡鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date reporttime;
- /** 鐪佺骇璇勪及缁勬牳蹇冩垚鍛樼粨璁� 瑙佸瓧鍏竤ys_CoreAssessConclusion */
+ /**
+ * 鐪佺骇璇勪及缁勬牳蹇冩垚鍛樼粨璁� 瑙佸瓧鍏竤ys_CoreAssessConclusion
+ */
@ApiModelProperty("鐪佺骇璇勪及缁勬牳蹇冩垚鍛樼粨璁� 瑙佸瓧鍏竤ys_CoreAssessConclusion")
@Excel(name = "鐪佺骇璇勪及缁勬牳蹇冩垚鍛樼粨璁� 瑙佸瓧鍏竤ys_CoreAssessConclusion")
private String coreteamassessconclusion;
- /** 鐪佺骇璇勪及缁勬牳蹇冩垚鍛樿瘎浼版椂闂� */
+ /**
+ * 鐪佺骇璇勪及缁勬牳蹇冩垚鍛樿瘎浼版椂闂�
+ */
@ApiModelProperty("鐪佺骇璇勪及缁勬牳蹇冩垚鍛樿瘎浼版椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鐪佺骇璇勪及缁勬牳蹇冩垚鍛樿瘎浼版椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date coreteamassesstime;
- /** 绛剧讲鏃ユ湡 */
+ /**
+ * 绛剧讲鏃ユ湡
+ */
@ApiModelProperty("绛剧讲鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "绛剧讲鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date signdate;
- /** 涓撳缁撹 瑙佸瓧鍏镐鸡鐞嗙粨璁� */
+ /**
+ * 涓撳缁撹 瑙佸瓧鍏镐鸡鐞嗙粨璁�
+ */
@ApiModelProperty("涓撳缁撹 瑙佸瓧鍏镐鸡鐞嗙粨璁�")
@Excel(name = "涓撳缁撹 瑙佸瓧鍏镐鸡鐞嗙粨璁�")
private Long expertconclusion;
- /** 缁撹鏃堕棿 */
+ /**
+ * 缁撹鏃堕棿
+ */
@ApiModelProperty("缁撹鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "缁撹鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date conclusiontime;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
@Excel(name = "缁撹鏃堕棿")
private Long organcount;
- /** 鎵嬫湳寮�濮嬫椂闂� */
+ /**
+ * 鎵嬫湳寮�濮嬫椂闂�
+ */
@ApiModelProperty("鎵嬫湳寮�濮嬫椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鎵嬫湳寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date operationbegtime;
- /** 瀹屾垚鏃堕棿 */
+ /**
+ * 瀹屾垚鏃堕棿
+ */
@ApiModelProperty("瀹屾垚鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "瀹屾垚鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
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 d39982f..c2b3107 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
@@ -1,6 +1,7 @@
package com.ruoyi.project.service;
import java.util.List;
+import java.util.Map;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonateorgan;
@@ -65,7 +66,7 @@
List<organNumberByOrgVO> getOrganNumberByOrg(TimeVO timeVO);
- List<OrganInfoVO> getOrganCount(TimeVO timeVO);
+ Map<String, Object> getOrganCount(TimeVO timeVO);
List<ServiceDonateorgan> saveData(List<ServiceDonateorgan> serviceDonateorgans);
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 ba76377..f230e30 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
@@ -719,41 +719,33 @@
}
@Override
- public List<OrganInfoVO> getOrganCount(TimeVO timeVO) {
- List<OrganInfoVO> l = new ArrayList<>();
-
- //List<ServiceDonateorgan> serviceDonateorgans = serviceDonateorganMapper.selectAll(timeVO);
- Map<String, Integer> map_organs = new HashMap<String, Integer>();
- //List<String> organNo = new ArrayList<>();
+ public Map<String, Object> getOrganCount(TimeVO timeVO) {
+ Map<String, Object> map = new HashMap<>();
+ List<OrganInfoVO> organInfoVOList = new ArrayList<>();
+ Integer countSum = 0;
+ Integer abandonCountSum = 0;
List<SysDictData> data = dictDataMapper.selectDictDataByType("sys_Organ");
if (StringUtils.isNull(data)) {
data = new ArrayList<SysDictData>();
}
-
for (SysDictData sysDictData : data) {
if (!sysDictData.getDictValue().equals("C00")) {
DistinctOrgansCount distinctOrgansCount = serviceDonateorganMapper.getDistinctOrgansCount(sysDictData.getDictValue(), timeVO.getStarttime(), timeVO.getEndtime(), timeVO.getCity(), timeVO.getReporterno());
-// map_organs.put(sysDictData.getDictValue(), distinctOrgansCount.getGainsum());
-// map_organs.put("abandonCount", distinctOrgansCount.getAbandonCount());
OrganInfoVO organ = new OrganInfoVO();
organ.setOrganNo(sysDictData.getDictValue());
organ.setCount(distinctOrgansCount.getGainsum());
organ.setAbandonCount(distinctOrgansCount.getAbandonCount());
- l.add(organ);
+ countSum = countSum + distinctOrgansCount.getGainsum();
+ abandonCountSum = abandonCountSum + distinctOrgansCount.getAbandonCount();
+ organInfoVOList.add(organ);
}
}
-// for (Map.Entry<String, Integer> entry : map_organs.entrySet()) {
-// OrganInfoVO organ = new OrganInfoVO();
-// organ.setOrganNo(entry.getKey());
-// //organ.setOrganName(serviceDonateorganMapper.getOrganNameByNo(entry.getKey()));
-// organ.setCount(entry.getValue());
-// organ.setAbandonCount();
-// l.add(organ);
-// }
-
- return l;
+ map.put("countSum", countSum);
+ map.put("abandonCountSum", abandonCountSum);
+ map.put("organInfoVOList", organInfoVOList);
+ return map;
}
@Override
diff --git a/ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml b/ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml
index cd74c62..452cdb1 100644
--- a/ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml
@@ -1,56 +1,80 @@
<?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.VDonationworkflowMapper">
<resultMap type="com.ruoyi.project.domain.VDonationworkflow" id="VDonationworkflowResult">
- <result property="id" column="id" />
- <result property="name" column="name" />
- <result property="idcardno" column="IDCardNo" />
- <result property="workflow" column="workflow" />
- <result property="terminationcase" column="terminationCase" />
- <result property="deptid" column="deptid" />
- <result property="deptname" column="deptname" />
- <result property="reporterno" column="reporterNo" />
- <result property="reportername" column="reporterName" />
- <result property="donatetime" column="donatetime" />
- <result property="reporttime" column="ReportTime" />
- <result property="coreteamassessconclusion" column="CoreTeamAssessConclusion" />
- <result property="coreteamassesstime" column="coreTeamAssessTime" />
- <result property="signdate" column="signdate" />
- <result property="expertconclusion" column="ExpertConclusion" />
- <result property="conclusiontime" column="conclusionTime" />
- <result property="organcount" column="organcount" />
- <result property="operationbegtime" column="operationBegTime" />
- <result property="completetime" column="completeTime" />
+ <result property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="idcardno" column="IDCardNo"/>
+ <result property="workflow" column="workflow"/>
+ <result property="terminationcase" column="terminationCase"/>
+ <result property="deptid" column="deptid"/>
+ <result property="deptname" column="deptname"/>
+ <result property="reporterno" column="reporterNo"/>
+ <result property="reportername" column="reporterName"/>
+ <result property="donatetime" column="donatetime"/>
+ <result property="reporttime" column="ReportTime"/>
+ <result property="coreteamassessconclusion" column="CoreTeamAssessConclusion"/>
+ <result property="coreteamassesstime" column="coreTeamAssessTime"/>
+ <result property="signdate" column="signdate"/>
+ <result property="expertconclusion" column="ExpertConclusion"/>
+ <result property="conclusiontime" column="conclusionTime"/>
+ <result property="organcount" column="organcount"/>
+ <result property="operationbegtime" column="operationBegTime"/>
+ <result property="completetime" column="completeTime"/>
</resultMap>
<sql id="selectVDonationworkflowVo">
- select id, name, IDCardNo, workflow, terminationCase, deptid, deptname, reporterNo, reporterName, donatetime, ReportTime, CoreTeamAssessConclusion, coreTeamAssessTime, signdate, ExpertConclusion, conclusionTime, organcount, operationBegTime, completeTime from v_donationworkflow
+ select id,
+ name,
+ IDCardNo,
+ workflow,
+ terminationCase,
+ deptid,
+ deptname,
+ reporterNo,
+ reporterName,
+ donatetime,
+ ReportTime,
+ CoreTeamAssessConclusion,
+ coreTeamAssessTime,
+ signdate,
+ ExpertConclusion,
+ conclusionTime,
+ organcount,
+ operationBegTime,
+ completeTime
+ from v_donationworkflow
</sql>
- <select id="selectVDonationworkflowList" parameterType="com.ruoyi.project.domain.VDonationworkflow" resultMap="VDonationworkflowResult">
+ <select id="selectVDonationworkflowList" parameterType="com.ruoyi.project.domain.VDonationworkflow"
+ resultMap="VDonationworkflowResult">
<include refid="selectVDonationworkflowVo"/>
<where>
- <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
- <if test="idcardno != null and idcardno != ''"> and IDCardNo = #{idcardno}</if>
- <if test="workflow != null "> and workflow = #{workflow}</if>
- <if test="terminationcase != null "> and terminationCase = #{terminationcase}</if>
- <if test="deptid != null "> and deptid = #{deptid}</if>
- <if test="deptname != null and deptname != ''"> and deptname like concat('%', #{deptname}, '%')</if>
- <if test="reporterno != null and reporterno != ''"> and reporterNo = #{reporterno}</if>
- <if test="reportername != null and reportername != ''"> and reporterName like concat('%', #{reportername}, '%')</if>
- <if test="donatetime != null "> and donatetime = #{donatetime}</if>
- <if test="reporttime != null "> and ReportTime = #{reporttime}</if>
- <if test="coreteamassessconclusion != null and coreteamassessconclusion != ''"> and CoreTeamAssessConclusion = #{coreteamassessconclusion}</if>
- <if test="coreteamassesstime != null "> and coreTeamAssessTime = #{coreteamassesstime}</if>
- <if test="signdate != null "> and signdate = #{signdate}</if>
- <if test="expertconclusion != null "> and ExpertConclusion = #{expertconclusion}</if>
- <if test="conclusiontime != null "> and conclusionTime = #{conclusiontime}</if>
- <if test="organcount != null "> and organcount = #{organcount}</if>
- <if test="operationbegtime != null "> and operationBegTime = #{operationbegtime}</if>
- <if test="completetime != null "> and completeTime = #{completetime}</if>
+ <if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
+ <if test="idcardno != null and idcardno != ''">and IDCardNo = #{idcardno}</if>
+ <if test="workflow != null ">and workflow = #{workflow}</if>
+ <if test="terminationcase != null ">and terminationCase = #{terminationcase}</if>
+ <if test="deptid != null ">and deptid = #{deptid}</if>
+ <if test="deptname != null and deptname != ''">and deptname like concat('%', #{deptname}, '%')</if>
+ <if test="reporterno != null and reporterno != ''">and reporterNo = #{reporterno}</if>
+ <if test="reportername != null and reportername != ''">and reporterName like concat('%', #{reportername},
+ '%')
+ </if>
+ <if test="donatetime != null ">and donatetime = #{donatetime}</if>
+ <if test="reporttime != null ">and ReportTime = #{reporttime}</if>
+ <if test="coreteamassessconclusion != null and coreteamassessconclusion != ''">and CoreTeamAssessConclusion
+ = #{coreteamassessconclusion}
+ </if>
+ <if test="coreteamassesstime != null ">and coreTeamAssessTime = #{coreteamassesstime}</if>
+ <if test="signdate != null ">and signdate = #{signdate}</if>
+ <if test="expertconclusion != null ">and ExpertConclusion = #{expertconclusion}</if>
+ <if test="conclusiontime != null ">and conclusionTime = #{conclusiontime}</if>
+ <if test="organcount != null ">and organcount = #{organcount}</if>
+ <if test="operationbegtime != null ">and operationBegTime = #{operationbegtime}</if>
+ <if test="completetime != null ">and completeTime = #{completetime}</if>
</where>
</select>
--
Gitblit v1.9.3