tianwu.sun пре 2 месеци
родитељ
комит
5a66beba77
1 измењених фајлова са 2 додато и 2 уклоњено
  1. 2 2
      src/main/resources/mybatis/datas/GyDataMapper.xml

+ 2 - 2
src/main/resources/mybatis/datas/GyDataMapper.xml

@@ -236,7 +236,7 @@
             AND (b.DELETE_STATUS = '1'
             or b.DATA_STATUS = '4')
             AND DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(b.UPDATE_TIME)
-            <if test="industryTypeOne != null and industryTypeOne != ''">and a.INDUSTRY_TYPE_ONE = #{industryTypeOne}</if>
+            <if test="industryTypeOne != null and industryTypeOne != ''"> and a.INDUSTRY_TYPE_ONE like CONCAT('%',#{industryTypeOne},'%')</if>    <if test="industryTypeOne != null and industryTypeOne != ''">and a.INDUSTRY_TYPE_ONE = #{industryTypeOne}</if>
             <if test="dataName != null and dataName != ''">and b.DATA_NAME like CONCAT('%',#{dataName},'%')</if>
             <if test="dataLevel != null and dataLevel != ''">and b.DATA_LEVEL = #{dataLevel}</if>
             <if test="reporterUnit != null and reporterUnit != ''">and a.REPORTER_UNIT like
@@ -287,7 +287,7 @@
             AND (b.DELETE_STATUS = '1'
             or b.DATA_STATUS = '4')
             AND DATE_SUB(CURDATE(), INTERVAL 30 DAY) &lt;= date(b.UPDATE_TIME)
-            <if test="industryTypeOne != null and industryTypeOne != ''">and a.INDUSTRY_TYPE_ONE = #{industryTypeOne}</if>
+            <if test="industryTypeOne != null and industryTypeOne != ''"> and a.INDUSTRY_TYPE_ONE like CONCAT('%',#{industryTypeOne},'%')</if>
             <if test="dataName != null and dataName != ''">and b.DATA_NAME like CONCAT('%',#{dataName},'%')</if>
             <if test="dataLevel != null and dataLevel != ''">and b.DATA_LEVEL = #{dataLevel}</if>
             <if test="reporterUnit != null and reporterUnit != ''">and a.REPORTER_UNIT like