liusheng
2024-07-29 f88bc7734b6575480b7f5383ed94c9f14a4c7a73
变更
已修改3个文件
12 ■■■■ 文件已修改
ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VDonationworkflowServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java
@@ -89,7 +89,7 @@
     */
    @ApiModelProperty("案例区域")
    @Excel(name = "案例区域")
    private String regionalLevel;
    private String regionallevel;
    /**
     * 案例时间
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VDonationworkflowServiceImpl.java
@@ -49,8 +49,8 @@
        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.getRegionallevel())){
            wrappers.eq(VDonationworkflow::getRegionallevel ,vDonationworkflow.getRegionallevel());
        }
        if (StringUtils.isNotBlank(vDonationworkflow.getReporterno())){
            wrappers.eq(VDonationworkflow::getReporterno ,vDonationworkflow.getReporterno());
ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml
@@ -24,7 +24,7 @@
        <result property="organcount" column="organcount"/>
        <result property="operationbegtime" column="operationBegTime"/>
        <result property="completetime" column="completeTime"/>
        <result property="regionalLevel" column="regionalLevel"/>
        <result property="regionallevel" column="regionallevel"/>
    </resultMap>
    <sql id="selectVDonationworkflowVo">
@@ -47,7 +47,7 @@
               organcount,
               operationBegTime,
               completeTime,
               regionalLevel
               regionallevel
        from v_donationworkflow
    </sql>
@@ -80,7 +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>
            <if test="regionallevel != null ">and regionallevel = #{regionallevel}</if>
        </where>
    </select>