From 517ecf9879052b2f3fbad25c0469935cc45553a7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 25 七月 2024 18:24:24 +0800
Subject: [PATCH] 变更
---
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/Test.java | 129 +++++++++++++++++++++
ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml | 147 +++++++++++++++---------
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java | 3
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceRelativesconfirmationServiceImpl.java | 8
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 4
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java | 2
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml | 1
ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml | 4
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java | 8
ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml | 2
ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml | 6
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java | 2
12 files changed, 243 insertions(+), 73 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/Test.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/Test.java
new file mode 100644
index 0000000..d984dad
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/Test.java
@@ -0,0 +1,129 @@
+package com.ruoyi.web.core.config;
+
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.BaseFinancesubject;
+import com.ruoyi.project.domain.TestExcelVo;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Test {
+
+ public static void main(String[] args) throws Exception {
+
+// mergeExcel("E:\\OPO\\WEB\\Upload\\download\\3683d6af-c2c6-4225-821c-e54f6b0cda3f_VIEW鏁版嵁.xlsx", "E:\\OPO\\WEB\\Upload\\download\\18ae2e71-730a-4948-929c-549df35104e3_VIEW鏁版嵁.xlsx", "E:\\OPO\\WEB\\Upload\\download\\鏁版嵁娴嬭瘯.xlsx");
+//
+// ArrayList list=new ArrayList();
+// list.add("3683d6af-c2c6-4225-821c-e54f6b0cda3f_VIEW鏁版嵁.xlsx");
+// list.add("bcfc7779-d7f1-416b-9c60-61315a59699e_VIEW鏁版嵁.xlsx");
+//
+// mergeExcel2(list,"E:\\OPO\\WEB\\Upload\\download\\鏁版嵁娴嬭瘯.xlsx");
+ }
+
+ private static void createTableWithBorders(Sheet sheet, int startRow, int startCol, int numRows, int numCols, List<String> list, Workbook workbook) {
+ for (int i = startRow; i < startRow + numRows; i++) {
+ Row row = sheet.createRow(i);
+ if (i == 4) {
+ CellStyle cellStyle = workbook.createCellStyle();
+ cellStyle.setFillForegroundColor(IndexedColors.YELLOW.getIndex()); // 璁剧疆鍓嶆櫙濉厖棰滆壊涓洪粍鑹�
+ cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND); // 璁剧疆濉厖妯″紡
+
+ // 搴旂敤鏍峰紡鍒拌
+ row.setRowStyle(cellStyle);
+ }
+ for (int j = startCol; j <= startCol + numCols; j++) {
+ sheet.setColumnWidth(j, (j + 1) * 256);
+ Cell cell = row.createCell(j);
+// cell.setCellValue("Table" + (i - startRow) + (j - startCol));
+ cell.setCellValue(list.get(j - startCol));
+ // Apply borders to the cell
+ CellStyle cellStyle = sheet.getWorkbook().createCellStyle();
+ cellStyle.setBorderTop(BorderStyle.THIN);
+ cellStyle.setBorderBottom(BorderStyle.THIN);
+ cellStyle.setBorderLeft(BorderStyle.THIN);
+ cellStyle.setBorderRight(BorderStyle.THIN);
+ cell.setCellStyle(cellStyle);
+ }
+ }
+ }
+
+
+ public static void mergeExcel(String file1, String file2, String outputFile) throws IOException {
+ try {
+ InputStream is1 = new FileInputStream(file1);
+ InputStream is2 = new FileInputStream(file2);
+ Workbook workbook1 = new XSSFWorkbook(is1);
+ Workbook workbook2 = new XSSFWorkbook(is2);
+ Workbook resultWorkbook = new XSSFWorkbook();
+
+ Sheet sheet1 = workbook1.getSheetAt(0);
+ Sheet sheet2 = workbook2.getSheetAt(0);
+
+ // 澶嶅埗绗竴涓枃浠剁殑Sheet
+ Sheet newSheet1 = resultWorkbook.createSheet("Sheet1");
+ for (Row row : sheet1) {
+ Row newRow = newSheet1.createRow(row.getRowNum());
+ int columns = row.getLastCellNum();
+ for (int i = 0; i < columns; i++) {
+ newSheet1.setColumnWidth(i, 6000);
+ Cell cell = row.getCell(i);
+ Cell newCell = newRow.createCell(cell.getColumnIndex());
+ newCell.setCellValue(cell.getStringCellValue());
+ }
+ }
+
+ // 澶嶅埗绗簩涓枃浠剁殑Sheet
+ Sheet newSheet2 = resultWorkbook.createSheet("Sheet2");
+ for (Row row : sheet2) {
+ Row newRow = newSheet2.createRow(row.getRowNum());
+ for (Cell cell : row) {
+ Cell newCell = newRow.createCell(cell.getColumnIndex());
+ newCell.setCellValue(cell.getStringCellValue());
+ }
+ }
+
+ // 鍐欏叆鍒版柊鐨凟xcel鏂囦欢
+ FileOutputStream out = new FileOutputStream(outputFile);
+ resultWorkbook.write(out);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ public static void mergeExcel2(List<String> files, String outputFile) {
+ try {
+ Workbook resultWorkbook = new XSSFWorkbook();
+ for (String file : files) {
+ InputStream is1 = new FileInputStream("E:\\OPO\\WEB\\Upload\\download\\" + file);
+ Workbook workbook1 = new XSSFWorkbook(is1);
+ Sheet sheet1 = workbook1.getSheetAt(0);
+ // 澶嶅埗绗竴涓枃浠剁殑Sheet
+ Sheet newSheet1 = resultWorkbook.createSheet(file.substring(0, file.indexOf(".")));
+ for (Row row : sheet1) {
+ Row newRow = newSheet1.createRow(row.getRowNum());
+ int columns = row.getLastCellNum();
+ for (int i = 0; i < columns; i++) {
+ newSheet1.setColumnWidth(i, 6000);
+ Cell cell = row.getCell(i);
+ Cell newCell = newRow.createCell(cell.getColumnIndex());
+ newCell.setCellValue(cell.getStringCellValue());
+ }
+ }
+
+ }
+ FileOutputStream out = new FileOutputStream(outputFile);
+ resultWorkbook.write(out);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+}
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 f0575f1..6243da1 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
@@ -223,7 +223,9 @@
}
}
if (b == 1) {
- serviceDonatebaseinfo.setCreateBy(user.getUserName());
+// serviceDonatebaseinfo.setCreateBy(user.getUserName());
+ log.info("user.getUserName()鐨勫�间负 ---- 锛歿}", user.getUserName());
+ serviceDonatebaseinfo.setReporterno(user.getUserName());
}
if (b == 2) {
serviceDonatebaseinfo.setDeptid(user.getDeptId());
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java
index 866ebfd..1ff7ad6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java
@@ -120,7 +120,7 @@
}
}
if (b) {
- donationCompletionVO.setBasecreateby(user.getUserName());
+ donationCompletionVO.setReporterno(user.getUserName());
}
return serviceDonatecompletioninfoMapper.selectVOList(donationCompletionVO);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java
index bd8cba8..049099e 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java
@@ -80,7 +80,7 @@
}
}
if (b) {
- donationWitnessVO.setBasecreateby(user.getUserName());
+ donationWitnessVO.setReporterno(user.getUserName());
}
List<DonationWitnessVO> donationWitnessVOS = serviceDonationwitnessMapper.selectVOList(donationWitnessVO);
return donationWitnessVOS;
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java
index 6ff5ad4..11cf764 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java
@@ -21,12 +21,12 @@
/**
* 浼︾悊瀹℃煡涓撳鎰忚Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2021-11-23
*/
@Service
-public class ServiceEthicalreviewopinionsServiceImpl extends ServiceImpl<ServiceEthicalreviewopinionsMapper, ServiceEthicalreviewopinions> implements IServiceEthicalreviewopinionsService
+public class ServiceEthicalreviewopinionsServiceImpl extends ServiceImpl<ServiceEthicalreviewopinionsMapper, ServiceEthicalreviewopinions> implements IServiceEthicalreviewopinionsService
{
@Autowired
@@ -35,7 +35,7 @@
/**
* 鏌ヨ浼︾悊瀹℃煡涓撳鎰忚鍒楄〃
- *
+ *
* @param serviceEthicalreviewopinions 浼︾悊瀹℃煡涓撳鎰忚
* @return 浼︾悊瀹℃煡涓撳鎰忚
*/
@@ -81,7 +81,7 @@
}
}
if(b){
- ethicalReviewVO.setBasecreateby(user.getUserName());
+ ethicalReviewVO.setReporterno(user.getUserName());
}
return serviceEthicalreviewopinionsMapper.selectVOList(ethicalReviewVO);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java
index b91ddef..f80b863 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java
@@ -70,7 +70,8 @@
}
}
if (b) {
- medicalEvaluationVO.setBasecreateby(user.getUserName());
+// medicalEvaluationVO.setBasecreateby(user.getUserName());
+ medicalEvaluationVO.setReporterno(user.getUserName());
}
log.info("selectVOList鐨勫叆鍙傛槸锛歿}", medicalEvaluationVO);
return serviceMedicalevaluationMapper.selectVOList(medicalEvaluationVO);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceRelativesconfirmationServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceRelativesconfirmationServiceImpl.java
index df440fe..b99e681 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceRelativesconfirmationServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceRelativesconfirmationServiceImpl.java
@@ -24,12 +24,12 @@
/**
* 鎹愮尞浜插睘纭Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2021-11-15
*/
@Service
-public class ServiceRelativesconfirmationServiceImpl extends ServiceImpl<ServiceRelativesconfirmationMapper, ServiceRelativesconfirmation> implements IServiceRelativesconfirmationService
+public class ServiceRelativesconfirmationServiceImpl extends ServiceImpl<ServiceRelativesconfirmationMapper, ServiceRelativesconfirmation> implements IServiceRelativesconfirmationService
{
@Autowired
@@ -44,7 +44,7 @@
/**
* 鏌ヨ鎹愮尞浜插睘纭鍒楄〃
- *
+ *
* @param serviceRelativesconfirmation 鎹愮尞浜插睘纭
* @return 鎹愮尞浜插睘纭
*/
@@ -204,7 +204,7 @@
}
}
if(b){
- relativeConfirmationVO.setBasecreateby(user.getUserName());
+ relativeConfirmationVO.setReporterno(user.getUserName());
}
return serviceRelativesconfirmationMapper.selectVOList(relativeConfirmationVO);
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
index 3ff21a4..89798f2 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
@@ -1,46 +1,68 @@
<?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.ServiceDonatecompletioninfoMapper">
<resultMap type="com.ruoyi.project.domain.ServiceDonatecompletioninfo" id="ServiceDonatecompletioninfoResult">
- <result property="id" column="ID" />
- <result property="infoid" column="InfoID" />
- <result property="donorno" column="DonorNo" />
- <result property="del_flag" column="del_flag" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="isbodydonation" column="IsBodyDonation" />
- <result property="receivingunit" column="ReceivingUnit" />
- <result property="receivingunitname" column="ReceivingUnitName" />
- <result property="completetime" column="CompleteTime" />
- <result property="responsibleuserid" column="ResponsibleUserID" />
- <result property="responsibleusername" column="ResponsibleUserName" />
- <result property="coordinateduserido" column="CoordinatedUserIDO" />
- <result property="coordinatedusernameo" column="CoordinatedUserNameO" />
- <result property="coordinateduseridt" column="CoordinatedUserIDT" />
- <result property="coordinatedusernamet" column="CoordinatedUserNameT" />
- <result property="assessannex" column="AssessAnnex" />
- <result property="donateorgan" column="DonateOrgan" />
+ <result property="id" column="ID"/>
+ <result property="infoid" column="InfoID"/>
+ <result property="donorno" column="DonorNo"/>
+ <result property="del_flag" column="del_flag"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="isbodydonation" column="IsBodyDonation"/>
+ <result property="receivingunit" column="ReceivingUnit"/>
+ <result property="receivingunitname" column="ReceivingUnitName"/>
+ <result property="completetime" column="CompleteTime"/>
+ <result property="responsibleuserid" column="ResponsibleUserID"/>
+ <result property="responsibleusername" column="ResponsibleUserName"/>
+ <result property="coordinateduserido" column="CoordinatedUserIDO"/>
+ <result property="coordinatedusernameo" column="CoordinatedUserNameO"/>
+ <result property="coordinateduseridt" column="CoordinatedUserIDT"/>
+ <result property="coordinatedusernamet" column="CoordinatedUserNameT"/>
+ <result property="assessannex" column="AssessAnnex"/>
+ <result property="donateorgan" column="DonateOrgan"/>
</resultMap>
<sql id="selectServiceDonatecompletioninfoVo">
- select ID, InfoID, DonorNo, del_flag, create_by, create_time, update_by, update_time, IsBodyDonation, ReceivingUnit, ReceivingUnitName, CompleteTime, ResponsibleUserID, ResponsibleUserName, CoordinatedUserIDO, CoordinatedUserNameO, CoordinatedUserIDT, CoordinatedUserNameT, AssessAnnex, DonateOrgan from service_donatecompletioninfo
+ select ID,
+ InfoID,
+ DonorNo,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ IsBodyDonation,
+ ReceivingUnit,
+ ReceivingUnitName,
+ CompleteTime,
+ ResponsibleUserID,
+ ResponsibleUserName,
+ CoordinatedUserIDO,
+ CoordinatedUserNameO,
+ CoordinatedUserIDT,
+ CoordinatedUserNameT,
+ AssessAnnex,
+ DonateOrgan
+ from service_donatecompletioninfo
</sql>
- <select id="selectServiceDonatecompletioninfoList" parameterType="com.ruoyi.project.domain.ServiceDonatecompletioninfo" resultMap="ServiceDonatecompletioninfoResult">
+ <select id="selectServiceDonatecompletioninfoList"
+ parameterType="com.ruoyi.project.domain.ServiceDonatecompletioninfo"
+ resultMap="ServiceDonatecompletioninfoResult">
<include refid="selectServiceDonatecompletioninfoVo"/>
<where>
- <if test="donorno != null and donorno != ''"> and DonorNo = #{donorno}</if>
- <if test="isbodydonation != null and isbodydonation != ''"> and IsBodyDonation = #{isbodydonation}</if>
- <if test="receivingunit != null and receivingunit != ''"> and ReceivingUnit = #{receivingunit}</if>
+ <if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
+ <if test="isbodydonation != null and isbodydonation != ''">and IsBodyDonation = #{isbodydonation}</if>
+ <if test="receivingunit != null and receivingunit != ''">and ReceivingUnit = #{receivingunit}</if>
</where>
</select>
<select id="selectVOList" resultType="com.ruoyi.project.domain.vo.DonationCompletionVO">
- SELECT
+ SELECT
`service_donatebaseinfo`.`ID` AS `ID`,
`service_donatebaseinfo`.`DonorNo` AS `DonorNo`,
`service_donatebaseinfo`.`DonationCategory` AS `DonationCategory`,
@@ -96,48 +118,59 @@
`service_donatecompletioninfo`.`create_time` AS `createtime`,
`service_donatecompletioninfo`.`update_by` AS `updateby`,
`service_donatecompletioninfo`.`update_time` AS `updatetime`
- FROM
-
- `service_donatebaseinfo`
- LEFT JOIN ( select * from `service_donatecompletioninfo` where `del_flag`='0' and id in (
- select min(id) from `service_donatecompletioninfo` where `del_flag`='0' group by `InfoID`
- ) )`service_donatecompletioninfo` ON
- `service_donatebaseinfo`.`ID` = `service_donatecompletioninfo`.`InfoID`
+ FROM
+ `service_donatebaseinfo`
+ LEFT JOIN `service_donatecompletioninfo` ON
+ `service_donatebaseinfo`.`ID` = `service_donatecompletioninfo`.`InfoID`
LEFT JOIN `base_organization` ON
`base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
-
-
<where>
`service_donatebaseinfo`.`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>
- <if test="idcardno != null and idcardno != ''"> and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
- <if test="treatmenthospitalno != null and treatmenthospitalno != ''"> and `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}</if>
- <if test="recordstate != null and recordstate != ''"> and `service_donatebaseinfo`.`RecordState` = #{recordstate}</if>
- <if test="basecreateby != null and basecreateby != ''"> and `service_donatebaseinfo`.`create_by` = #{basecreateby}</if>
- <if test="starttime != null "> and `service_donatecompletioninfo`.CompleteTime >= #{starttime} </if>
- <if test="endtime != null "> and `service_donatecompletioninfo`.CompleteTime <= #{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="id != null "> and `service_donatebaseinfo`.`ID` = #{id}</if>
- <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
- </where>
+ and service_donatecompletioninfo.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>
+ <if test="idcardno != null and idcardno != ''">and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
+ <if test="treatmenthospitalno != null and treatmenthospitalno != ''">and
+ `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}
+ </if>
+ <if test="recordstate != null and recordstate != ''">and `service_donatebaseinfo`.`RecordState` =
+ #{recordstate}
+ </if>
+ <if test="basecreateby != null and basecreateby != ''">and `service_donatebaseinfo`.`create_by` =
+ #{basecreateby}
+ </if>
+ <if test="starttime != null ">and `service_donatecompletioninfo`.CompleteTime >= #{starttime}</if>
+ <if test="endtime != null ">and `service_donatecompletioninfo`.CompleteTime <= #{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="id != null ">and `service_donatebaseinfo`.`ID` = #{id}</if>
+ <if test="workflow != null ">and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
+ </where>
order by `service_donatecompletioninfo`.`create_time` desc
</select>
<select id="countNumber" resultType="java.lang.Integer">
- select count(*) from service_donatecompletioninfo
- where CompleteTime >= #{starttime} and CompleteTime <= #{endtime} AND del_flag=0
+ select count(*)
+ from service_donatecompletioninfo
+ where CompleteTime >= #{starttime}
+ and CompleteTime <= #{endtime}
+ AND del_flag = 0
</select>
<select id="getByInfoId" resultType="com.ruoyi.project.domain.ServiceDonatecompletioninfo">
<include refid="selectServiceDonatecompletioninfoVo"/>
- where InfoID = #{id} AND del_flag=0
+ where InfoID = #{id} AND del_flag=0
</select>
<select id="count" resultType="java.lang.Integer">
- select count(*) from service_donatecompletioninfo
- where del_flag=0 and CompleteTime >= #{starttime} and CompleteTime <= #{endtime}
+ select count(*)
+ from service_donatecompletioninfo
+ where del_flag = 0
+ and CompleteTime >= #{starttime}
+ and CompleteTime <= #{endtime}
</select>
<select id="getCompletionDonatePeopleByTime" resultType="com.ruoyi.project.domain.ServiceDonatecompletioninfo">
<include refid="selectServiceDonatecompletioninfoVo"/>
@@ -147,7 +180,9 @@
<update id="delDuplicateDonateCompletioninfo">
update service_donatecompletioninfo
- set del_flag = 1,create_by= #{createby},update_time=now()
+ set del_flag = 1,
+ create_by= #{createby},
+ update_time=now()
where InfoID = #{infoid}
</update>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index 6071d8c..8548531 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -170,6 +170,7 @@
<where>
service_donationwitness.del_flag=0
+ and service_donatebaseinfo.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>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
index ceb3664..e163f41 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
@@ -119,6 +119,8 @@
base_organization.OrganizationID = service_donatebaseinfo.TreatmentHospitalNo
<where>
+ service_donatebaseinfo.del_flag=0
+ and service_ethicalreviewopinions.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>
@@ -153,4 +155,4 @@
and create_time <= #{endtime}
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
index e2696ba..22e321b 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
@@ -95,16 +95,14 @@
`service_medicalevaluation`.`update_by` AS `updateby`,
`service_medicalevaluation`.`update_time` AS `updatetime`
FROM
-
`service_donatebaseinfo`
LEFT JOIN `service_medicalevaluation` ON
`service_donatebaseinfo`.`ID` = `service_medicalevaluation`.`InfoID`
LEFT JOIN `base_organization` ON
`base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
-
-
<where>
- service_medicalevaluation.del_flag != 1
+ service_medicalevaluation.del_flag = 0
+ and service_donatebaseinfo.del_flag = 0
<if test="name != null and name != ''"> and `service_donatebaseinfo`.Name like concat('%', #{name}, '%')</if>
<if test="donorno != null and donorno != ''"> and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
<if test="idcardno != null and idcardno != ''"> and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index 9a6d0be..b922403 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -158,6 +158,8 @@
`base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
<where>
+ service_donatebaseinfo.del_flag=0
+ and service_relativesconfirmation.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>
<if test="idcardno != null and idcardno != ''"> and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
--
Gitblit v1.9.3