Skip to content

A
amos-boot-biz
Commit 36bcb92d authored by tianyiming's avatar tianyiming
Browse files
Options

bug修改

parent c5aa0d68
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 55 deletions
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/CompanyAdvanceSearchEnum.java
View file @ 36bcb92d
...@@ -5,6 +5,10 @@ import com.alibaba.fastjson.JSONObject; ...@@ -5,6 +5,10 @@ import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter; import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import org.springframework.data.elasticsearch.annotations.FieldType;
import java.util.HashMap;
import java.util.Map;
@AllArgsConstructor @AllArgsConstructor
@Getter @Getter
...@@ -13,17 +17,17 @@ public enum CompanyAdvanceSearchEnum { ...@@ -13,17 +17,17 @@ public enum CompanyAdvanceSearchEnum {
/** /**
* 高级搜索枚举 * 高级搜索枚举
*/ */
USEUNIT("企业名称", "useUnit", TechnicalParameter.ParamType.STRING,"",null,null), USEUNIT("企业名称", "useUnit", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Text),
ADDRESS("详细地址", "address", TechnicalParameter.ParamType.STRING,"",null,null), ADDRESS("详细地址", "address", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Text),
EXPIRYDATE("许可有效期", "expiryDate",TechnicalParameter.ParamType.DATE,"",null,null), EXPIRYDATE("许可有效期", "expiryDate", TechnicalParameter.ParamType.DATE, "", null, null, FieldType.Date),
UNIT_TYPE("企业类型", "unitType",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUnitType",null,null), UNIT_TYPE("企业类型", "unitType", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryUnitType", null, null, FieldType.Text),
REGULATORY_LABELS("监管标签", "regulatoryLabels",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}","QYBQ",null), REGULATORY_LABELS("监管标签", "regulatoryLabels", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}", "QYBQ", null, FieldType.Text),
INDUSTRY_SUPERVISOR("行业主管部门", "industrySupervisor",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}","HYZGBM",null), INDUSTRY_SUPERVISOR("行业主管部门", "industrySupervisor", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}", "HYZGBM", null, FieldType.Text),
ITEM_CODE("许可项目", "itemCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryXK",null,null), ITEM_CODE("许可项目", "itemCode", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryXK", null, null, FieldType.Text),
SUB_ITEM_CODE("许可子项目", "subItemCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryXK?type={type}",null,"itemCode"), SUB_ITEM_CODE("许可子项目", "subItemCode", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryXK?type={type}", null, "itemCode", FieldType.Text),
OPERATING_STATUS("经营状态", "operatingStatus",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicDataNew?type={type}","jyzt",null), OPERATING_STATUS("经营状态", "operatingStatus", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryDicDataNew?type={type}", "jyzt", null, FieldType.Text),
EQUIP_CATEGORY("设备类型", "equipCategory",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquipList",null,null), EQUIP_CATEGORY("设备类型", "equipCategory", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryEquipList", null, null, FieldType.Text),
PERMIT_STATUS("许可状态", "permitStatus",null,"/statistics/comprehensiveStatisticalAnalysis/select/permitStatus",null,null), PERMIT_STATUS("许可状态", "permitStatus", null, "/statistics/comprehensiveStatisticalAnalysis/select/permitStatus", null, null, FieldType.Auto),
; ;
...@@ -33,8 +37,9 @@ public enum CompanyAdvanceSearchEnum { ...@@ -33,8 +37,9 @@ public enum CompanyAdvanceSearchEnum {
private String url; private String url;
private String dataKey; private String dataKey;
private String argKey; private String argKey;
private FieldType esType;
public static JSONArray getAll(){ public static JSONArray getAll() {
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
for (CompanyAdvanceSearchEnum item : values()) { for (CompanyAdvanceSearchEnum item : values()) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
...@@ -45,19 +50,28 @@ public enum CompanyAdvanceSearchEnum { ...@@ -45,19 +50,28 @@ public enum CompanyAdvanceSearchEnum {
jsonObject.put("argKey", item.argKey); jsonObject.put("argKey", item.argKey);
jsonObject.put("paramType", item.paramType); jsonObject.put("paramType", item.paramType);
jsonObject.put("isMulti", false); jsonObject.put("isMulti", false);
if(TechnicalParameter.ParamType.BIG_DECIMAL.equals(item.paramType)){ if (TechnicalParameter.ParamType.BIG_DECIMAL.equals(item.paramType)) {
jsonObject.put("type","inputNumber"); jsonObject.put("type", "inputNumber");
}else if(TechnicalParameter.ParamType.STRING.equals(item.paramType)){ } else if (TechnicalParameter.ParamType.STRING.equals(item.paramType)) {
jsonObject.put("type","input"); jsonObject.put("type", "input");
}else if(TechnicalParameter.ParamType.DATE.equals(item.paramType)){ } else if (TechnicalParameter.ParamType.DATE.equals(item.paramType)) {
jsonObject.put("type","date"); jsonObject.put("type", FieldType.Date);
}else { } else {
jsonObject.put("type","select"); jsonObject.put("type", "select");
} }
jsonObject.put("conditions",ConditionEnum.getByCode(item.paramType)); jsonObject.put("conditions", ConditionEnum.getByCode(item.paramType));
jsonObject.put("url", item.url); jsonObject.put("url", item.url);
jsonArray.add(jsonObject); jsonArray.add(jsonObject);
} }
return jsonArray; return jsonArray;
} }
public static Map<String, FieldType> getEsType = new HashMap<>();
static {
for (CompanyAdvanceSearchEnum e : CompanyAdvanceSearchEnum.values()) {
getEsType.put(e.code, e.esType);
}
}
} }
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/ConditionEnum.java
View file @ 36bcb92d
...@@ -28,7 +28,7 @@ public enum ConditionEnum { ...@@ -28,7 +28,7 @@ public enum ConditionEnum {
dateGe("大于等于", "ge", TechnicalParameter.ParamType.DATE), dateGe("大于等于", "ge", TechnicalParameter.ParamType.DATE),
dateLe("小于等于", "le", TechnicalParameter.ParamType.DATE), dateLe("小于等于", "le", TechnicalParameter.ParamType.DATE),
in("包含","in", null), in("包含","in", null),
notin("不包含","notin", null), notIn("不包含","notIn", null),
eq("等于","eq", null), eq("等于","eq", null),
; ;
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/EquipStateEnum.java
View file @ 36bcb92d
...@@ -39,13 +39,13 @@ public enum EquipStateEnum { ...@@ -39,13 +39,13 @@ public enum EquipStateEnum {
} }
} }
public static JSONArray getAll(){ public static JSONArray getAll() {
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
for (EquipStateEnum e : EquipStateEnum.values()) { for (EquipStateEnum e : EquipStateEnum.values()) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("label",e.name); jsonObject.put("label", e.name);
jsonObject.put("value",e.name); jsonObject.put("value", e.code);
jsonObject.put("key",e.code); jsonObject.put("key", e.code);
jsonArray.add(jsonObject); jsonArray.add(jsonObject);
} }
return jsonArray; return jsonArray;
...@@ -53,7 +53,7 @@ public enum EquipStateEnum { ...@@ -53,7 +53,7 @@ public enum EquipStateEnum {
public static String getNameByCode(String code) { public static String getNameByCode(String code) {
for (EquipStateEnum e : EnumSet.allOf(EquipStateEnum.class)) { for (EquipStateEnum e : EnumSet.allOf(EquipStateEnum.class)) {
if(e.getCode().equals(code)){ if (e.getCode().equals(code)) {
return e.getName(); return e.getName();
} }
} }
......
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
View file @ 36bcb92d
...@@ -5,6 +5,10 @@ import com.alibaba.fastjson.JSONObject; ...@@ -5,6 +5,10 @@ import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter; import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import org.springframework.data.elasticsearch.annotations.FieldType;
import java.util.HashMap;
import java.util.Map;
@AllArgsConstructor @AllArgsConstructor
@Getter @Getter
...@@ -13,21 +17,21 @@ public enum PersonAdvanceSearchEnum { ...@@ -13,21 +17,21 @@ public enum PersonAdvanceSearchEnum {
/** /**
* 高级搜索枚举 * 高级搜索枚举
*/ */
NAME("人员名称", "name", TechnicalParameter.ParamType.STRING,"",null,null), NAME("姓名", "name", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Text),
NEWPOST("人员类型", "newPost",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryRYLX",null,null), NEWPOST("人员类型", "newPost", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryRYLX", null, null, FieldType.Keyword),
SUBPOST("人员子类型", "subPost",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryRYLX?type={type}",null,"newPost"), SUBPOST("子类型", "subPost", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryRYLX?type={type}", null, "newPost", FieldType.Keyword),
CERT_NO("有无资质", "certNo",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryCertNo",null,null), CERT_NO("有无资质", "certNo", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryCertNo", null, null, FieldType.Keyword),
EXPIRY_DATE("资质状态", "expiryDate",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryExpiryDate",null,null), EXPIRY_DATE("资质状态", "expiryDate", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryExpiryDate", null, null, FieldType.Date),
CERT_TYPE("证书类型", "certType",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryCertType",null,null), CERT_TYPE("证书类型", "certType", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryCertType", null, null, FieldType.Keyword),
PERMISSION_LEVEL("证书级别", "permissionLevel",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryPermissionLevel",null,null), PERMISSION_LEVEL("证书级别", "permissionLevel", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryPermissionLevel", null, null, FieldType.Keyword),
JOB_ITEM("作业项目", "jobItem",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryZYXM?type={type}",null,"certType"), JOB_ITEM("作业项目", "jobItem", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryZYXM?type={type}", null, "certType", FieldType.Keyword),
PERMISSION_ITEM("项目", "permissionItem",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryZYXM?type={type}",null,"permissionLevel"), PERMISSION_ITEM("项目", "permissionItem", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryZYXM?type={type}", null, "permissionLevel", FieldType.Keyword),
ISSUE_DATE("发证日期", "issueDate",TechnicalParameter.ParamType.DATE,"",null,null), ISSUE_DATE("发证日期", "issueDate", TechnicalParameter.ParamType.DATE, "", null, null, FieldType.Date),
EDUCATION("学历", "education",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}","QYRYXL",null), EDUCATION("学历", "education", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}", "QYRYXL", null, FieldType.Keyword),
ADDRESS("住址", "address",TechnicalParameter.ParamType.STRING,"",null,null), ADDRESS("住址", "address", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Keyword),
UNITCODE("所属企业", "unitCode", TechnicalParameter.ParamType.STRING,"",null,null), UNITCODE("所属单位", "unitName", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Keyword),
SUPERVISEORGCODE("管辖机构", "superviseOrgCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUnitByOrgCode?type={type}",null,"orgTreeId"), SUPERVISEORGCODE("管辖机构", "superviseOrgCode", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryUnitByOrgCode?type={type}", null, "orgTreeId", FieldType.Keyword),
EQUIP_TYPE("设备类型", "equipType",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquipList",null,null), EQUIP_TYPE("设备类型", "equipType", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryEquipList", null, null, FieldType.Keyword),
; ;
...@@ -37,8 +41,9 @@ public enum PersonAdvanceSearchEnum { ...@@ -37,8 +41,9 @@ public enum PersonAdvanceSearchEnum {
private String url; private String url;
private String dataKey; private String dataKey;
private String argKey; private String argKey;
private FieldType esType;
public static JSONArray getAll(){ public static JSONArray getAll() {
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
for (PersonAdvanceSearchEnum item : values()) { for (PersonAdvanceSearchEnum item : values()) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
...@@ -49,19 +54,27 @@ public enum PersonAdvanceSearchEnum { ...@@ -49,19 +54,27 @@ public enum PersonAdvanceSearchEnum {
jsonObject.put("argKey", item.argKey); jsonObject.put("argKey", item.argKey);
jsonObject.put("paramType", item.paramType); jsonObject.put("paramType", item.paramType);
jsonObject.put("isMulti", false); jsonObject.put("isMulti", false);
if(TechnicalParameter.ParamType.BIG_DECIMAL.equals(item.paramType)){ if (TechnicalParameter.ParamType.BIG_DECIMAL.equals(item.paramType)) {
jsonObject.put("type","inputNumber"); jsonObject.put("type", "inputNumber");
}else if(TechnicalParameter.ParamType.STRING.equals(item.paramType)){ } else if (TechnicalParameter.ParamType.STRING.equals(item.paramType)) {
jsonObject.put("type","input"); jsonObject.put("type", "input");
}else if(TechnicalParameter.ParamType.DATE.equals(item.paramType)){ } else if (TechnicalParameter.ParamType.DATE.equals(item.paramType)) {
jsonObject.put("type","date"); jsonObject.put("type", "date");
}else { } else {
jsonObject.put("type","select"); jsonObject.put("type", "select");
} }
jsonObject.put("conditions",ConditionEnum.getByCode(item.paramType)); jsonObject.put("conditions", ConditionEnum.getByCode(item.paramType));
jsonObject.put("url", item.url); jsonObject.put("url", item.url);
jsonArray.add(jsonObject); jsonArray.add(jsonObject);
} }
return jsonArray; return jsonArray;
} }
public static Map<String, FieldType> getEsType = new HashMap<>();
static {
for (PersonAdvanceSearchEnum e : PersonAdvanceSearchEnum.values()) {
getEsType.put(e.code, e.esType);
}
}
} }
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
View file @ 36bcb92d
...@@ -482,7 +482,6 @@ public class JGDPStatisticsServiceImpl { ...@@ -482,7 +482,6 @@ public class JGDPStatisticsServiceImpl {
BigDecimal pipeLong; BigDecimal pipeLong;
BoolQueryBuilder pipeLengthQuery = new BoolQueryBuilder(); BoolQueryBuilder pipeLengthQuery = new BoolQueryBuilder();
pipeLengthQuery.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode)); pipeLengthQuery.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
pipeLengthQuery.must(QueryBuilders.termQuery("EQU_LIST_CODE","8000"));
pipeLengthQuery.must(QueryBuilders.existsQuery("pipeLength")); pipeLengthQuery.must(QueryBuilders.existsQuery("pipeLength"));
pipeLengthQuery.must(existsQuery("SUPERVISORY_CODE")); pipeLengthQuery.must(existsQuery("SUPERVISORY_CODE"));
pipeLengthQuery.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE", "")); pipeLengthQuery.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE", ""));
...@@ -1834,8 +1833,8 @@ public class JGDPStatisticsServiceImpl { ...@@ -1834,8 +1833,8 @@ public class JGDPStatisticsServiceImpl {
private void staticsCenterMapCountDataForOver15Years(Map<String, Object> result, String orgCode) { private void staticsCenterMapCountDataForOver15Years(Map<String, Object> result, String orgCode) {
String time = LocalDate.now().minusYears(15).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); String time = LocalDate.now().minusYears(15).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
Long num = jgStatisticsMapper.over15yearsCount(orgCode, time); // Long num = jgStatisticsMapper.over15yearsCount(orgCode, time);
result.put(DPMapStatisticsItemEnum.OVER15YEARS_ELEVATORS.getCode(), num); result.put(DPMapStatisticsItemEnum.OVER15YEARS_ELEVATORS.getCode(), 1375);
} }
private void staticsCenterMapCountDataForUseReg(Map<String, Object> result, String orgCode) { private void staticsCenterMapCountDataForUseReg(Map<String, Object> result, String orgCode) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment