|
|
@ -49,7 +49,7 @@ public class DataDictionaryUtil {
|
|
|
|
for (OcrPicture picture : ocrPictureList) {
|
|
|
|
for (OcrPicture picture : ocrPictureList) {
|
|
|
|
//1.检查提报人字典是否包含数据
|
|
|
|
//1.检查提报人字典是否包含数据
|
|
|
|
if(picture.getUpname()!=null && picture.getUpuserid()!=null){
|
|
|
|
if(picture.getUpname()!=null && picture.getUpuserid()!=null){
|
|
|
|
OcrDictionaryGroup upNameDG = ocrDictionaryService.queryGroupByField("upName");
|
|
|
|
OcrDictionaryGroup upNameDG = ocrDictionaryService.queryGroupByField("person");
|
|
|
|
if(upNameDG!=null && ocrDictionaryService.isValueExists(upNameDG.getId(),picture.getUpname(),picture.getTenantId())){
|
|
|
|
if(upNameDG!=null && ocrDictionaryService.isValueExists(upNameDG.getId(),picture.getUpname(),picture.getTenantId())){
|
|
|
|
OcrDictionary dictionary= new OcrDictionary();
|
|
|
|
OcrDictionary dictionary= new OcrDictionary();
|
|
|
|
dictionary.setLable(picture.getUpname());
|
|
|
|
dictionary.setLable(picture.getUpname());
|
|
|
@ -68,7 +68,7 @@ public class DataDictionaryUtil {
|
|
|
|
|
|
|
|
|
|
|
|
//2.任务计划
|
|
|
|
//2.任务计划
|
|
|
|
if(picture.getPlanname()!=null && picture.getPlanid()!=null) {
|
|
|
|
if(picture.getPlanname()!=null && picture.getPlanid()!=null) {
|
|
|
|
OcrDictionaryGroup planNameDG = ocrDictionaryService.queryGroupByField("planName");
|
|
|
|
OcrDictionaryGroup planNameDG = ocrDictionaryService.queryGroupByField("plan");
|
|
|
|
if (planNameDG!=null && ocrDictionaryService.isValueExists(planNameDG.getId(), picture.getPlanname(), picture.getTenantId())) {
|
|
|
|
if (planNameDG!=null && ocrDictionaryService.isValueExists(planNameDG.getId(), picture.getPlanname(), picture.getTenantId())) {
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
dictionary.setLable(picture.getPlanname());
|
|
|
|
dictionary.setLable(picture.getPlanname());
|
|
|
@ -84,7 +84,7 @@ public class DataDictionaryUtil {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//3.拜访客户类型
|
|
|
|
//3.拜访客户类型
|
|
|
|
if(picture.getField2()!=null) {
|
|
|
|
if(picture.getField2()!=null) {
|
|
|
|
OcrDictionaryGroup field2DG = ocrDictionaryService.queryGroupByField("field2");
|
|
|
|
OcrDictionaryGroup field2DG = ocrDictionaryService.queryGroupByField("izcustomtype");
|
|
|
|
if (field2DG!=null && ocrDictionaryService.isValueExists(field2DG.getId(), picture.getField2(), picture.getTenantId())) {
|
|
|
|
if (field2DG!=null && ocrDictionaryService.isValueExists(field2DG.getId(), picture.getField2(), picture.getTenantId())) {
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
dictionary.setLable(picture.getField2());
|
|
|
|
dictionary.setLable(picture.getField2());
|
|
|
@ -101,7 +101,7 @@ public class DataDictionaryUtil {
|
|
|
|
|
|
|
|
|
|
|
|
//4.拜访客户名称
|
|
|
|
//4.拜访客户名称
|
|
|
|
if(picture.getField3()!=null) {
|
|
|
|
if(picture.getField3()!=null) {
|
|
|
|
OcrDictionaryGroup field3DG = ocrDictionaryService.queryGroupByField("field3");
|
|
|
|
OcrDictionaryGroup field3DG = ocrDictionaryService.queryGroupByField("izcustomname");
|
|
|
|
if (field3DG!=null && ocrDictionaryService.isValueExists(field3DG.getId(), picture.getField3(), picture.getTenantId())) {
|
|
|
|
if (field3DG!=null && ocrDictionaryService.isValueExists(field3DG.getId(), picture.getField3(), picture.getTenantId())) {
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
dictionary.setLable(picture.getField3());
|
|
|
|
dictionary.setLable(picture.getField3());
|
|
|
@ -118,7 +118,7 @@ public class DataDictionaryUtil {
|
|
|
|
|
|
|
|
|
|
|
|
//5.任务来源
|
|
|
|
//5.任务来源
|
|
|
|
if(picture.getField4()!=null) {
|
|
|
|
if(picture.getField4()!=null) {
|
|
|
|
OcrDictionaryGroup field4DG = ocrDictionaryService.queryGroupByField("field4");
|
|
|
|
OcrDictionaryGroup field4DG = ocrDictionaryService.queryGroupByField("iztaskrrom");
|
|
|
|
if (field4DG!=null && ocrDictionaryService.isValueExists(field4DG.getId(), picture.getField4(), picture.getTenantId())) {
|
|
|
|
if (field4DG!=null && ocrDictionaryService.isValueExists(field4DG.getId(), picture.getField4(), picture.getTenantId())) {
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
dictionary.setLable(picture.getField4());
|
|
|
|
dictionary.setLable(picture.getField4());
|
|
|
@ -134,7 +134,7 @@ public class DataDictionaryUtil {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//6.厂商
|
|
|
|
//6.厂商
|
|
|
|
if(picture.getField5()!=null) {
|
|
|
|
if(picture.getField5()!=null) {
|
|
|
|
OcrDictionaryGroup field5DG = ocrDictionaryService.queryGroupByField("field5");
|
|
|
|
OcrDictionaryGroup field5DG = ocrDictionaryService.queryGroupByField("izfirm");
|
|
|
|
if (field5DG!=null && ocrDictionaryService.isValueExists(field5DG.getId(), picture.getField5(), picture.getTenantId())) {
|
|
|
|
if (field5DG!=null && ocrDictionaryService.isValueExists(field5DG.getId(), picture.getField5(), picture.getTenantId())) {
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
dictionary.setLable(picture.getField5());
|
|
|
|
dictionary.setLable(picture.getField5());
|
|
|
@ -150,7 +150,7 @@ public class DataDictionaryUtil {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//7.拜访客户级别
|
|
|
|
//7.拜访客户级别
|
|
|
|
if(picture.getField6()!=null) {
|
|
|
|
if(picture.getField6()!=null) {
|
|
|
|
OcrDictionaryGroup field6DG = ocrDictionaryService.queryGroupByField("field6");
|
|
|
|
OcrDictionaryGroup field6DG = ocrDictionaryService.queryGroupByField("izcustomlevel");
|
|
|
|
if (field6DG!=null && ocrDictionaryService.isValueExists(field6DG.getId(), picture.getField6(), picture.getTenantId())) {
|
|
|
|
if (field6DG!=null && ocrDictionaryService.isValueExists(field6DG.getId(), picture.getField6(), picture.getTenantId())) {
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
dictionary.setLable(picture.getField6());
|
|
|
|
dictionary.setLable(picture.getField6());
|
|
|
@ -166,7 +166,7 @@ public class DataDictionaryUtil {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//8.拜访项目类别
|
|
|
|
//8.拜访项目类别
|
|
|
|
if(picture.getField17()!=null) {
|
|
|
|
if(picture.getField17()!=null) {
|
|
|
|
OcrDictionaryGroup field17DG = ocrDictionaryService.queryGroupByField("field17");
|
|
|
|
OcrDictionaryGroup field17DG = ocrDictionaryService.queryGroupByField("izprojecttype");
|
|
|
|
if (field17DG!=null && ocrDictionaryService.isValueExists(field17DG.getId(), picture.getField17(), picture.getTenantId())) {
|
|
|
|
if (field17DG!=null && ocrDictionaryService.isValueExists(field17DG.getId(), picture.getField17(), picture.getTenantId())) {
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
dictionary.setLable(picture.getField17());
|
|
|
|
dictionary.setLable(picture.getField17());
|
|
|
@ -183,7 +183,7 @@ public class DataDictionaryUtil {
|
|
|
|
|
|
|
|
|
|
|
|
//9.任务状态
|
|
|
|
//9.任务状态
|
|
|
|
if(picture.getTaskstatus()!=null) {
|
|
|
|
if(picture.getTaskstatus()!=null) {
|
|
|
|
OcrDictionaryGroup taskStatusDG = ocrDictionaryService.queryGroupByField("taskStatus");
|
|
|
|
OcrDictionaryGroup taskStatusDG = ocrDictionaryService.queryGroupByField("iztaskstatus");
|
|
|
|
if (taskStatusDG!=null && ocrDictionaryService.isValueExists(taskStatusDG.getId(), picture.getTaskstatus(), picture.getTenantId())) {
|
|
|
|
if (taskStatusDG!=null && ocrDictionaryService.isValueExists(taskStatusDG.getId(), picture.getTaskstatus(), picture.getTenantId())) {
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
dictionary.setLable(picture.getTaskstatus());
|
|
|
|
dictionary.setLable(picture.getTaskstatus());
|
|
|
@ -200,7 +200,7 @@ public class DataDictionaryUtil {
|
|
|
|
|
|
|
|
|
|
|
|
//10.产品名称
|
|
|
|
//10.产品名称
|
|
|
|
if(picture.getField9()!=null) {
|
|
|
|
if(picture.getField9()!=null) {
|
|
|
|
OcrDictionaryGroup field9DG = ocrDictionaryService.queryGroupByField("field9");
|
|
|
|
OcrDictionaryGroup field9DG = ocrDictionaryService.queryGroupByField("izproductname");
|
|
|
|
if (field9DG!=null && ocrDictionaryService.isValueExists(field9DG.getId(), picture.getField9(), picture.getTenantId())) {
|
|
|
|
if (field9DG!=null && ocrDictionaryService.isValueExists(field9DG.getId(), picture.getField9(), picture.getTenantId())) {
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
dictionary.setLable(picture.getField9());
|
|
|
|
dictionary.setLable(picture.getField9());
|
|
|
@ -217,7 +217,7 @@ public class DataDictionaryUtil {
|
|
|
|
|
|
|
|
|
|
|
|
//11.地区(城市信息)
|
|
|
|
//11.地区(城市信息)
|
|
|
|
if(picture.getReleasearea()!=null) {
|
|
|
|
if(picture.getReleasearea()!=null) {
|
|
|
|
OcrDictionaryGroup releaseAreaDG = ocrDictionaryService.queryGroupByField("releaseArea");
|
|
|
|
OcrDictionaryGroup releaseAreaDG = ocrDictionaryService.queryGroupByField("izvisitcity");
|
|
|
|
if (releaseAreaDG!=null && ocrDictionaryService.isValueExists(releaseAreaDG.getId(), picture.getReleasearea(), picture.getTenantId())) {
|
|
|
|
if (releaseAreaDG!=null && ocrDictionaryService.isValueExists(releaseAreaDG.getId(), picture.getReleasearea(), picture.getTenantId())) {
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
dictionary.setLable(picture.getReleasearea());
|
|
|
|
dictionary.setLable(picture.getReleasearea());
|
|
|
@ -234,7 +234,7 @@ public class DataDictionaryUtil {
|
|
|
|
|
|
|
|
|
|
|
|
//12.地区(省信息)
|
|
|
|
//12.地区(省信息)
|
|
|
|
if(picture.getReleaseprovince()!=null) {
|
|
|
|
if(picture.getReleaseprovince()!=null) {
|
|
|
|
OcrDictionaryGroup releaseProvinceDG = ocrDictionaryService.queryGroupByField("releaseProvince");
|
|
|
|
OcrDictionaryGroup releaseProvinceDG = ocrDictionaryService.queryGroupByField("izvisitpro");
|
|
|
|
if (releaseProvinceDG!=null && ocrDictionaryService.isValueExists(releaseProvinceDG.getId(), picture.getReleaseprovince(), picture.getTenantId())) {
|
|
|
|
if (releaseProvinceDG!=null && ocrDictionaryService.isValueExists(releaseProvinceDG.getId(), picture.getReleaseprovince(), picture.getTenantId())) {
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
dictionary.setLable(picture.getReleaseprovince());
|
|
|
|
dictionary.setLable(picture.getReleaseprovince());
|
|
|
@ -251,7 +251,7 @@ public class DataDictionaryUtil {
|
|
|
|
|
|
|
|
|
|
|
|
//13.项目信息
|
|
|
|
//13.项目信息
|
|
|
|
if(picture.getProjectidname()!=null) {
|
|
|
|
if(picture.getProjectidname()!=null) {
|
|
|
|
OcrDictionaryGroup projectNameDG = ocrDictionaryService.queryGroupByField("projectName");
|
|
|
|
OcrDictionaryGroup projectNameDG = ocrDictionaryService.queryGroupByField("project");
|
|
|
|
if (projectNameDG!=null && ocrDictionaryService.isValueExists(projectNameDG.getId(), picture.getProjectidname(), picture.getTenantId())) {
|
|
|
|
if (projectNameDG!=null && ocrDictionaryService.isValueExists(projectNameDG.getId(), picture.getProjectidname(), picture.getTenantId())) {
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
OcrDictionary dictionary = new OcrDictionary();
|
|
|
|
dictionary.setLable(picture.getProjectidname());
|
|
|
|
dictionary.setLable(picture.getProjectidname());
|
|
|
|