Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/EnterpriseBizMapper.xml

@@ -33,8 +33,12 @@
         FROM
         tz_base_enterprise_info
         <where>
-            <if test="tzBaseEnterpriseInfoDto.createDateRange != null">
-                    AND create_date BETWEEN #{tzBaseEnterpriseInfoDto.createDateRange[0]} AND #{tzBaseEnterpriseInfoDto.createDateRange[1]}
+            <if test="tzBaseEnterpriseInfoDto.startCreateDate != null and tzBaseEnterpriseInfoDto.startCreateDate != ''">
+                    AND create_date &gt;= #{tzBaseEnterpriseInfoDto.startCreateDate}
+            </if>
+
+            <if test="tzBaseEnterpriseInfoDto.endCreateDate != null and tzBaseEnterpriseInfoDto.endCreateDate != ''">
+                    AND create_date &lt;= #{tzBaseEnterpriseInfoDto.endCreateDate}
             </if>
             <if test="tzBaseEnterpriseInfoDto.unitType.indexOf('检验检测机构') !=-1 and tzBaseEnterpriseInfoDto.jyjcStatus!=null and tzBaseEnterpriseInfoDto.jyjcStatus!=''">
              use_unit_code in
@@ -89,9 +93,14 @@
                     test="tzBaseEnterpriseInfoDto.address!=null and tzBaseEnterpriseInfoDto.address!='' ">
                 AND address LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.address},'%')
             </if>
-            <if test="tzBaseEnterpriseInfoDto.regulatoryLabels!=null and tzBaseEnterpriseInfoDto.regulatoryLabels!='' ">
+            <if test="tzBaseEnterpriseInfoDto.regulatoryLabels!=null and tzBaseEnterpriseInfoDto.regulatoryLabels!='' and tzBaseEnterpriseInfoDto.regulatoryLabels=='nothave'">
+                AND regulatory_labels  is null
+            </if>
+
+            <if test="tzBaseEnterpriseInfoDto.regulatoryLabels!=null and tzBaseEnterpriseInfoDto.regulatoryLabels!='' and tzBaseEnterpriseInfoDto.regulatoryLabels!='nothave'">
                 AND regulatory_labels  LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.regulatoryLabels},'%')
             </if>
+
             <if test="tzBaseEnterpriseInfoDto.equipType!=null and tzBaseEnterpriseInfoDto.equipType!='' ">
                 AND equip_category  LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.equipType},'%')
             </if>

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/TzBaseEnterpriseInfoDto.java

@@ -333,6 +333,8 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
 	@ApiModelProperty(value = "创建时间")
 	private Date createDate;
 
-	@ApiModelProperty(value = "创建时间区间")
-	private String[] createDateRange;
+	@ApiModelProperty(value = "创建时间区间开始")
+	private String startCreateDate;
+	@ApiModelProperty(value = "创建时间区间结束")
+	private String endCreateDate;
 }