feat(enterprise): 增加企业创建时间筛选功能

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

@@ -33,6 +33,9 @@
         FROM
         tz_base_enterprise_info
         <where>
+            <if test="tzBaseEnterpriseInfoDto.createDateRange != null">
+                    AND create_date BETWEEN #{tzBaseEnterpriseInfoDto.createDateRange[0]} AND #{tzBaseEnterpriseInfoDto.createDateRange[1]}
+            </if>
             <if test="tzBaseEnterpriseInfoDto.unitType.indexOf('检验检测机构') !=-1 and tzBaseEnterpriseInfoDto.jyjcStatus!=null and tzBaseEnterpriseInfoDto.jyjcStatus!=''">
              use_unit_code in
                 (select distinct unit_code from tz_jyjc_opening_application
@@ -50,10 +53,15 @@
                 </foreach>
                 )
             </if>
-            <if
-                    test="tzBaseEnterpriseInfoDto.useUnit!=null and tzBaseEnterpriseInfoDto.useUnit!='' ">
+            <if test="tzBaseEnterpriseInfoDto.useUnit!=null and tzBaseEnterpriseInfoDto.useUnit!='' ">
                 AND use_unit LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.useUnit},'%')
             </if>
+            <if test="tzBaseEnterpriseInfoDto.useContact!=null and tzBaseEnterpriseInfoDto.useContact!='' ">
+                AND use_contact LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.useContact},'%')
+            </if>
+            <if test="tzBaseEnterpriseInfoDto.contactPhone!=null and tzBaseEnterpriseInfoDto.contactPhone!='' ">
+                AND contact_phone LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.contactPhone},'%')
+            </if>
             <if
                     test="tzBaseEnterpriseInfoDto.useUnitCertificate!=null and tzBaseEnterpriseInfoDto.useUnitCertificate!='' ">
                 AND use_unit_certificate = #{tzBaseEnterpriseInfoDto.useUnitCertificate}

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

@@ -329,4 +329,10 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
 	 * 设备类型-名称
 	 */
 	private String equipTypeName;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createDate;
+
+	@ApiModelProperty(value = "创建时间区间")
+	private String[] createDateRange;
 }