Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -2646,9 +2646,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // 设备状态
         if (!ObjectUtils.isEmpty(map.getString("EQU_STATE"))) {
             BoolQueryBuilder esBuilder = QueryBuilders.boolQuery();
-            if (map.getString("EQU_STATE").equals(EquimentEnum.WEIDENGJI.getName())) {
-                esBuilder.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("EQU_STATE")));
-                esBuilder.should(QueryBuilders.boolQuery().must(QueryBuilders.matchPhraseQuery("EQU_STATE", "")));
+            if (map.getString("EQU_STATE").equals(EquimentEnum.WEIDENGJI.getCode().toString())) {
+                esBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
             } else {
                 String param = QueryParser.escape(map.getLong("EQU_STATE").toString());
                 esBuilder.must(QueryBuilders.matchQuery("EQU_STATE", param));

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/PersonAdvanceSearchEnum.java

@@ -16,8 +16,8 @@ public enum PersonAdvanceSearchEnum {
     NAME("人员名称", "name", TechnicalParameter.ParamType.STRING,"",null,null),
     NEWPOST("人员类型", "newPost",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryRYLX",null,null),
     SUBPOST("人员子类型", "subPost",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryRYLX?type={type}",null,"newPost"),
-//    REGULATORY_LABELS("有无资质", "regulatoryLabels",null,""),
-//    REGULATORY_LABELS("资质状态", "regulatoryLabels",null,""),
+    CERT_NO("有无资质", "certNo",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryCertNo",null,null),
+    EXPIRY_DATE("资质状态", "expiryDate",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryExpiryDate",null,null),
     CERT_TYPE("证书类型", "certType",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryCertType",null,null),
     PERMISSION_LEVEL("证书级别", "permissionLevel",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryPermissionLevel",null,null),
     JOB_ITEM("作业项目", "jobItem",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryZYXM?type={type}",null,"certType"),

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-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/ComprehensiveStatisticalAnalysisController.java

@@ -312,4 +312,26 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
     public ResponseModel<JSONArray> queryPermissionLevel() {
         return ResponseHelper.buildResponse(statisticalAnalysisService.queryPermissionLevel());
     }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryCertNo")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索有无资质", notes = "高级搜索有无资质")
+    public ResponseModel<JSONArray> queryCertNo() {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryCertNo());
+    }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryExpiryDate")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索资质状态", notes = "高级搜索资质状态")
+    public ResponseModel<JSONArray> queryExpiryDate() {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryExpiryDate());
+    }
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -130,6 +130,10 @@ public class JGDPStatisticsServiceImpl {
      * 单位类型-充装单位
      */
     private final static String COMPANY_TYPE_FILLING = "充装单位";
+    /**
+     * 单位类型-设计单位
+     */
+    private final static String DESIGN_UNITS = "设计单位";
 
     /**
      * 单位类型-充装单位
@@ -540,6 +544,7 @@ public class JGDPStatisticsServiceImpl {
                 m.put(DPMapStatisticsItemEnum.CONSTRUCTION_UNITS.getCode(), countDtos.stream().filter(c -> c.getKeyStr().contains(COMPANY_TYPE_MAINTENANCE) && c.getLabel().contains(orgCode)).mapToInt(CountDto::getIntValue).sum());
                 m.put(DPMapStatisticsItemEnum.MANUFACTURING_UNITS.getCode(), countDtos.stream().filter(c -> c.getKeyStr().contains(COMPANY_TYPE_MANUFACTURE) && c.getLabel().contains(orgCode)).mapToInt(CountDto::getIntValue).sum());
                 m.put(DPMapStatisticsItemEnum.GAS_UNITS.getCode(), countDtos.stream().filter(c -> c.getKeyStr().contains(COMPANY_TYPE_FILLING) && c.getLabel().contains(orgCode)).mapToInt(CountDto::getIntValue).sum());
+                m.put(DPMapStatisticsItemEnum.DESIGN_UNITS.getCode(), countDtos.stream().filter(c -> c.getKeyStr().contains(DESIGN_UNITS) && c.getLabel().contains(orgCode)).mapToInt(CountDto::getIntValue).sum());
             } else {
                 setDefaultCompanyCountData(m);
             }

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;
 }