|
|
@ -47,7 +47,7 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
|
|
|
|
private UserProvider userProvider;
|
|
|
|
private UserProvider userProvider;
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private BusinessLineContact3Service businessLineContact3Service;
|
|
|
|
private BusinessContact3Service businessContact3Service;
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public List<BusinessLine3Entity> getList(BusinessLine3Pagination businessLine3Pagination){
|
|
|
|
public List<BusinessLine3Entity> getList(BusinessLine3Pagination businessLine3Pagination){
|
|
|
|
return getTypeList(businessLine3Pagination,businessLine3Pagination.getDataType());
|
|
|
|
return getTypeList(businessLine3Pagination,businessLine3Pagination.getDataType());
|
|
|
@ -66,9 +66,9 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
|
|
|
|
int total=0;
|
|
|
|
int total=0;
|
|
|
|
int businessLine3Num =0;
|
|
|
|
int businessLine3Num =0;
|
|
|
|
QueryWrapper<BusinessLine3Entity> businessLine3QueryWrapper=new QueryWrapper<>();
|
|
|
|
QueryWrapper<BusinessLine3Entity> businessLine3QueryWrapper=new QueryWrapper<>();
|
|
|
|
int businessLineContact3Num =0;
|
|
|
|
int businessContact3Num =0;
|
|
|
|
QueryWrapper<BusinessLineContact3Entity> businessLineContact3QueryWrapper=new QueryWrapper<>();
|
|
|
|
QueryWrapper<BusinessContact3Entity> businessContact3QueryWrapper=new QueryWrapper<>();
|
|
|
|
long businessLineContact3count = businessLineContact3Service.count();
|
|
|
|
long businessContact3count = businessContact3Service.count();
|
|
|
|
List<String> allSuperIDlist = new ArrayList<>();
|
|
|
|
List<String> allSuperIDlist = new ArrayList<>();
|
|
|
|
String superOp ="";
|
|
|
|
String superOp ="";
|
|
|
|
if (ObjectUtil.isNotEmpty(businessLine3Pagination.getSuperQueryJson())){
|
|
|
|
if (ObjectUtil.isNotEmpty(businessLine3Pagination.getSuperQueryJson())){
|
|
|
@ -86,12 +86,12 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
|
|
|
|
intersectionSuperList.add(businessLine3List);
|
|
|
|
intersectionSuperList.add(businessLine3List);
|
|
|
|
superNum++;
|
|
|
|
superNum++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
String businessLineContact3Table = "jg_business_contact";
|
|
|
|
String businessContact3Table = "jg_business_contact";
|
|
|
|
boolean businessLineContact3HasSql = queryJson.contains(businessLineContact3Table);
|
|
|
|
boolean businessContact3HasSql = queryJson.contains(businessContact3Table);
|
|
|
|
List<String> businessLineContact3List = generaterSwapUtil.selectIdsByChildCondition(BusinessLine3Constant.getTableList(), businessLineContact3Table , queryJson, null);
|
|
|
|
List<String> businessContact3List = generaterSwapUtil.selectIdsByChildCondition(BusinessLine3Constant.getTableList(), businessContact3Table , queryJson, null);
|
|
|
|
if (businessLineContact3HasSql){
|
|
|
|
if (businessContact3HasSql){
|
|
|
|
allSuperList.addAll(businessLineContact3List);
|
|
|
|
allSuperList.addAll(businessContact3List);
|
|
|
|
intersectionSuperList.add(businessLineContact3List);
|
|
|
|
intersectionSuperList.add(businessContact3List);
|
|
|
|
superNum++;
|
|
|
|
superNum++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
|
|
|
|
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
|
|
|
@ -118,12 +118,12 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
|
|
|
|
intersectionRuleList.add(businessLine3List);
|
|
|
|
intersectionRuleList.add(businessLine3List);
|
|
|
|
ruleNum++;
|
|
|
|
ruleNum++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
String businessLineContact3Table = "jg_business_contact";
|
|
|
|
String businessContact3Table = "jg_business_contact";
|
|
|
|
boolean businessLineContact3HasSql = ruleJson.contains(businessLineContact3Table);
|
|
|
|
boolean businessContact3HasSql = ruleJson.contains(businessContact3Table);
|
|
|
|
List<String> businessLineContact3List = generaterSwapUtil.selectIdsByChildCondition(BusinessLine3Constant.getTableList(), businessLineContact3Table , ruleJson, null);
|
|
|
|
List<String> businessContact3List = generaterSwapUtil.selectIdsByChildCondition(BusinessLine3Constant.getTableList(), businessContact3Table , ruleJson, null);
|
|
|
|
if (businessLineContact3HasSql){
|
|
|
|
if (businessContact3HasSql){
|
|
|
|
allRuleList.addAll(businessLineContact3List);
|
|
|
|
allRuleList.addAll(businessContact3List);
|
|
|
|
intersectionRuleList.add(businessLineContact3List);
|
|
|
|
intersectionRuleList.add(businessContact3List);
|
|
|
|
ruleNum++;
|
|
|
|
ruleNum++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
|
|
|
|
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
|
|
|
@ -147,13 +147,13 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
|
|
|
|
businessLine3Num++;
|
|
|
|
businessLine3Num++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Object businessLineContact3Obj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(businessLineContact3QueryWrapper,BusinessLineContact3Entity.class,businessLine3Pagination.getMenuId(),"0"));
|
|
|
|
Object businessContact3Obj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(businessContact3QueryWrapper,BusinessContact3Entity.class,businessLine3Pagination.getMenuId(),"0"));
|
|
|
|
if (ObjectUtil.isEmpty(businessLineContact3Obj)){
|
|
|
|
if (ObjectUtil.isEmpty(businessContact3Obj)){
|
|
|
|
return new ArrayList<>();
|
|
|
|
return new ArrayList<>();
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
businessLineContact3QueryWrapper = (QueryWrapper<BusinessLineContact3Entity>)businessLineContact3Obj;
|
|
|
|
businessContact3QueryWrapper = (QueryWrapper<BusinessContact3Entity>)businessContact3Obj;
|
|
|
|
if( businessLineContact3QueryWrapper.getExpression().getNormal().size()>0){
|
|
|
|
if( businessContact3QueryWrapper.getExpression().getNormal().size()>0){
|
|
|
|
businessLineContact3Num++;
|
|
|
|
businessContact3Num++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -171,13 +171,13 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Object businessLineContact3Obj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(businessLineContact3QueryWrapper,BusinessLineContact3Entity.class,businessLine3Pagination.getMenuId(),"0"));
|
|
|
|
Object businessContact3Obj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(businessContact3QueryWrapper,BusinessContact3Entity.class,businessLine3Pagination.getMenuId(),"0"));
|
|
|
|
if (ObjectUtil.isEmpty(businessLineContact3Obj)){
|
|
|
|
if (ObjectUtil.isEmpty(businessContact3Obj)){
|
|
|
|
return new ArrayList<>();
|
|
|
|
return new ArrayList<>();
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
businessLineContact3QueryWrapper = (QueryWrapper<BusinessLineContact3Entity>)businessLineContact3Obj;
|
|
|
|
businessContact3QueryWrapper = (QueryWrapper<BusinessContact3Entity>)businessContact3Obj;
|
|
|
|
if( businessLineContact3QueryWrapper.getExpression().getNormal().size()>0){
|
|
|
|
if( businessContact3QueryWrapper.getExpression().getNormal().size()>0){
|
|
|
|
businessLineContact3Num++;
|
|
|
|
businessContact3Num++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -247,15 +247,15 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(businessLineContact3Num>0){
|
|
|
|
if(businessContact3Num>0){
|
|
|
|
List<String> businessLineContact3IdList = businessLineContact3Service.list(businessLineContact3QueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getBusinessLineId())).map(t->t.getBusinessLineId()).collect(Collectors.toList());
|
|
|
|
List<String> businessContact3IdList = businessContact3Service.list(businessContact3QueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getBusinessLineId())).map(t->t.getBusinessLineId()).collect(Collectors.toList());
|
|
|
|
long count = businessLineContact3Service.count();
|
|
|
|
long count = businessContact3Service.count();
|
|
|
|
if (count>0){
|
|
|
|
if (count>0){
|
|
|
|
intersectionList.add(businessLineContact3IdList);
|
|
|
|
intersectionList.add(businessContact3IdList);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
AllIdList.addAll(businessLineContact3IdList);
|
|
|
|
AllIdList.addAll(businessContact3IdList);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
total+=businessLineContact3Num;
|
|
|
|
total+=businessContact3Num;
|
|
|
|
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
|
|
|
|
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
|
|
|
|
if (total>0){
|
|
|
|
if (total>0){
|
|
|
|
if (intersection.size()==0){
|
|
|
|
if (intersection.size()==0){
|
|
|
@ -332,26 +332,26 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
|
|
|
|
this.removeById(entity.getId());
|
|
|
|
this.removeById(entity.getId());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/** BusinessLineContact3子表方法 */
|
|
|
|
/** BusinessContact3子表方法 */
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public List<BusinessLineContact3Entity> getBusinessLineContact3List(String id,BusinessLine3Pagination businessLine3Pagination){
|
|
|
|
public List<BusinessContact3Entity> getBusinessContact3List(String id,BusinessLine3Pagination businessLine3Pagination){
|
|
|
|
Map<String, Object> newtabMap=BusinessLine3Constant.TABLEFIELDKEY.entrySet()
|
|
|
|
Map<String, Object> newtabMap=BusinessLine3Constant.TABLEFIELDKEY.entrySet()
|
|
|
|
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
|
|
|
|
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
|
|
|
|
String tableName="businessLineContact3";
|
|
|
|
String tableName="businessContact3";
|
|
|
|
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
|
|
|
|
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
|
|
|
|
QueryWrapper<BusinessLineContact3Entity> queryWrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<BusinessContact3Entity> queryWrapper = new QueryWrapper<>();
|
|
|
|
queryWrapper = businessLineContact3Service.getChild(businessLine3Pagination,queryWrapper);
|
|
|
|
queryWrapper = businessContact3Service.getChild(businessLine3Pagination,queryWrapper);
|
|
|
|
queryWrapper.lambda().eq(BusinessLineContact3Entity::getBusinessLineId, id);
|
|
|
|
queryWrapper.lambda().eq(BusinessContact3Entity::getBusinessLineId, id);
|
|
|
|
generaterSwapUtil.wrapperHandle(BusinessLine3Constant.getColumnData(), BusinessLine3Constant.getAppColumnData(), queryWrapper,BusinessLineContact3Entity.class,"sub",tableName);
|
|
|
|
generaterSwapUtil.wrapperHandle(BusinessLine3Constant.getColumnData(), BusinessLine3Constant.getAppColumnData(), queryWrapper,BusinessContact3Entity.class,"sub",tableName);
|
|
|
|
return businessLineContact3Service.list(queryWrapper);
|
|
|
|
return businessContact3Service.list(queryWrapper);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/** BusinessLineContact3子表方法 */
|
|
|
|
/** BusinessContact3子表方法 */
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public List<BusinessLineContact3Entity> getBusinessLineContact3List(String id){
|
|
|
|
public List<BusinessContact3Entity> getBusinessContact3List(String id){
|
|
|
|
QueryWrapper<BusinessLineContact3Entity> queryWrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<BusinessContact3Entity> queryWrapper = new QueryWrapper<>();
|
|
|
|
queryWrapper.lambda().eq(BusinessLineContact3Entity::getBusinessLineId, id);
|
|
|
|
queryWrapper.lambda().eq(BusinessContact3Entity::getBusinessLineId, id);
|
|
|
|
return businessLineContact3Service.list(queryWrapper);
|
|
|
|
return businessContact3Service.list(queryWrapper);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
|
|
|
|
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
@ -380,8 +380,8 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//子表字段验证
|
|
|
|
//子表字段验证
|
|
|
|
if (form.getBusinessLineContact3List()!=null){
|
|
|
|
if (form.getBusinessContact3List()!=null){
|
|
|
|
for(BusinessLineContact3Model t : form.getBusinessLineContact3List()){
|
|
|
|
for(BusinessContact3Model t : form.getBusinessContact3List()){
|
|
|
|
if(StringUtil.isNotEmpty(t.getName())){
|
|
|
|
if(StringUtil.isNotEmpty(t.getName())){
|
|
|
|
t.setName(t.getName().trim());
|
|
|
|
t.setName(t.getName().trim());
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -389,7 +389,7 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
|
|
|
|
return "-姓名不能为空";
|
|
|
|
return "-姓名不能为空";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for(BusinessLineContact3Model t : form.getBusinessLineContact3List()){
|
|
|
|
for(BusinessContact3Model t : form.getBusinessContact3List()){
|
|
|
|
if(StringUtil.isNotEmpty(t.getPhone())){
|
|
|
|
if(StringUtil.isNotEmpty(t.getPhone())){
|
|
|
|
t.setPhone(t.getPhone().trim());
|
|
|
|
t.setPhone(t.getPhone().trim());
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -397,7 +397,7 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
|
|
|
|
return "-手机号不能为空";
|
|
|
|
return "-手机号不能为空";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for(BusinessLineContact3Model t : form.getBusinessLineContact3List()){
|
|
|
|
for(BusinessContact3Model t : form.getBusinessContact3List()){
|
|
|
|
if(StringUtil.isNotEmpty(t.getEmail())){
|
|
|
|
if(StringUtil.isNotEmpty(t.getEmail())){
|
|
|
|
t.setEmail(t.getEmail().trim());
|
|
|
|
t.setEmail(t.getEmail().trim());
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -435,21 +435,21 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.saveOrUpdate(entity);
|
|
|
|
this.saveOrUpdate(entity);
|
|
|
|
|
|
|
|
|
|
|
|
//BusinessLineContact3子表数据新增修改
|
|
|
|
//BusinessContact3子表数据新增修改
|
|
|
|
if(!isSave){
|
|
|
|
if(!isSave){
|
|
|
|
QueryWrapper<BusinessLineContact3Entity> BusinessLineContact3queryWrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<BusinessContact3Entity> BusinessContact3queryWrapper = new QueryWrapper<>();
|
|
|
|
BusinessLineContact3queryWrapper.lambda().eq(BusinessLineContact3Entity::getBusinessLineId, entity.getId());
|
|
|
|
BusinessContact3queryWrapper.lambda().eq(BusinessContact3Entity::getBusinessLineId, entity.getId());
|
|
|
|
businessLineContact3Service.remove(BusinessLineContact3queryWrapper);
|
|
|
|
businessContact3Service.remove(BusinessContact3queryWrapper);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (businessLine3Form.getBusinessLineContact3List()!=null){
|
|
|
|
if (businessLine3Form.getBusinessContact3List()!=null){
|
|
|
|
List<BusinessLineContact3Entity> tableField133 = JsonUtil.getJsonToList(businessLine3Form.getBusinessLineContact3List(),BusinessLineContact3Entity.class);
|
|
|
|
List<BusinessContact3Entity> tableField133 = JsonUtil.getJsonToList(businessLine3Form.getBusinessContact3List(),BusinessContact3Entity.class);
|
|
|
|
for(BusinessLineContact3Entity entitys : tableField133){
|
|
|
|
for(BusinessContact3Entity entitys : tableField133){
|
|
|
|
entitys.setId(RandomUtil.uuId());
|
|
|
|
entitys.setId(RandomUtil.uuId());
|
|
|
|
entitys.setBusinessLineId(entity.getId());
|
|
|
|
entitys.setBusinessLineId(entity.getId());
|
|
|
|
if(isSave){
|
|
|
|
if(isSave){
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
|
}
|
|
|
|
}
|
|
|
|
businessLineContact3Service.saveOrUpdate(entitys);
|
|
|
|
businessContact3Service.saveOrUpdate(entitys);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|