|
|
|
@ -2,16 +2,14 @@ package jnpf.service.impl;
|
|
|
|
|
|
|
|
|
|
import jnpf.entity.*;
|
|
|
|
|
import jnpf.mapper.SubjectBasicMapper;
|
|
|
|
|
import jnpf.model.subjectbasic.SubjectBasicConstant;
|
|
|
|
|
import jnpf.model.subjectbasic.SubjectBasicForm;
|
|
|
|
|
import jnpf.model.subjectbasic.SubjectBasicPagination;
|
|
|
|
|
import jnpf.service.*;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
|
import jnpf.model.subjectbasic.*;
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
|
import jnpf.permission.model.authorize.AuthorizeConditionModel;
|
|
|
|
|
import jnpf.util.GeneraterSwapUtil;
|
|
|
|
|
import jnpf.database.model.superQuery.SuperQueryJsonModel;
|
|
|
|
|
import jnpf.database.model.superQuery.ConditionJsonModel;
|
|
|
|
|
import jnpf.database.model.superQuery.SuperQueryConditionModel;
|
|
|
|
|
|
|
|
|
|
import java.lang.reflect.Field;
|
|
|
|
|
import com.baomidou.mybatisplus.annotation.TableField;
|
|
|
|
|
import java.util.regex.Pattern;
|
|
|
|
@ -25,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
import jnpf.util.*;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
import jnpf.base.UserInfo;
|
|
|
|
@ -317,8 +314,8 @@ public class SubjectBasicServiceImpl extends ServiceImpl<SubjectBasicMapper, Sub
|
|
|
|
|
}
|
|
|
|
|
/** SubjectContacts子表方法 */
|
|
|
|
|
@Override
|
|
|
|
|
public List<SubjectContactsEntity> getSubjectContactsList(String id,SubjectBasicPagination subjectBasicPagination){
|
|
|
|
|
Map<String, Object> newtabMap=SubjectBasicConstant.TABLEFIELDKEY.entrySet()
|
|
|
|
|
public List<SubjectContactsEntity> getSubjectContactsList(String id, SubjectBasicPagination subjectBasicPagination){
|
|
|
|
|
Map<String, Object> newtabMap= SubjectBasicConstant.TABLEFIELDKEY.entrySet()
|
|
|
|
|
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
|
|
|
|
|
String tableName="subjectContacts";
|
|
|
|
|
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
|
|
|
|
@ -338,7 +335,7 @@ public class SubjectBasicServiceImpl extends ServiceImpl<SubjectBasicMapper, Sub
|
|
|
|
|
}
|
|
|
|
|
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
|
|
|
|
|
@Override
|
|
|
|
|
public String checkForm(SubjectBasicForm form,int i) {
|
|
|
|
|
public String checkForm(SubjectBasicForm form, int i) {
|
|
|
|
|
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
|
|
|
|
|
String id="";
|
|
|
|
|
String countRecover = "";
|
|
|
|
|