From 32d4054619138c34062fb6bdcfed27caf5d0f97f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 26 七月 2024 11:46:55 +0800
Subject: [PATCH] 变更

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/IVDonationworkflowService.java         |   24 +++
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VDonationworkflowController.java  |  109 +++++++++++++
 ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java                  |  127 +++++++++++++++
 ruoyi-project/src/main/java/com/ruoyi/project/mapper/VDonationworkflowMapper.java            |   25 +++
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VDonationworkflowServiceImpl.java |   91 +++++++++++
 ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml             |    2 
 ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml                  |   57 +++++++
 7 files changed, 433 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VDonationworkflowController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VDonationworkflowController.java
new file mode 100644
index 0000000..de94036
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VDonationworkflowController.java
@@ -0,0 +1,109 @@
+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.VDonationworkflow;
+import com.ruoyi.project.service.IVDonationworkflowService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * VIEWController
+ *
+ * @author ruoyi
+ * @date 2024-07-26
+ */
+@Api("VIEW")
+@RestController
+@RequestMapping("/VDonationworkflow/donationworkflow")
+public class VDonationworkflowController extends BaseController
+{
+    @Autowired
+    private IVDonationworkflowService vDonationworkflowService;
+
+    /**
+     * 鏌ヨVIEW鍒楄〃
+     */
+    @ApiOperation("鏌ヨVIEW鍒楄〃")
+    // @PreAuthorize("@ss.hasPermi('system:donationworkflow:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(VDonationworkflow vDonationworkflow)
+    {
+        startPage();
+        List<VDonationworkflow> list = vDonationworkflowService.queryList(vDonationworkflow);
+        return getDataTable(list);
+    }
+
+    /**
+     * 瀵煎嚭VIEW鍒楄〃
+     */
+    @ApiOperation("瀵煎嚭VIEW鍒楄〃")
+    // @PreAuthorize("@ss.hasPermi('system:donationworkflow:export')")
+    @Log(title = "VIEW", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(VDonationworkflow vDonationworkflow)
+    {
+        List<VDonationworkflow> list = vDonationworkflowService.queryList(vDonationworkflow);
+        ExcelUtil<VDonationworkflow> util = new ExcelUtil<VDonationworkflow>(VDonationworkflow.class);
+        return util.exportExcel(list, "VIEW鏁版嵁");
+    }
+
+    /**
+     * 鑾峰彇VIEW璇︾粏淇℃伅
+     */
+    @ApiOperation("鑾峰彇VIEW璇︾粏淇℃伅")
+    // @PreAuthorize("@ss.hasPermi('system:donationworkflow:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(vDonationworkflowService.getById(id));
+    }
+
+    /**
+     * 鏂板VIEW
+     */
+    @ApiOperation("鏂板VIEW")
+    // @PreAuthorize("@ss.hasPermi('system:donationworkflow:add')")
+    @Log(title = "VIEW", businessType = BusinessType.INSERT)
+    @PostMapping
+    @RepeatSubmit
+    public AjaxResult add(@RequestBody VDonationworkflow vDonationworkflow)
+    {
+        return toAjax(vDonationworkflowService.save(vDonationworkflow));
+    }
+
+    /**
+     * 淇敼VIEW
+     */
+    @ApiOperation("淇敼VIEW")
+    // @PreAuthorize("@ss.hasPermi('system:donationworkflow:edit')")
+    @Log(title = "VIEW", businessType = BusinessType.UPDATE)
+    @PutMapping
+    @RepeatSubmit
+    public AjaxResult edit(@RequestBody VDonationworkflow vDonationworkflow)
+    {
+        return toAjax(vDonationworkflowService.updateById(vDonationworkflow));
+    }
+
+    /**
+     * 鍒犻櫎VIEW
+     */
+    @ApiOperation("鍒犻櫎VIEW")
+    // @PreAuthorize("@ss.hasPermi('system:donationworkflow:remove')")
+    @Log(title = "VIEW", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(vDonationworkflowService.removeByIds(Arrays.asList(ids)));
+    }
+}
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
new file mode 100644
index 0000000..2f097ea
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java
@@ -0,0 +1,127 @@
+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;
+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;
+
+/**
+ * VIEW瀵硅薄 v_donationworkflow
+ *
+ * @author ruoyi
+ * @date 2024-07-26
+ */
+@Data
+@ApiModel("VIEW")
+public class VDonationworkflow extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $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 */
+    @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 */
+    @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 */
+    @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")
+    private Date completetime;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/VDonationworkflowMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/VDonationworkflowMapper.java
new file mode 100644
index 0000000..509150f
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/VDonationworkflowMapper.java
@@ -0,0 +1,25 @@
+package com.ruoyi.project.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.project.domain.VDonationworkflow;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * VIEWMapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-07-26
+ */
+@Mapper
+public interface VDonationworkflowMapper extends BaseMapper<VDonationworkflow> {
+    /**
+     * 鏌ヨVIEW鍒楄〃
+     *
+     * @param vDonationworkflow VIEW
+     * @return VIEW闆嗗悎
+     */
+    public List<VDonationworkflow> selectVDonationworkflowList(VDonationworkflow vDonationworkflow);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IVDonationworkflowService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IVDonationworkflowService.java
new file mode 100644
index 0000000..52bc7b9
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IVDonationworkflowService.java
@@ -0,0 +1,24 @@
+package com.ruoyi.project.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.domain.VDonationworkflow;
+
+import java.util.List;
+
+/**
+ * VIEWService鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-07-26
+ */
+public interface IVDonationworkflowService extends IService<VDonationworkflow>
+{
+
+    /**
+     * 鏌ヨVIEW鍒楄〃
+     *
+     * @param vDonationworkflow VIEW
+     * @return VIEW闆嗗悎
+     */
+    public List<VDonationworkflow> queryList(VDonationworkflow vDonationworkflow);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VDonationworkflowServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VDonationworkflowServiceImpl.java
new file mode 100644
index 0000000..3f833fc
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VDonationworkflowServiceImpl.java
@@ -0,0 +1,91 @@
+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.VDonationworkflow;
+import com.ruoyi.project.mapper.VDonationworkflowMapper;
+import com.ruoyi.project.service.IVDonationworkflowService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * VIEWService涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2024-07-26
+ */
+@Service
+public class VDonationworkflowServiceImpl extends ServiceImpl<VDonationworkflowMapper, VDonationworkflow> implements IVDonationworkflowService
+{
+
+
+    /**
+     * 鏌ヨVIEW鍒楄〃
+     *
+     * @param vDonationworkflow VIEW
+     * @return VIEW
+     */
+    @Override
+    public List<VDonationworkflow> queryList(VDonationworkflow vDonationworkflow) {
+        LambdaQueryWrapper<VDonationworkflow> wrappers = Wrappers.lambdaQuery();
+        if (StringUtils.isNotBlank(vDonationworkflow.getName())){
+            wrappers.like(VDonationworkflow::getName ,vDonationworkflow.getName());
+        }
+        if (StringUtils.isNotBlank(vDonationworkflow.getIdcardno())){
+            wrappers.eq(VDonationworkflow::getIdcardno ,vDonationworkflow.getIdcardno());
+        }
+        if (vDonationworkflow.getWorkflow() != null){
+            wrappers.eq(VDonationworkflow::getWorkflow ,vDonationworkflow.getWorkflow());
+        }
+        if (vDonationworkflow.getTerminationcase() != null){
+            wrappers.eq(VDonationworkflow::getTerminationcase ,vDonationworkflow.getTerminationcase());
+        }
+        if (vDonationworkflow.getDeptid() != null){
+            wrappers.eq(VDonationworkflow::getDeptid ,vDonationworkflow.getDeptid());
+        }
+        if (StringUtils.isNotBlank(vDonationworkflow.getDeptname())){
+            wrappers.like(VDonationworkflow::getDeptname ,vDonationworkflow.getDeptname());
+        }
+        if (StringUtils.isNotBlank(vDonationworkflow.getReporterno())){
+            wrappers.eq(VDonationworkflow::getReporterno ,vDonationworkflow.getReporterno());
+        }
+        if (StringUtils.isNotBlank(vDonationworkflow.getReportername())){
+            wrappers.like(VDonationworkflow::getReportername ,vDonationworkflow.getReportername());
+        }
+        if (vDonationworkflow.getDonatetime() != null){
+            wrappers.eq(VDonationworkflow::getDonatetime ,vDonationworkflow.getDonatetime());
+        }
+        if (vDonationworkflow.getReporttime() != null){
+            wrappers.eq(VDonationworkflow::getReporttime ,vDonationworkflow.getReporttime());
+        }
+        if (StringUtils.isNotBlank(vDonationworkflow.getCoreteamassessconclusion())){
+            wrappers.eq(VDonationworkflow::getCoreteamassessconclusion ,vDonationworkflow.getCoreteamassessconclusion());
+        }
+        if (vDonationworkflow.getCoreteamassesstime() != null){
+            wrappers.eq(VDonationworkflow::getCoreteamassesstime ,vDonationworkflow.getCoreteamassesstime());
+        }
+        if (vDonationworkflow.getSigndate() != null){
+            wrappers.eq(VDonationworkflow::getSigndate ,vDonationworkflow.getSigndate());
+        }
+        if (vDonationworkflow.getExpertconclusion() != null){
+            wrappers.eq(VDonationworkflow::getExpertconclusion ,vDonationworkflow.getExpertconclusion());
+        }
+        if (vDonationworkflow.getConclusiontime() != null){
+            wrappers.eq(VDonationworkflow::getConclusiontime ,vDonationworkflow.getConclusiontime());
+        }
+        if (vDonationworkflow.getOrgancount() != null){
+            wrappers.eq(VDonationworkflow::getOrgancount ,vDonationworkflow.getOrgancount());
+        }
+        if (vDonationworkflow.getOperationbegtime() != null){
+            wrappers.eq(VDonationworkflow::getOperationbegtime ,vDonationworkflow.getOperationbegtime());
+        }
+        if (vDonationworkflow.getCompletetime() != null){
+            wrappers.eq(VDonationworkflow::getCompletetime ,vDonationworkflow.getCompletetime());
+        }
+        return this.list(wrappers);
+    }
+
+}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index 8548531..6e6900e 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -161,13 +161,11 @@
         `service_donationwitness`.`update_by` AS `updateby`,
         `service_donationwitness`.`update_time` AS `updatetime`
         FROM
-
         `service_donatebaseinfo`
         LEFT JOIN `service_donationwitness` ON
         `service_donatebaseinfo`.`ID` = `service_donationwitness`.`InfoID`
         LEFT JOIN `base_organization` ON
         `base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
-
         <where>
             service_donationwitness.del_flag=0
             and service_donatebaseinfo.del_flag=0
diff --git a/ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml b/ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml
new file mode 100644
index 0000000..cd74c62
--- /dev/null
+++ b/ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml
@@ -0,0 +1,57 @@
+<?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.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"    />
+    </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
+    </sql>
+
+    <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>
+        </where>
+    </select>
+
+</mapper>

--
Gitblit v1.9.3