变更

liusheng

2024-07-29 fbf5402f03820ebc702871fc4c4933c024ff3087

变更

 ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java

@@ -85,6 +85,13 @@
    private String reportername;

    /**
     * 案例区域
     */
    @ApiModelProperty("案例区域")
    @Excel(name = "案例区域")
    private String regionalLevel;

    /**
     * 案例时间
     */
    @ApiModelProperty("案例时间")
@@ -93,6 +100,22 @@
    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 starttime;

    /**
     * 结束时间
     */
    @ApiModelProperty("结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date endtime;

    /**
     * 报告时间
     */
    @ApiModelProperty("报告时间")

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VDonationworkflowServiceImpl.java

@@ -49,6 +49,9 @@
        if (StringUtils.isNotBlank(vDonationworkflow.getDeptname())){
            wrappers.like(VDonationworkflow::getDeptname ,vDonationworkflow.getDeptname());
        }
        if (StringUtils.isNotBlank(vDonationworkflow.getRegionalLevel())){
            wrappers.eq(VDonationworkflow::getRegionalLevel ,vDonationworkflow.getRegionalLevel());
        }
        if (StringUtils.isNotBlank(vDonationworkflow.getReporterno())){
            wrappers.eq(VDonationworkflow::getReporterno ,vDonationworkflow.getReporterno());
        }
@@ -56,7 +59,10 @@
            wrappers.like(VDonationworkflow::getReportername ,vDonationworkflow.getReportername());
        }
        if (vDonationworkflow.getDonatetime() != null){
            wrappers.eq(VDonationworkflow::getDonatetime ,vDonationworkflow.getDonatetime());
            wrappers.ge(VDonationworkflow::getDonatetime ,vDonationworkflow.getStarttime());
        }
        if (vDonationworkflow.getDonatetime() != null){
            wrappers.lt(VDonationworkflow::getDonatetime ,vDonationworkflow.getEndtime());
        }
        if (vDonationworkflow.getReporttime() != null){
            wrappers.eq(VDonationworkflow::getReporttime ,vDonationworkflow.getReporttime());

 ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml

@@ -24,6 +24,7 @@
        <result property="organcount" column="organcount"/>
        <result property="operationbegtime" column="operationBegTime"/>
        <result property="completetime" column="completeTime"/>
        <result property="regionalLevel" column="regionalLevel"/>
    </resultMap>

    <sql id="selectVDonationworkflowVo">
@@ -45,7 +46,8 @@
               conclusionTime,
               organcount,
               operationBegTime,
               completeTime
               completeTime,
               regionalLevel
        from v_donationworkflow
    </sql>

@@ -63,8 +65,11 @@
            <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="starttime != null ">and donatetime >= #{starttime}</if>
            <if test="endtime != null ">and donatetime &lt;= #{endtime}
            </if>
            <if test="coreteamassessconclusion != null  and coreteamassessconclusion != ''">and CoreTeamAssessConclusion
                = #{coreteamassessconclusion}
            </if>
@@ -75,6 +80,7 @@
            <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="regionalLevel != null ">and regionalLevel = #{regionalLevel}</if>
        </where>
    </select>