Merge remote-tracking branch 'origin/master'

master
zengchenxi 3 months ago
commit 0458fbfead

@ -0,0 +1,16 @@
package jnpf.mapper;
import jnpf.entity.YysClassesEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* yysClasses
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-08-05
*/
public interface YysClassesMapper extends BaseMapper<YysClassesEntity> {
}

@ -0,0 +1,35 @@
package jnpf.service;
import jnpf.model.yysclasses.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* yysClasses
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-08-05
*/
public interface YysClassesService extends IService<YysClassesEntity> {
List<YysClassesEntity> getList(YysClassesPagination yysClassesPagination);
List<YysClassesEntity> getTypeList(YysClassesPagination yysClassesPagination,String dataType);
YysClassesEntity getInfo(String id);
void delete(YysClassesEntity entity);
void create(YysClassesEntity entity);
boolean update(String id, YysClassesEntity entity);
//子表方法
//副表数据方法
String checkForm(YysClassesForm form,int i);
void saveOrUpdate(YysClassesForm yysClassesForm,String id, boolean isSave) throws Exception;
}

@ -0,0 +1,299 @@
package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.YysClassesMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.yysclasses.*;
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;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
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;
import jnpf.permission.entity.UserEntity;
/**
*
* yysClasses
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-08-05
*/
@Service
public class YysClassesServiceImpl extends ServiceImpl<YysClassesMapper, YysClassesEntity> implements YysClassesService{
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Override
public List<YysClassesEntity> getList(YysClassesPagination yysClassesPagination){
return getTypeList(yysClassesPagination,yysClassesPagination.getDataType());
}
/** 列表查询 */
@Override
public List<YysClassesEntity> getTypeList(YysClassesPagination yysClassesPagination,String dataType){
String userId=userProvider.get().getUserId();
List<String> AllIdList =new ArrayList();
List<List<String>> intersectionList =new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? YysClassesConstant.getAppColumnData() : YysClassesConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0;
int yysClassesNum =0;
QueryWrapper<YysClassesEntity> yysClassesQueryWrapper=new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>();
String superOp ="";
if (ObjectUtil.isNotEmpty(yysClassesPagination.getSuperQueryJson())){
List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = yysClassesPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0;
QueryWrapper<YysClassesEntity> yysClassesSuperWrapper = new QueryWrapper<>();
yysClassesSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysClassesSuperWrapper,YysClassesEntity.class,queryJson,"0"));
int yysClassesNum1 = yysClassesSuperWrapper.getExpression().getNormal().size();
if (yysClassesNum1>0){
List<String> yysClassesList =this.list(yysClassesSuperWrapper).stream().map(YysClassesEntity::getId).collect(Collectors.toList());
allSuperList.addAll(yysClassesList);
intersectionSuperList.add(yysClassesList);
superNum++;
}
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or
if(superOp.equalsIgnoreCase("and")){
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
}else{
allSuperIDlist = allSuperList;
}
}
List<String> allRuleIDlist = new ArrayList<>();
String ruleOp ="";
if (ObjectUtil.isNotEmpty(ruleJson)){
List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0;
QueryWrapper<YysClassesEntity> yysClassesSuperWrapper = new QueryWrapper<>();
yysClassesSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysClassesSuperWrapper,YysClassesEntity.class,ruleJson,"0"));
int yysClassesNum1 = yysClassesSuperWrapper.getExpression().getNormal().size();
if (yysClassesNum1>0){
List<String> yysClassesList =this.list(yysClassesSuperWrapper).stream().map(YysClassesEntity::getId).collect(Collectors.toList());
allRuleList.addAll(yysClassesList);
intersectionRuleList.add(yysClassesList);
ruleNum++;
}
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or
if(ruleOp.equalsIgnoreCase("and")){
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
}else{
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = false;
boolean appPermission = false;
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object yysClassesObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysClassesQueryWrapper,YysClassesEntity.class,yysClassesPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(yysClassesObj)){
return new ArrayList<>();
} else {
yysClassesQueryWrapper = (QueryWrapper<YysClassesEntity>)yysClassesObj;
if( yysClassesQueryWrapper.getExpression().getNormal().size()>0){
yysClassesNum++;
}
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object yysClassesObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysClassesQueryWrapper,YysClassesEntity.class,yysClassesPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(yysClassesObj)){
return new ArrayList<>();
} else {
yysClassesQueryWrapper = (QueryWrapper<YysClassesEntity>)yysClassesObj;
if( yysClassesQueryWrapper.getExpression().getNormal().size()>0){
yysClassesNum++;
}
}
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(yysClassesPagination.getClassesName())){
yysClassesNum++;
String value = yysClassesPagination.getClassesName() instanceof List ?
JsonUtil.getObjectToString(yysClassesPagination.getClassesName()) :
String.valueOf(yysClassesPagination.getClassesName());
yysClassesQueryWrapper.lambda().like(YysClassesEntity::getClassesName,value);
}
if(ObjectUtil.isNotEmpty(yysClassesPagination.getEnabledStatus())){
yysClassesNum++;
List<String> idList = new ArrayList<>();
try {
String[][] enabledStatus = JsonUtil.getJsonToBean(yysClassesPagination.getEnabledStatus(),String[][].class);
for(int i=0;i<enabledStatus.length;i++){
if(enabledStatus[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(enabledStatus[i])));
}
}
}catch (Exception e1){
try {
List<String> enabledStatus = JsonUtil.getJsonToList(yysClassesPagination.getEnabledStatus(),String.class);
if(enabledStatus.size()>0){
idList.addAll(enabledStatus);
}
}catch (Exception e2){
idList.add(String.valueOf(yysClassesPagination.getEnabledStatus()));
}
}
yysClassesQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(YysClassesEntity::getEnabledStatus, tt).or();
});
});
}
}
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){
if (intersection.size()==0){
intersection.add("jnpfNullList");
}
yysClassesQueryWrapper.lambda().in(YysClassesEntity::getId, intersection);
}
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)){
if (allSuperIDlist.size()==0){
allSuperIDlist.add("jnpfNullList");
}
List<String> finalAllSuperIDlist = allSuperIDlist;
yysClassesQueryWrapper.lambda().and(t->t.in(YysClassesEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){
if (allRuleIDlist.size()==0){
allRuleIDlist.add("jnpfNullList");
}
List<String> finalAllRuleIDlist = allRuleIDlist;
yysClassesQueryWrapper.lambda().and(t->t.in(YysClassesEntity::getId, finalAllRuleIDlist));
}
//排序
if(StringUtil.isEmpty(yysClassesPagination.getSidx())){
yysClassesQueryWrapper.lambda().orderByDesc(YysClassesEntity::getId);
}else{
try {
String sidx = yysClassesPagination.getSidx();
String[] strs= sidx.split("_name");
YysClassesEntity yysClassesEntity = new YysClassesEntity();
Field declaredField = yysClassesEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
yysClassesQueryWrapper="asc".equals(yysClassesPagination.getSort().toLowerCase())?yysClassesQueryWrapper.orderByAsc(value):yysClassesQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){
Page<YysClassesEntity> page=new Page<>(yysClassesPagination.getCurrentPage(), yysClassesPagination.getPageSize());
IPage<YysClassesEntity> userIPage=this.page(page, yysClassesQueryWrapper);
return yysClassesPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List<YysClassesEntity> list = new ArrayList();
return yysClassesPagination.setData(list, list.size());
}
}else{
return this.list(yysClassesQueryWrapper);
}
}
@Override
public YysClassesEntity getInfo(String id){
QueryWrapper<YysClassesEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(YysClassesEntity::getId,id);
return this.getOne(queryWrapper);
}
@Override
public void create(YysClassesEntity entity){
this.save(entity);
}
@Override
public boolean update(String id, YysClassesEntity entity){
return this.updateById(entity);
}
@Override
public void delete(YysClassesEntity entity){
if(entity!=null){
this.removeById(entity.getId());
}
}
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
@Override
public String checkForm(YysClassesForm form,int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id="";
String countRecover = "";
if (isUp){
id = form.getId();
}
//主表字段验证
if(StringUtil.isEmpty(form.getClassesName())){
return "班次名称不能为空";
}
return countRecover;
}
/**
* ()
* @param id
* @param yysClassesForm
* @return
*/
@Override
@Transactional
public void saveOrUpdate(YysClassesForm yysClassesForm,String id, boolean isSave) throws Exception{
UserInfo userInfo=userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
yysClassesForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(YysClassesConstant.getFormData(),yysClassesForm),YysClassesForm.class);
YysClassesEntity entity = JsonUtil.getJsonToBean(yysClassesForm, YysClassesEntity.class);
if(isSave){
String mainId = RandomUtil.uuId() ;
entity.setId(mainId);
}else{
}
this.saveOrUpdate(entity);
}
}

@ -5,18 +5,26 @@ import jnpf.mapper.YysPostMapper;
import jnpf.service.*; import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.yyspost.*; import jnpf.model.yyspost.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel; import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil; import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel; import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel; import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel; import jnpf.database.model.superQuery.SuperQueryConditionModel;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import jnpf.model.QueryModel; import jnpf.model.QueryModel;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel; import jnpf.base.model.ColumnDataModel;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -25,13 +33,17 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import jnpf.util.*; import jnpf.util.*;
import java.util.*; import java.util.*;
import jnpf.base.UserInfo; import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity; import jnpf.permission.entity.UserEntity;
/** /**
*
* yysPost * yysPost
* V3.5 * V3.5
* https://www.jnpfsoft.com * https://www.jnpfsoft.com
@ -39,7 +51,7 @@ import jnpf.permission.entity.UserEntity;
* 2024-08-05 * 2024-08-05
*/ */
@Service @Service
public class YysPostServiceImpl extends ServiceImpl<YysPostMapper, YysPostEntity> implements YysPostService{ public class YysPostServiceImpl extends ServiceImpl<YysPostMapper, YysPostEntity> implements YysPostService {
@Autowired @Autowired
private GeneraterSwapUtil generaterSwapUtil; private GeneraterSwapUtil generaterSwapUtil;
@ -47,269 +59,289 @@ public class YysPostServiceImpl extends ServiceImpl<YysPostMapper, YysPostEntity
private UserProvider userProvider; private UserProvider userProvider;
@Override @Override
public List<YysPostEntity> getList(YysPostPagination yysPostPagination){ public List<YysPostEntity> getList(YysPostPagination yysPostPagination) {
return getTypeList(yysPostPagination,yysPostPagination.getDataType()); return getTypeList(yysPostPagination, yysPostPagination.getDataType());
} }
/** 列表查询 */
/**
*
*/
@Override @Override
public List<YysPostEntity> getTypeList(YysPostPagination yysPostPagination,String dataType){ public List<YysPostEntity> getTypeList(YysPostPagination yysPostPagination, String dataType) {
String userId=userProvider.get().getUserId(); String userId = userProvider.get().getUserId();
List<String> AllIdList =new ArrayList(); List<String> AllIdList = new ArrayList();
List<List<String>> intersectionList =new ArrayList<>(); List<List<String>> intersectionList = new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? YysPostConstant.getAppColumnData() : YysPostConstant.getColumnData(); String columnData = !isPc ? YysPostConstant.getAppColumnData() : YysPostConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class); ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList()); String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0; int total = 0;
int yysPostNum =0; int yysPostNum = 0;
QueryWrapper<YysPostEntity> yysPostQueryWrapper=new QueryWrapper<>(); QueryWrapper<YysPostEntity> yysPostQueryWrapper = new QueryWrapper<>();
yysPostQueryWrapper.lambda().orderByAsc(YysPostEntity::getPostSort);
yysPostQueryWrapper.lambda().isNull(YysPostEntity::getDeleteMark);
List<String> allSuperIDlist = new ArrayList<>(); List<String> allSuperIDlist = new ArrayList<>();
String superOp =""; String superOp = "";
if (ObjectUtil.isNotEmpty(yysPostPagination.getSuperQueryJson())){ if (ObjectUtil.isNotEmpty(yysPostPagination.getSuperQueryJson())) {
List<String> allSuperList = new ArrayList<>(); List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>(); List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = yysPostPagination.getSuperQueryJson(); String queryJson = yysPostPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0; int superNum = 0;
QueryWrapper<YysPostEntity> yysPostSuperWrapper = new QueryWrapper<>(); QueryWrapper<YysPostEntity> yysPostSuperWrapper = new QueryWrapper<>();
yysPostSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysPostSuperWrapper,YysPostEntity.class,queryJson,"0")); yysPostSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysPostSuperWrapper, YysPostEntity.class, queryJson, "0"));
int yysPostNum1 = yysPostSuperWrapper.getExpression().getNormal().size(); int yysPostNum1 = yysPostSuperWrapper.getExpression().getNormal().size();
if (yysPostNum1>0){ if (yysPostNum1 > 0) {
List<String> yysPostList =this.list(yysPostSuperWrapper).stream().map(YysPostEntity::getId).collect(Collectors.toList()); List<String> yysPostList = this.list(yysPostSuperWrapper).stream().map(YysPostEntity::getId).collect(Collectors.toList());
allSuperList.addAll(yysPostList); allSuperList.addAll(yysPostList);
intersectionSuperList.add(yysPostList); intersectionSuperList.add(yysPostList);
superNum++; superNum++;
} }
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : ""; superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or //and or
if(superOp.equalsIgnoreCase("and")){ if (superOp.equalsIgnoreCase("and")) {
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList); allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
}else{ } else {
allSuperIDlist = allSuperList; allSuperIDlist = allSuperList;
} }
} }
List<String> allRuleIDlist = new ArrayList<>(); List<String> allRuleIDlist = new ArrayList<>();
String ruleOp =""; String ruleOp = "";
if (ObjectUtil.isNotEmpty(ruleJson)){ if (ObjectUtil.isNotEmpty(ruleJson)) {
List<String> allRuleList = new ArrayList<>(); List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>(); List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class); SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0; int ruleNum = 0;
QueryWrapper<YysPostEntity> yysPostSuperWrapper = new QueryWrapper<>(); QueryWrapper<YysPostEntity> yysPostSuperWrapper = new QueryWrapper<>();
yysPostSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysPostSuperWrapper,YysPostEntity.class,ruleJson,"0")); yysPostSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysPostSuperWrapper, YysPostEntity.class, ruleJson, "0"));
int yysPostNum1 = yysPostSuperWrapper.getExpression().getNormal().size(); int yysPostNum1 = yysPostSuperWrapper.getExpression().getNormal().size();
if (yysPostNum1>0){ if (yysPostNum1 > 0) {
List<String> yysPostList =this.list(yysPostSuperWrapper).stream().map(YysPostEntity::getId).collect(Collectors.toList()); List<String> yysPostList = this.list(yysPostSuperWrapper).stream().map(YysPostEntity::getId).collect(Collectors.toList());
allRuleList.addAll(yysPostList); allRuleList.addAll(yysPostList);
intersectionRuleList.add(yysPostList); intersectionRuleList.add(yysPostList);
ruleNum++; ruleNum++;
} }
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : ""; ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or //and or
if(ruleOp.equalsIgnoreCase("and")){ if (ruleOp.equalsIgnoreCase("and")) {
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList); allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
}else{ } else {
allRuleIDlist = allRuleList; allRuleIDlist = allRuleList;
} }
} }
boolean pcPermission = false; boolean pcPermission = false;
boolean appPermission = false; boolean appPermission = false;
if(isPc && pcPermission){ if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()) {
Object yysPostObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysPostQueryWrapper,YysPostEntity.class,yysPostPagination.getMenuId(),"0")); Object yysPostObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysPostQueryWrapper, YysPostEntity.class, yysPostPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysPostObj)){ if (ObjectUtil.isEmpty(yysPostObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
yysPostQueryWrapper = (QueryWrapper<YysPostEntity>)yysPostObj; yysPostQueryWrapper = (QueryWrapper<YysPostEntity>) yysPostObj;
if( yysPostQueryWrapper.getExpression().getNormal().size()>0){ if (yysPostQueryWrapper.getExpression().getNormal().size() > 0) {
yysPostNum++; yysPostNum++;
} }
} }
} }
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object yysPostObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysPostQueryWrapper,YysPostEntity.class,yysPostPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(yysPostObj)){
return new ArrayList<>();
} else {
yysPostQueryWrapper = (QueryWrapper<YysPostEntity>)yysPostObj;
if( yysPostQueryWrapper.getExpression().getNormal().size()>0){
yysPostNum++;
}
} }
if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object yysPostObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysPostQueryWrapper, YysPostEntity.class, yysPostPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysPostObj)) {
return new ArrayList<>();
} else {
yysPostQueryWrapper = (QueryWrapper<YysPostEntity>) yysPostObj;
if (yysPostQueryWrapper.getExpression().getNormal().size() > 0) {
yysPostNum++;
}
}
} }
} }
if(isPc){ if (isPc) {
if(ObjectUtil.isNotEmpty(yysPostPagination.getPostName())){ if (ObjectUtil.isNotEmpty(yysPostPagination.getPostName())) {
yysPostNum++; yysPostNum++;
String value = yysPostPagination.getPostName() instanceof List ? String value = yysPostPagination.getPostName() instanceof List ?
JsonUtil.getObjectToString(yysPostPagination.getPostName()) : JsonUtil.getObjectToString(yysPostPagination.getPostName()) :
String.valueOf(yysPostPagination.getPostName()); String.valueOf(yysPostPagination.getPostName());
yysPostQueryWrapper.lambda().like(YysPostEntity::getPostName,value); yysPostQueryWrapper.lambda().like(YysPostEntity::getPostName, value);
} }
if(ObjectUtil.isNotEmpty(yysPostPagination.getPostCode())){ if (ObjectUtil.isNotEmpty(yysPostPagination.getPostCode())) {
yysPostNum++; yysPostNum++;
String value = yysPostPagination.getPostCode() instanceof List ? String value = yysPostPagination.getPostCode() instanceof List ?
JsonUtil.getObjectToString(yysPostPagination.getPostCode()) : JsonUtil.getObjectToString(yysPostPagination.getPostCode()) :
String.valueOf(yysPostPagination.getPostCode()); String.valueOf(yysPostPagination.getPostCode());
yysPostQueryWrapper.lambda().like(YysPostEntity::getPostCode,value); yysPostQueryWrapper.lambda().like(YysPostEntity::getPostCode, value);
} }
if(ObjectUtil.isNotEmpty(yysPostPagination.getPostStatus())){ if (ObjectUtil.isNotEmpty(yysPostPagination.getPostStatus())) {
yysPostNum++; yysPostNum++;
List<String> idList = new ArrayList<>(); List<String> idList = new ArrayList<>();
try { try {
String[][] postStatus = JsonUtil.getJsonToBean(yysPostPagination.getPostStatus(),String[][].class); String[][] postStatus = JsonUtil.getJsonToBean(yysPostPagination.getPostStatus(), String[][].class);
for(int i=0;i<postStatus.length;i++){ for (int i = 0; i < postStatus.length; i++) {
if(postStatus[i].length>0){ if (postStatus[i].length > 0) {
idList.add(JsonUtil.getObjectToString(Arrays.asList(postStatus[i]))); idList.add(JsonUtil.getObjectToString(Arrays.asList(postStatus[i])));
} }
} }
}catch (Exception e1){ } catch (Exception e1) {
try { try {
List<String> postStatus = JsonUtil.getJsonToList(yysPostPagination.getPostStatus(),String.class); List<String> postStatus = JsonUtil.getJsonToList(yysPostPagination.getPostStatus(), String.class);
if(postStatus.size()>0){ if (postStatus.size() > 0) {
idList.addAll(postStatus); idList.addAll(postStatus);
} }
}catch (Exception e2){ } catch (Exception e2) {
idList.add(String.valueOf(yysPostPagination.getPostStatus())); idList.add(String.valueOf(yysPostPagination.getPostStatus()));
} }
} }
yysPostQueryWrapper.lambda().and(t->{ yysPostQueryWrapper.lambda().and(t -> {
idList.forEach(tt->{ idList.forEach(tt -> {
t.like(YysPostEntity::getPostStatus, tt).or(); t.like(YysPostEntity::getPostStatus, tt).or();
}); });
}); });
} }
} }
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) {
intersection.add("jnpfNullList"); intersection.add("jnpfNullList");
} }
yysPostQueryWrapper.lambda().in(YysPostEntity::getId, intersection); yysPostQueryWrapper.lambda().in(YysPostEntity::getId, intersection);
} }
//是否有高级查询 //是否有高级查询
if (StringUtil.isNotEmpty(superOp)){ if (StringUtil.isNotEmpty(superOp)) {
if (allSuperIDlist.size()==0){ if (allSuperIDlist.size() == 0) {
allSuperIDlist.add("jnpfNullList"); allSuperIDlist.add("jnpfNullList");
} }
List<String> finalAllSuperIDlist = allSuperIDlist; List<String> finalAllSuperIDlist = allSuperIDlist;
yysPostQueryWrapper.lambda().and(t->t.in(YysPostEntity::getId, finalAllSuperIDlist)); yysPostQueryWrapper.lambda().and(t -> t.in(YysPostEntity::getId, finalAllSuperIDlist));
} }
//是否有数据过滤查询 //是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){ if (StringUtil.isNotEmpty(ruleOp)) {
if (allRuleIDlist.size()==0){ if (allRuleIDlist.size() == 0) {
allRuleIDlist.add("jnpfNullList"); allRuleIDlist.add("jnpfNullList");
} }
List<String> finalAllRuleIDlist = allRuleIDlist; List<String> finalAllRuleIDlist = allRuleIDlist;
yysPostQueryWrapper.lambda().and(t->t.in(YysPostEntity::getId, finalAllRuleIDlist)); yysPostQueryWrapper.lambda().and(t -> t.in(YysPostEntity::getId, finalAllRuleIDlist));
} }
//排序 //排序
if(StringUtil.isEmpty(yysPostPagination.getSidx())){ if (StringUtil.isEmpty(yysPostPagination.getSidx())) {
yysPostQueryWrapper.lambda().orderByDesc(YysPostEntity::getId); yysPostQueryWrapper.lambda().orderByDesc(YysPostEntity::getId);
}else{ } else {
try { try {
String sidx = yysPostPagination.getSidx(); String sidx = yysPostPagination.getSidx();
String[] strs= sidx.split("_name"); String[] strs = sidx.split("_name");
YysPostEntity yysPostEntity = new YysPostEntity(); YysPostEntity yysPostEntity = new YysPostEntity();
Field declaredField = yysPostEntity.getClass().getDeclaredField(strs[0]); Field declaredField = yysPostEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true); declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value(); String value = declaredField.getAnnotation(TableField.class).value();
yysPostQueryWrapper="asc".equals(yysPostPagination.getSort().toLowerCase())?yysPostQueryWrapper.orderByAsc(value):yysPostQueryWrapper.orderByDesc(value); yysPostQueryWrapper = "asc".equals(yysPostPagination.getSort().toLowerCase()) ? yysPostQueryWrapper.orderByAsc(value) : yysPostQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) { } catch (NoSuchFieldException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
if("0".equals(dataType)){ if ("0".equals(dataType)) {
if((total>0 && AllIdList.size()>0) || total==0){ if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<YysPostEntity> page=new Page<>(yysPostPagination.getCurrentPage(), yysPostPagination.getPageSize()); Page<YysPostEntity> page = new Page<>(yysPostPagination.getCurrentPage(), yysPostPagination.getPageSize());
IPage<YysPostEntity> userIPage=this.page(page, yysPostQueryWrapper); IPage<YysPostEntity> userIPage = this.page(page, yysPostQueryWrapper);
return yysPostPagination.setData(userIPage.getRecords(),userIPage.getTotal()); return yysPostPagination.setData(userIPage.getRecords(), userIPage.getTotal());
}else{ } else {
List<YysPostEntity> list = new ArrayList(); List<YysPostEntity> list = new ArrayList();
return yysPostPagination.setData(list, list.size()); return yysPostPagination.setData(list, list.size());
} }
}else{ } else {
return this.list(yysPostQueryWrapper); return this.list(yysPostQueryWrapper);
} }
} }
@Override @Override
public YysPostEntity getInfo(String id){ public YysPostEntity getInfo(String id) {
QueryWrapper<YysPostEntity> queryWrapper=new QueryWrapper<>(); QueryWrapper<YysPostEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(YysPostEntity::getId,id); queryWrapper.lambda().eq(YysPostEntity::getId, id);
return this.getOne(queryWrapper); return this.getOne(queryWrapper);
} }
@Override @Override
public void create(YysPostEntity entity){ public void create(YysPostEntity entity) {
this.save(entity); this.save(entity);
} }
@Override @Override
public boolean update(String id, YysPostEntity entity){ public boolean update(String id, YysPostEntity entity) {
return this.updateById(entity); return this.updateById(entity);
} }
@Override @Override
public void delete(YysPostEntity entity){ public void delete(YysPostEntity entity) {
if(entity!=null){ if (entity != null) {
this.removeById(entity.getId()); entity.setDeleteMark(1);
entity.setDeleteTime(DateUtil.getNowDate());
this.updateById(entity);
} }
} }
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
/**
* i-0-1
*/
@Override @Override
public String checkForm(YysPostForm form,int i) { public String checkForm(YysPostForm form, int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id=""; String id = "";
String countRecover = ""; String countRecover = "";
if (isUp){ if (isUp) {
id = form.getId(); id = form.getId();
} }
//主表字段验证 //主表字段验证
if(StringUtil.isEmpty(form.getPostName())){ if (StringUtil.isEmpty(form.getPostName())) {
return "岗位名称不能为空"; return "岗位名称不能为空";
} }
if(StringUtil.isEmpty(form.getPostCode())){ if (StringUtil.isEmpty(form.getPostCode())) {
return "岗位编码不能为空"; return "岗位编码不能为空";
} }
if(StringUtil.isNotEmpty(form.getPostSort())){ if (StringUtil.isNotEmpty(form.getPostSort())) {
if(!Pattern.compile("^\\d+$").matcher(String.valueOf(form.getPostSort())).matches()){ if (!Pattern.compile("^\\d+$").matcher(String.valueOf(form.getPostSort())).matches()) {
return "请输入正确的数字"; return "请输入正确的数字";
}
} }
}
return countRecover; return countRecover;
} }
/** /**
* () * ()
* @param id *
* @param yysPostForm * @param id
* @return * @param yysPostForm
*/ * @return
*/
@Override @Override
@Transactional @Transactional
public void saveOrUpdate(YysPostForm yysPostForm,String id, boolean isSave) throws Exception{ public void saveOrUpdate(YysPostForm yysPostForm, String id, boolean isSave) throws Exception {
UserInfo userInfo=userProvider.get(); UserInfo userInfo = userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
yysPostForm = JsonUtil.getJsonToBean( yysPostForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(YysPostConstant.getFormData(),yysPostForm),YysPostForm.class); generaterSwapUtil.swapDatetime(YysPostConstant.getFormData(), yysPostForm), YysPostForm.class);
YysPostEntity entity = JsonUtil.getJsonToBean(yysPostForm, YysPostEntity.class); YysPostEntity entity = JsonUtil.getJsonToBean(yysPostForm, YysPostEntity.class);
if(isSave){ if (isSave) {
String mainId = RandomUtil.uuId() ; String mainId = RandomUtil.uuId();
entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId());
entity.setId(mainId); entity.setId(mainId);
}else{ } else {
entity.setLastModifyTime(DateUtil.getNowDate());
entity.setLastModifyUserId(userInfo.getUserId());
} }
this.saveOrUpdate(entity); this.saveOrUpdate(entity);

@ -0,0 +1,330 @@
package jnpf.controller;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jnpf.base.ActionResult;
import jnpf.base.UserInfo;
import jnpf.exception.DataException;
import jnpf.permission.entity.UserEntity;
import jnpf.service.*;
import jnpf.entity.*;
import jnpf.util.*;
import jnpf.model.yysclasses.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.*;
import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity;
import java.io.IOException;
import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException;
import org.springframework.web.multipart.MultipartFile;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import java.io.File;
import jnpf.onlinedev.model.ExcelImFieldModel;
import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
import jnpf.onlinedev.model.OnlineImport.VisualImportModel;
import cn.xuyanwu.spring.file.storage.FileInfo;
import lombok.Cleanup;
import jnpf.model.visualJson.config.HeaderModel;
import jnpf.base.model.ColumnDataModel;
import jnpf.base.util.VisualUtils;
import org.springframework.transaction.annotation.Transactional;
/**
* yysClasses
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-08-05
*/
@Slf4j
@RestController
@Tag(name = "yysClasses" , description = "example")
@RequestMapping("/api/example/YysClasses")
public class YysClassesController {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Autowired
private YysClassesService yysClassesService;
@Autowired
private ConfigValueUtil configValueUtil;
/**
*
*
* @param yysClassesPagination
* @return
*/
@Operation(summary = "获取列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody YysClassesPagination yysClassesPagination)throws IOException{
List<YysClassesEntity> list= yysClassesService.getList(yysClassesPagination);
List<Map<String, Object>> realList=new ArrayList<>();
for (YysClassesEntity entity : list) {
Map<String, Object> yysClassesMap=JsonUtil.entityToMap(entity);
yysClassesMap.put("id", yysClassesMap.get("id"));
//副表数据
//子表数据
realList.add(yysClassesMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, YysClassesConstant.getFormData(), YysClassesConstant.getColumnData(), yysClassesPagination.getModuleId(),false);
//返回对象
PageListVO vo = new PageListVO();
vo.setList(realList);
PaginationVO page = JsonUtil.getJsonToBean(yysClassesPagination, PaginationVO.class);
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
*
*
* @param yysClassesForm
* @return
*/
@PostMapping()
@Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid YysClassesForm yysClassesForm) {
String b = yysClassesService.checkForm(yysClassesForm,0);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
try{
yysClassesService.saveOrUpdate(yysClassesForm, null ,true);
}catch(Exception e){
return ActionResult.fail("新增数据失败");
}
return ActionResult.success("创建成功");
}
/**
* Excel
*
* @return
*/
@Operation(summary = "导出Excel")
@PostMapping("/Actions/Export")
public ActionResult Export(@RequestBody YysClassesPagination yysClassesPagination) throws IOException {
if (StringUtil.isEmpty(yysClassesPagination.getSelectKey())){
return ActionResult.fail("请选择导出字段");
}
List<YysClassesEntity> list= yysClassesService.getList(yysClassesPagination);
List<Map<String, Object>> realList=new ArrayList<>();
for (YysClassesEntity entity : list) {
Map<String, Object> yysClassesMap=JsonUtil.entityToMap(entity);
yysClassesMap.put("id", yysClassesMap.get("id"));
//副表数据
//子表数据
realList.add(yysClassesMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, YysClassesConstant.getFormData(), YysClassesConstant.getColumnData(), yysClassesPagination.getModuleId(),false);
String[]keys=!StringUtil.isEmpty(yysClassesPagination.getSelectKey())?yysClassesPagination.getSelectKey():new String[0];
UserInfo userInfo=userProvider.get();
DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo);
return ActionResult.success(vo);
}
/**
*
*/
public DownloadVO creatModelExcel(String path,List<Map<String, Object>>list,String[]keys,UserInfo userInfo){
DownloadVO vo=DownloadVO.builder().build();
List<ExcelExportEntity> entitys=new ArrayList<>();
if(keys.length>0){
for(String key:keys){
switch(key){
case "classesName" :
entitys.add(new ExcelExportEntity("班次名称" ,"classesName"));
break;
case "startTime" :
entitys.add(new ExcelExportEntity("开始时间" ,"startTime"));
break;
case "endTime" :
entitys.add(new ExcelExportEntity("结束时间" ,"endTime"));
break;
case "classesDuration" :
entitys.add(new ExcelExportEntity("班次时长h)" ,"classesDuration"));
break;
case "enabledStatus" :
entitys.add(new ExcelExportEntity("启用状态" ,"enabledStatus"));
break;
default:
break;
}
}
}
ExportParams exportParams = new ExportParams(null, "表单信息");
exportParams.setType(ExcelType.XSSF);
try{
@Cleanup Workbook workbook = new HSSFWorkbook();
if (entitys.size()>0){
if (list.size()==0){
list.add(new HashMap<>());
}
//去除空数据
List<Map<String, Object>> dataList = new ArrayList<>();
for (Map<String, Object> map : list) {
int i = 0;
for (String key : keys) {
//子表
if (key.toLowerCase().startsWith("tablefield")) {
String tableField = key.substring(0, key.indexOf("-" ));
String field = key.substring(key.indexOf("-" ) + 1);
Object o = map.get(tableField);
if (o != null) {
List<Map<String, Object>> childList = (List<Map<String, Object>>) o;
for (Map<String, Object> childMap : childList) {
if (childMap.get(field) != null) {
i++;
}
}
}
} else {
Object o = map.get(key);
if (o != null) {
i++;
}
}
}
if (i > 0) {
dataList.add(map);
}
}
//复杂表头-表头和数据处理
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(YysClassesConstant.getColumnData(), ColumnDataModel.class);
List<HeaderModel> complexHeaderList = columnDataModel.getComplexHeaderList();
if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) {
entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList);
dataList = VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList);
}
workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList);
}
String fileName = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName);
String temporaryFilePath = configValueUtil.getTemporaryFilePath();
FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName);
vo.setName(fileInfo.getFilename());
vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName);
} catch (Exception e) {
log.error("信息导出Excel错误:{}", e.getMessage());
e.printStackTrace();
}
return vo;
}
/**
*
* @param id
* @param yysClassesForm
* @return
*/
@PutMapping("/{id}")
@Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid YysClassesForm yysClassesForm,
@RequestParam(value = "isImport", required = false) boolean isImport){
yysClassesForm.setId(id);
if (!isImport) {
String b = yysClassesService.checkForm(yysClassesForm,1);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
}
YysClassesEntity entity= yysClassesService.getInfo(id);
if(entity!=null){
try{
yysClassesService.saveOrUpdate(yysClassesForm,id,false);
}catch(Exception e){
return ActionResult.fail("修改数据失败");
}
return ActionResult.success("更新成功");
}else{
return ActionResult.fail("更新失败,数据不存在");
}
}
/**
*
* @param id
* @return
*/
@Operation(summary = "删除")
@DeleteMapping("/{id}")
@Transactional
public ActionResult delete(@PathVariable("id") String id){
YysClassesEntity entity= yysClassesService.getInfo(id);
if(entity!=null){
//主表数据删除
yysClassesService.delete(entity);
}
return ActionResult.success("删除成功");
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id){
YysClassesEntity entity= yysClassesService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> yysClassesMap=JsonUtil.entityToMap(entity);
yysClassesMap.put("id", yysClassesMap.get("id"));
//副表数据
//子表数据
yysClassesMap = generaterSwapUtil.swapDataDetail(yysClassesMap,YysClassesConstant.getFormData(),"590163980832475013",false);
return ActionResult.success(yysClassesMap);
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "信息")
@GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id){
YysClassesEntity entity= yysClassesService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> yysClassesMap=JsonUtil.entityToMap(entity);
yysClassesMap.put("id", yysClassesMap.get("id"));
//副表数据
//子表数据
yysClassesMap = generaterSwapUtil.swapDataForm(yysClassesMap,YysClassesConstant.getFormData(),YysClassesConstant.TABLEFIELDKEY,YysClassesConstant.TABLERENAMES);
return ActionResult.success(yysClassesMap);
}
}

@ -0,0 +1,55 @@
package jnpf.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.util.Date;
import java.sql.Time;
import java.sql.Time;
/**
*
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-08-05
*/
@Data
@TableName("yys_classes")
public class YysClassesEntity {
@TableId(value ="ID" )
private String id;
@TableField(value = "CLASSES_NAME" , updateStrategy = FieldStrategy.IGNORED)
private String classesName;
@TableField(value = "START_TIME" , updateStrategy = FieldStrategy.IGNORED)
private String startTime;
@TableField(value = "END_TIME" , updateStrategy = FieldStrategy.IGNORED)
private String endTime;
@TableField(value = "CLASSES_DURATION" , updateStrategy = FieldStrategy.IGNORED)
private String classesDuration;
@TableField(value = "ENABLED_STATUS" , updateStrategy = FieldStrategy.IGNORED)
private String enabledStatus;
@TableField("F_CREATOR_TIME")
private Date creatorTime;
@TableField("F_CREATOR_USER_ID")
private String creatorUserId;
@TableField("F_LAST_MODIFY_TIME")
private Date lastModifyTime;
@TableField("F_LAST_MODIFY_USER_ID")
private String lastModifyUserId;
@TableField("F_DELETE_TIME")
private Date deleteTime;
@TableField("F_DELETE_USER_ID")
private String deleteUserId;
@TableField("F_DELETE_MARK")
private Integer deleteMark;
@TableField("F_TENANT_ID")
private String tenantId;
@TableField("COMPANY_ID")
private String companyId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField("ORGANIZE_JSON_ID")
private String organizeJsonId;
@TableField("F_FLOW_ID")
private String flowId;
}

@ -0,0 +1,35 @@
package jnpf.model.yysclasses;
import lombok.Data;
import java.util.List;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* yysClasses
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-08-05
*/
@Data
public class YysClassesForm {
/** 主键 */
private String id;
/** 班次名称 **/
@JsonProperty("classesName")
private String classesName;
/** 开始时间 **/
@JsonProperty("startTime")
private String startTime;
/** 结束时间 **/
@JsonProperty("endTime")
private String endTime;
/** 班次时长h) **/
@JsonProperty("classesDuration")
private BigDecimal classesDuration;
/** 启用状态 **/
@JsonProperty("enabledStatus")
private Object enabledStatus;
}

@ -0,0 +1,36 @@
package jnpf.model.yysclasses;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import jnpf.base.Pagination;
import java.util.List;
/**
*
* yysClasses
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-08-05
*/
@Data
public class YysClassesPagination extends Pagination {
/** 查询key */
private String[] selectKey;
/** json */
private String json;
/** 数据类型 0-当前页1-全部数据 */
private String dataType;
/** 高级查询 */
private String superQueryJson;
/** 功能id */
private String moduleId;
/** 菜单id */
private String menuId;
/** 班次名称 */
@JsonProperty("classesName")
private Object classesName;
/** 启用状态 */
@JsonProperty("enabledStatus")
private Object enabledStatus;
}

@ -0,0 +1,115 @@
<template>
<el-dialog title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
class="JNPF-dialog JNPF-dialog_center" lock-scroll width="600px">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="24">
<jnpf-form-tip-item label="班次名称" prop="classesName">
<p>{{ dataForm.classesName }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="开始时间" prop="startTime">
<p>{{ dataForm.startTime }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="结束时间" prop="endTime">
<p>{{ dataForm.endTime }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="班次时长" prop="classesDuration">
<JnpfNumber v-model="dataForm.classesDuration" placeholder="数字文本" disabled addonAfter="小时">
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="启用状态" prop="enabledStatus">
<p>{{ dataForm.enabledStatus }} </p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
</span>
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail },
props: [],
data() {
return {
visible: false,
detailVisible: false,
loading: false,
dataForm: {
id: '',
classesName: '',
startTime: "",
endTime: '',
classesDuration: '',
enabledStatus: "1",
},
enabledStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "未启用", "id": "2" }],
enabledStatusProps: { "label": "fullName", "value": "id" },
}
},
computed: {},
watch: {},
created() {
},
mounted() { },
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue)
})
})
},
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/example/YysClasses/detail/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
})
},
},
}
</script>

File diff suppressed because one or more lines are too long

@ -0,0 +1,443 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" append-to-body :visible.sync="visible"
class="JNPF-dialog JNPF-dialog_center" lock-scroll width="700px">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right">
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="24">
<jnpf-form-tip-item label="班次名称" prop="classesName">
<JnpfInput v-model="dataForm.classesName" @change="changeData('classesName', -1)"
placeholder="请输入班次名称" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="开始时间" prop="startTime">
<JnpfTimePicker v-model="dataForm.startTime" @change="changeData('startTime', -1)"
:startTime="time(false, 1, 1, '', 'HH:mm', '')"
:endTime="time(false, 1, 1, '', 'HH:mm', '')" placeholder="请选择开始时间" clearable
:style='{ "width": "100%" }' format="HH:mm">
</JnpfTimePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="结束时间" prop="endTime">
<JnpfTimePicker v-model="dataForm.endTime" @change="changeData('endTime', -1)"
:startTime="time(false, 1, 1, '', 'HH:mm', '')"
:endTime="time(false, 1, 1, '', 'HH:mm', '')" placeholder="请选择结束时间" clearable
:style='{ "width": "100%" }' format="HH:mm">
</JnpfTimePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="班次时长" prop="classesDuration">
<JnpfInput v-model="dataForm.classesDuration" @change="changeData('classesDuration', -1)"
disabled placeholder="自动计算" addonAfter="小时">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="启用状态" prop="enabledStatus">
<JnpfSelect v-model="dataForm.enabledStatus" @change="changeData('enabledStatus', -1)"
placeholder="请选择" clearable :style='{ "width": "100%" }' :options="enabledStatusOptions"
:props="enabledStatusProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
</el-row>
<span slot="footer" class="dialog-footer">
<!-- <div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'>
{{ '上一条' }}
</el-button>
<el-button @click="next" :disabled='nextDis'>
{{ '下一条' }}
</el-button>
</div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button> -->
<el-button @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</span>
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import { mapGetters } from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: {},
props: [],
data() {
return {
dataFormSubmitType: 0,
continueBtnLoading: false,
index: 0,
prevDis: false,
nextDis: false,
allList: [],
visible: false,
loading: false,
btnLoading: false,
formRef: 'formRef',
setting: {},
eventType: '',
userBoxVisible: false,
selectDialogVisible: false,
currTableConf: {},
dataValueAll: {},
addTableConf: {
},
//
ableAll: {
},
tableRows: {
},
Vmodel: "",
currVmodel: "",
dataForm: {
classesName: undefined,
startTime: undefined,
endTime: undefined,
classesDuration: undefined,
enabledStatus: "1",
},
tableRequiredData: {},
dataRule:
{
classesName: [
{
required: true,
message: '请输入班次名称',
trigger: 'blur'
},
],
},
enabledStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "未启用", "id": "2" }],
enabledStatusProps: { "label": "fullName", "value": "id" },
childIndex: -1,
isEdit: false,
interfaceRes: {
classesName: [],
startTime: [],
endTime: [],
classesDuration: [],
enabledStatus: [],
},
}
},
computed: {
...mapGetters(['userInfo'])
},
watch: {},
created() {
this.dataAll()
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() { },
methods: {
prev() {
this.index--
if (this.index === 0) {
this.prevDis = true
}
this.nextDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
next() {
this.index++
if (this.index === this.allList.length - 1) {
this.nextDis = true
}
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
getInfo(id) {
request({
url: '/api/example/YysClasses/' + id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
});
},
goBack() {
this.visible = false
this.$emit('refreshDataList', true)
},
changeData(model, index) {
if ((model == 'startTime' || model == 'endTime') && (this.dataForm.startTime != null && this.dataForm.endTime != null)) {
const startDate = new Date(`2023-01-01T${this.dataForm.startTime}`);
const endDate = new Date(`2023-01-01T${this.dataForm.endTime}`);
const diff = endDate - startDate;
const hoursDiff = diff / (1000 * 60 * 60);
this.dataForm.classesDuration = Math.round(hoursDiff * 100) / 100;
}
this.isEdit = false
this.childIndex = index
let modelAll = model.split("-");
let faceMode = "";
for (let i = 0; i < modelAll.length; i++) {
faceMode += modelAll[i];
}
for (let key in this.interfaceRes) {
if (key != faceMode) {
let faceReList = this.interfaceRes[key]
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options';
if (this[options]) {
this[options]()
}
this.changeData(key, index)
}
}
}
}
},
changeDataFormData(type, data, model, index, defaultValue) {
if (!this.isEdit) {
if (type == 2) {
for (let i = 0; i < this.dataForm[data].length; i++) {
if (index == -1) {
this.dataForm[data][i][model] = defaultValue
} else if (index == i) {
this.dataForm[data][i][model] = defaultValue
}
}
} else {
this.dataForm[data] = defaultValue
}
}
},
dataAll() {
},
clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id, isDetail, allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true
}
} else {
this.prevDis = true
this.nextDis = true
}
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/example/YysClasses/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
});
} else {
this.clearData()
this.initDefaultData()
}
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
initDefaultData() {
},
//
dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0
this.$refs['formRef'].validate((valid) => {
if (valid) {
this.request()
}
})
},
request() {
let _data = this.dataList()
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else {
this.btnLoading = true
}
if (!this.dataForm.id) {
request({
url: '/api/example/YysClasses',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
}
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(() => {
this.btnLoading = false
this.continueBtnLoading = false
})
} else {
request({
url: '/api/example/YysClasses/' + this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(() => {
this.btnLoading = false
this.continueBtnLoading = false
})
}
},
openSelectDialog(key) {
this.currTableConf = this.addTableConf[key]
this.currVmodel = key
this.selectDialogVisible = true
this.$nextTick(() => {
this.$refs.selectDialog.init()
})
},
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i]
if (this['get' + this.currVmodel]) {
this['get' + this.currVmodel](t)
}
}
},
dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
let timeDataValue = null;
let timeValue = Number(timeValueData)
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = new Date().getTime()
} else if (timeType == 4) {
let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) {
previousDate = getBeforeData(timeValue)
timeDataValue = new Date(previousDate).getTime()
} else {
timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
}
} else if (timeType == 5) {
let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) {
previousDate = getLaterData(timeValue)
timeDataValue = new Date(previousDate).getTime()
} else {
timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
}
}
}
return timeDataValue;
},
time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
let timeDataValue = null
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue || '00:00:00'
if (timeDataValue.split(':').length == 3) {
timeDataValue = timeDataValue
} else {
timeDataValue = timeDataValue + ':00'
}
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
}
}
return timeDataValue;
},
dataList() {
var _data = this.dataForm;
return _data;
},
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
this.isEdit = true
this.dataAll()
this.childIndex = -1
},
},
}
</script>

@ -0,0 +1,454 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="班次名称">
<el-input v-model="query.classesName" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="启用状态">
<JnpfSelect v-model="query.enabledStatus" placeholder="请选择" clearable
:options="enabledStatusOptions" :props="enabledStatusProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">
</el-button>
<el-button type="success" icon="icon-ym icon-ym-btn-download" @click="exportData()">
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod">
<el-table-column prop="classesName" label="班次名称" align="left">
</el-table-column>
<el-table-column prop="startTime" label="开始时间" align="left">
</el-table-column>
<el-table-column prop="endTime" label="结束时间" align="left">
</el-table-column>
<el-table-column prop="classesDuration" label="班次时长(h)" align="left">
<template slot-scope="scope" v-if="scope.row.classesDuration">
<JnpfNumber v-model="scope.row.classesDuration" :thousands="false" />
</template>
</el-table-column>
<el-table-column label="启用状态" prop="enabledStatus" algin="left">
<!-- <template slot-scope="scope">
{{ scope.row.enabledStatus }}
</template> -->
<template slot-scope="scope">
<el-tag v-if="scope.row.enabledStatus == '启用'"></el-tag>
<el-tag type="success" v-else-if="scope.row.enabledStatus == ''">未启用</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div>
</template>
<script>
import request from '@/utils/request'
import { mapGetters } from "vuex";
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import JNPFForm from './form'
import Detail from './Detail'
import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getConfigData } from '@/api/onlineDev/visualDev'
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
export default {
components: {
JNPFForm,
Detail,
ExportBox, ToFormDetail, SuperQuery
},
data() {
return {
keyword: '',
expandsTree: true,
refreshTree: true,
toFormDetailVisible: false,
expandObj: {},
columnOptions: [],
mergeList: [],
exportList: [],
columnList,
superQueryVisible: false,
superQueryJson,
uploadBoxVisible: false,
detailVisible: false,
query: {
classesName: undefined,
enabledStatus: undefined,
},
treeProps: {
children: 'children',
label: 'fullName',
value: 'id',
isLeaf: 'isLeaf'
},
list: [],
listLoading: true,
total: 0,
queryData: {},
listQuery: {
superQueryJson: '',
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
},
formVisible: false,
flowVisible: false,
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
enabledStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "未启用", "id": "2" }],
enabledStatusProps: { "label": "fullName", "value": "id" },
interfaceRes: {
},
}
},
computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.toFormDetailVisible = true
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue)
})
})
},
toggleTreeExpand(expands) {
this.refreshTree = false
this.expandsTree = expands
this.$nextTick(() => {
this.refreshTree = true
this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null)
})
})
},
filterNode(value, data) {
if (!value) return true;
return data[this.treeProps.label].indexOf(value) !== -1;
},
loadNode(node, resolve) {
const nodeData = node.data
const config = {
treeInterfaceId: "",
treeTemplateJson: []
}
if (config.treeInterfaceId) {
//
if (config.treeTemplateJson && config.treeTemplateJson.length) {
for (let i = 0; i < config.treeTemplateJson.length; i++) {
const element = config.treeTemplateJson[i];
element.defaultValue = nodeData[element.relationField] || ''
}
}
//
let query = {
paramList: config.treeTemplateJson || [],
}
//
getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let data = res.data
if (Array.isArray(data)) {
resolve(data);
} else {
resolve([]);
}
})
}
},
getColumnList() {
//
this.columnOptions = this.transformColumnList(this.columnList)
},
transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
}
}
}
}
this.getMergeList(list)
this.getExportList(list)
return list
},
arraySpanMethod({ column }) {
for (let i = 0; i < this.mergeList.length; i++) {
if (column.property == this.mergeList[i].prop) {
return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
}
}
},
getMergeList(list) {
let newList = JSON.parse(JSON.stringify(list))
newList.forEach(item => {
if (item.children && item.children.length) {
let child = {
prop: item.prop + '-child-first'
}
item.children.unshift(child)
}
})
newList.forEach(item => {
if (item.children && item.children.length) {
item.children.forEach((child, index) => {
if (index == 0) {
this.mergeList.push({
prop: child.prop,
rowspan: 1,
colspan: item.children.length
})
} else {
this.mergeList.push({
prop: child.prop,
rowspan: 0,
colspan: 0
})
}
})
} else {
this.mergeList.push({
prop: item.prop,
rowspan: 1,
colspan: 1
})
}
})
},
getExportList(list) {
let exportList = []
for (let i = 0; i < list.length; i++) {
if (list[i].jnpfKey === 'table') {
for (let j = 0; j < list[i].children.length; j++) {
exportList.push(list[i].children[j])
}
} else {
exportList.push(list[i])
}
}
this.exportList = exportList
},
goDetail(id) {
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(id)
})
},
sortChange({ column, prop, order }) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop
this.initData()
},
async initSearchDataAndListData() {
await this.initSearchData()
this.initData()
},
//
async initSearchData() {
},
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
keyword: this.keyword,
dataType: 0,
menuId: this.menuId,
moduleId: '590163980832475013',
type: 1,
};
request({
url: `/api/example/YysClasses/getList`,
method: 'post',
data: _query
}).then(res => {
var _list = res.data.list;
this.list = _list.map(o => ({
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/example/YysClasses/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
handelUpload() {
this.uploadBoxVisible = true
this.$nextTick(() => {
this.$refs.UploadBox.init("", "example/YysClasses")
})
},
openSuperQuery() {
this.superQueryVisible = true
this.$nextTick(() => {
this.$refs.SuperQuery.init()
})
},
superQuery(queryJson) {
this.listQuery.superQueryJson = queryJson
this.listQuery.currentPage = 1
this.initData()
},
addOrUpdateHandle(row, isDetail) {
let id = row ? row.id : ""
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail, this.list)
})
},
exportData() {
this.exportBoxVisible = true
this.$nextTick(() => {
this.$refs.ExportBox.init(this.exportList)
})
},
download(data) {
let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
request({
url: `/api/example/YysClasses/Actions/Export`,
method: 'post',
data: query
}).then(res => {
if (!res.data.url) return
this.jnpf.downloadFile(res.data.url)
this.$refs.ExportBox.visible = false
this.exportBoxVisible = false
})
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.initData()
},
refresh(isrRefresh) {
this.formVisible = false
if (isrRefresh) this.reset()
},
reset() {
this.query = JSON.parse(JSON.stringify(this.queryData))
this.search()
},
colseFlow(isrRefresh) {
this.flowVisible = false
if (isrRefresh) this.reset()
},
}
}
</script>

File diff suppressed because one or more lines are too long

@ -1,63 +1,55 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" append-to-body :visible.sync="visible"
class="JNPF-dialog JNPF-dialog_center" lock-scroll width="700px">
<template>
<el-dialog :title="!dataForm.id ? '新建' :'编辑'"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="600px">
<el-row :gutter="15" class=""> <el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right" > <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
<template v-if="!loading"> label-position="right">
<!-- 具体表单 --> <template v-if="!loading">
<el-col :span="24" > <!-- 具体表单 -->
<jnpf-form-tip-item <el-col :span="24">
label="岗位名称" prop="postName" > <jnpf-form-tip-item label="岗位名称" prop="postName">
<JnpfInput v-model="dataForm.postName" @change="changeData('postName',-1)" <JnpfInput v-model="dataForm.postName" @change="changeData('postName', -1)"
placeholder="请输入岗位名称" clearable :style='{"width":"100%"}'> placeholder="请输入岗位名称" clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24">
<jnpf-form-tip-item <jnpf-form-tip-item label="岗位编码" prop="postCode">
label="岗位编码" prop="postCode" > <JnpfInput v-model="dataForm.postCode" @change="changeData('postCode', -1)"
<JnpfInput v-model="dataForm.postCode" @change="changeData('postCode',-1)" placeholder="请输入岗位编码" clearable :style='{ "width": "100%" }'>
placeholder="请输入岗位编码" clearable :style='{"width":"100%"}'> </JnpfInput>
</JnpfInput> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="24">
<el-col :span="24" > <jnpf-form-tip-item label="岗位顺序" prop="postSort">
<jnpf-form-tip-item <JnpfInput v-model="dataForm.postSort" @change="changeData('postSort', -1)" placeholder="请输入"
label="岗位顺序" prop="postSort" > clearable :style='{ "width": "100%" }'>
<JnpfInput v-model="dataForm.postSort" @change="changeData('postSort',-1)" </JnpfInput>
placeholder="请输入" clearable :style='{"width":"100%"}'> </jnpf-form-tip-item>
</JnpfInput> </el-col>
</jnpf-form-tip-item> <el-col :span="24">
</el-col> <jnpf-form-tip-item label="岗位状态" prop="postStatus">
<el-col :span="24" > <JnpfSelect v-model="dataForm.postStatus" @change="changeData('postStatus', -1)"
<jnpf-form-tip-item placeholder="请选择" clearable :style='{ "width": "100%" }' :options="postStatusOptions"
label="岗位状态" prop="postStatus" > :props="postStatusProps">
<JnpfSelect v-model="dataForm.postStatus" @change="changeData('postStatus',-1)" </JnpfSelect>
placeholder="请选择" clearable :style='{"width":"100%"}' :options="postStatusOptions" :props="postStatusProps" > </jnpf-form-tip-item>
</JnpfSelect> </el-col>
</jnpf-form-tip-item> <el-col :span="24">
</el-col> <jnpf-form-tip-item label="岗位备注" prop="reamrk">
<el-col :span="24" > <JnpfTextarea v-model="dataForm.reamrk" @change="changeData('reamrk', -1)" placeholder="请输入"
<jnpf-form-tip-item :style='{ "width": "100%" }' true type="textarea" :autosize='{ "minRows": 4, "maxRows": 4 }'>
label="岗位备注" prop="reamrk" > </JnpfTextarea>
<JnpfTextarea v-model="dataForm.reamrk" @change="changeData('reamrk',-1)" </jnpf-form-tip-item>
placeholder="请输入" :style='{"width":"100%"}' true type="textarea" :autosize='{"minRows":4,"maxRows":4}' > </el-col>
</JnpfTextarea> <!-- 表单结束 -->
</jnpf-form-tip-item> </template>
</el-col> </el-form>
<!-- 表单结束 --> <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
</template> @select="addForSelect" @close="selectDialogVisible = false" />
</el-form> </el-row>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" <span slot="footer" class="dialog-footer">
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/> <!-- <div class="upAndDown-button" v-if="dataForm.id">
</el-row>
<span slot="footer" class="dialog-footer">
<!-- <div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'> <el-button @click="prev" :disabled='prevDis'>
{{'上一条'}} {{'上一条'}}
</el-button> </el-button>
@ -67,26 +59,26 @@
</div> </div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading"> <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button> --> {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button> -->
<el-button @click="visible = false"> </el-button> <el-button @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button> <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {mapGetters} from "vuex"; import { mapGetters } from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user' import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize' import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js' import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { }, components: {},
props: [], props: [],
data() { data() {
return { return {
dataFormSubmitType: 0, dataFormSubmitType: 0,
continueBtnLoading: false, continueBtnLoading: false,
@ -98,362 +90,362 @@
loading: false, loading: false,
btnLoading: false, btnLoading: false,
formRef: 'formRef', formRef: 'formRef',
setting:{}, setting: {},
eventType: '', eventType: '',
userBoxVisible:false, userBoxVisible: false,
selectDialogVisible: false, selectDialogVisible: false,
currTableConf:{}, currTableConf: {},
dataValueAll:{}, dataValueAll: {},
addTableConf:{ addTableConf: {
}, },
// //
ableAll:{ ableAll: {
}, },
tableRows:{ tableRows: {
}, },
Vmodel:"", Vmodel: "",
currVmodel:"", currVmodel: "",
dataForm: { dataForm: {
postName : undefined, postName: undefined,
postCode : undefined, postCode: undefined,
postSort : "1", postSort: "1",
postStatus : "1", postStatus: "1",
reamrk : undefined, reamrk: undefined,
}, },
tableRequiredData: {}, tableRequiredData: {},
dataRule: dataRule:
{ {
postName: [ postName: [
{ {
required: true, required: true,
message: '请输入岗位名称', message: '请输入岗位名称',
trigger: 'blur' trigger: 'blur'
}, },
], ],
postCode: [ postCode: [
{ {
required: true, required: true,
message: '请输入岗位编码', message: '请输入岗位编码',
trigger: 'blur' trigger: 'blur'
}, },
], ],
postSort: [ postSort: [
{ {
pattern: /^\d+$/, pattern: /^\d+$/,
message: '请输入正确的数字', message: '请输入正确的数字',
trigger: 'blur' trigger: 'blur'
}, },
], ],
postStatus: [ postStatus: [
{ {
required: true, required: true,
message: '请至少选择一个', message: '请至少选择一个',
trigger: 'change' trigger: 'change'
}, },
], ],
}, },
postStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"不启用","id":"2"}], postStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "不启用", "id": "2" }],
postStatusProps:{"label":"fullName","value":"id" }, postStatusProps: { "label": "fullName", "value": "id" },
childIndex:-1, childIndex: -1,
isEdit:false, isEdit: false,
interfaceRes: { interfaceRes: {
postName:[] , postName: [],
postCode:[] , postCode: [],
postSort:[] , postSort: [],
postStatus:[] , postStatus: [],
reamrk:[] , reamrk: [],
}, },
} }
},
computed: {
...mapGetters(['userInfo'])
},
watch: {},
created() {
this.dataAll()
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() { },
methods: {
prev() {
this.index--
if (this.index === 0) {
this.prevDis = true
}
this.nextDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
}, },
computed: { next() {
...mapGetters(['userInfo']) this.index++
if (this.index === this.allList.length - 1) {
this.nextDis = true
}
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
}, },
watch: {}, getInfo(id) {
created() { request({
this.dataAll() url: '/api/example/YysPost/' + id,
this.initDefaultData() method: 'get'
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm)) }).then(res => {
this.dataInfo(res.data)
});
}, },
mounted() {}, goBack() {
methods: { this.visible = false
prev() { this.$emit('refreshDataList', true)
this.index-- },
if (this.index === 0) { changeData(model, index) {
this.prevDis = true this.isEdit = false
} this.childIndex = index
this.nextDis = false let modelAll = model.split("-");
for (let index = 0; index < this.allList.length; index++) { let faceMode = "";
const element = this.allList[index]; for (let i = 0; i < modelAll.length; i++) {
if (this.index == index) { faceMode += modelAll[i];
this.getInfo(element.id) }
} for (let key in this.interfaceRes) {
} if (key != faceMode) {
}, let faceReList = this.interfaceRes[key]
next() { for (let i = 0; i < faceReList.length; i++) {
this.index++ if (faceReList[i].relationField == model) {
if (this.index === this.allList.length - 1) { let options = 'get' + key + 'Options';
this.nextDis = true if (this[options]) {
} this[options]()
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
getInfo(id) {
request({
url: '/api/example/YysPost/'+ id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
});
},
goBack() {
this.visible = false
this.$emit('refreshDataList', true)
},
changeData(model, index) {
this.isEdit = false
this.childIndex = index
let modelAll = model.split("-");
let faceMode = "";
for (let i = 0; i < modelAll.length; i++) {
faceMode += modelAll[i];
}
for (let key in this.interfaceRes) {
if (key != faceMode) {
let faceReList = this.interfaceRes[key]
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options';
if(this[options]){
this[options]()
}
this.changeData(key, index)
} }
this.changeData(key, index)
} }
} }
} }
}, }
changeDataFormData(type, data, model,index,defaultValue) { },
if(!this.isEdit) { changeDataFormData(type, data, model, index, defaultValue) {
if (type == 2) { if (!this.isEdit) {
for (let i = 0; i < this.dataForm[data].length; i++) { if (type == 2) {
if (index == -1) { for (let i = 0; i < this.dataForm[data].length; i++) {
this.dataForm[data][i][model] = defaultValue if (index == -1) {
} else if (index == i) { this.dataForm[data][i][model] = defaultValue
this.dataForm[data][i][model] = defaultValue } else if (index == i) {
} this.dataForm[data][i][model] = defaultValue
} }
} else {
this.dataForm[data] = defaultValue
}
}
},
dataAll(){
},
clearData(){
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id,isDetail,allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true
} }
} else { } else {
this.dataForm[data] = defaultValue
}
}
},
dataAll() {
},
clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id, isDetail, allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true this.nextDis = true
} }
this.dataForm.id = id || 0; } else {
this.visible = true; this.prevDis = true
this.$nextTick(() => { this.nextDis = true
if(this.dataForm.id){ }
this.loading = true this.dataForm.id = id || 0;
request({ this.visible = true;
url: '/api/example/YysPost/'+this.dataForm.id, this.$nextTick(() => {
method: 'get' if (this.dataForm.id) {
}).then(res => { this.loading = true
this.dataInfo(res.data) request({
this.loading = false url: '/api/example/YysPost/' + this.dataForm.id,
}); method: 'get'
}else{ }).then(res => {
this.clearData() this.dataInfo(res.data)
this.initDefaultData() this.loading = false
} });
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
initDefaultData() {
},
//
dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0
this.$refs['formRef'].validate((valid) => {
if (valid) {
this.request()
}
})
},
request() {
let _data =this.dataList()
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else { } else {
this.btnLoading = true this.clearData()
this.initDefaultData()
} }
if (!this.dataForm.id) { });
request({ this.$store.commit('generator/UPDATE_RELATION_DATA', {})
url: '/api/example/YysPost', },
method: 'post', //
data: _data initDefaultData() {
}).then((res) => {
this.$message({ },
message: res.msg, //
type: 'success', dataFormSubmit(type) {
duration: 1000, this.dataFormSubmitType = type ? type : 0
onClose: () => { this.$refs['formRef'].validate((valid) => {
if (this.dataFormSubmitType == 2) { if (valid) {
this.$nextTick(() => { this.request()
this.clearData() }
this.initDefaultData() })
}) },
this.continueBtnLoading = false request() {
return let _data = this.dataList()
} if (this.dataFormSubmitType == 2) {
this.visible = false this.continueBtnLoading = true
this.btnLoading = false } else {
this.$emit('refresh', true) this.btnLoading = true
}
if (!this.dataForm.id) {
request({
url: '/api/example/YysPost',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
} }
}) this.visible = false
}).catch(()=>{ this.btnLoading = false
this.btnLoading = false this.$emit('refresh', true)
this.continueBtnLoading = false }
}) })
}else{ }).catch(() => {
request({ this.btnLoading = false
url: '/api/example/YysPost/'+this.dataForm.id, this.continueBtnLoading = false
method: 'PUT', })
data: _data } else {
}).then((res) => { request({
this.$message({ url: '/api/example/YysPost/' + this.dataForm.id,
message: res.msg, method: 'PUT',
type: 'success', data: _data
duration: 1000, }).then((res) => {
onClose: () => { this.$message({
if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false message: res.msg,
this.visible = false type: 'success',
this.btnLoading = false duration: 1000,
this.$emit('refresh', true) onClose: () => {
} if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
}) this.visible = false
}).catch(()=>{ this.btnLoading = false
this.btnLoading = false this.$emit('refresh', true)
this.continueBtnLoading = false }
}) })
} }).catch(() => {
}, this.btnLoading = false
openSelectDialog(key) { this.continueBtnLoading = false
this.currTableConf=this.addTableConf[key]
this.currVmodel=key
this.selectDialogVisible = true
this.$nextTick(() => {
this.$refs.selectDialog.init()
}) })
}, }
addForSelect(data) { },
for (let i = 0; i < data.length; i++) { openSelectDialog(key) {
let t = data[i] this.currTableConf = this.addTableConf[key]
if(this['get'+this.currVmodel]){ this.currVmodel = key
this['get'+this.currVmodel](t) this.selectDialogVisible = true
} this.$nextTick(() => {
this.$refs.selectDialog.init()
})
},
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i]
if (this['get' + this.currVmodel]) {
this['get' + this.currVmodel](t)
} }
}, }
dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) { },
let timeDataValue = null; dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
let timeValue = Number(timeValueData) let timeDataValue = null;
if (timeRule) { let timeValue = Number(timeValueData)
if (timeType == 1) { if (timeRule) {
timeDataValue = timeValue if (timeType == 1) {
} else if (timeType == 2) { timeDataValue = timeValue
timeDataValue = dataValue } else if (timeType == 2) {
} else if (timeType == 3) { timeDataValue = dataValue
timeDataValue = new Date().getTime() } else if (timeType == 3) {
} else if (timeType == 4) { timeDataValue = new Date().getTime()
let previousDate = ''; } else if (timeType == 4) {
if (timeTarget == 1 || timeTarget == 2) { let previousDate = '';
previousDate = getDateDay(timeTarget, timeType, timeValue) if (timeTarget == 1 || timeTarget == 2) {
timeDataValue = new Date(previousDate).getTime() previousDate = getDateDay(timeTarget, timeType, timeValue)
} else if (timeTarget == 3) { timeDataValue = new Date(previousDate).getTime()
previousDate = getBeforeData(timeValue) } else if (timeTarget == 3) {
timeDataValue = new Date(previousDate).getTime() previousDate = getBeforeData(timeValue)
} else { timeDataValue = new Date(previousDate).getTime()
timeDataValue = getBeforeTime(timeTarget, timeValue).getTime() } else {
} timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
} else if (timeType == 5) { }
let previousDate = ''; } else if (timeType == 5) {
if (timeTarget == 1 || timeTarget == 2) { let previousDate = '';
previousDate = getDateDay(timeTarget, timeType, timeValue) if (timeTarget == 1 || timeTarget == 2) {
timeDataValue = new Date(previousDate).getTime() previousDate = getDateDay(timeTarget, timeType, timeValue)
} else if (timeTarget == 3) { timeDataValue = new Date(previousDate).getTime()
previousDate = getLaterData(timeValue) } else if (timeTarget == 3) {
timeDataValue = new Date(previousDate).getTime() previousDate = getLaterData(timeValue)
} else { timeDataValue = new Date(previousDate).getTime()
timeDataValue = getLaterTime(timeTarget, timeValue).getTime() } else {
} timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
} }
} }
return timeDataValue; }
}, return timeDataValue;
time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) { },
let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
let timeDataValue = null let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
if (timeRule) { let timeDataValue = null
if (timeType == 1) { if (timeRule) {
timeDataValue = timeValue || '00:00:00' if (timeType == 1) {
if (timeDataValue.split(':').length == 3) { timeDataValue = timeValue || '00:00:00'
timeDataValue = timeDataValue if (timeDataValue.split(':').length == 3) {
} else { timeDataValue = timeDataValue
timeDataValue = timeDataValue + ':00' } else {
} timeDataValue = timeDataValue + ':00'
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} }
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} }
return timeDataValue; }
}, return timeDataValue;
dataList(){ },
var _data = this.dataForm; dataList() {
return _data; var _data = this.dataForm;
}, return _data;
dataInfo(dataAll){ },
let _dataAll =dataAll dataInfo(dataAll) {
this.dataForm = _dataAll let _dataAll = dataAll
this.isEdit = true this.dataForm = _dataAll
this.dataAll() this.isEdit = true
this.childIndex=-1 this.dataAll()
}, this.childIndex = -1
}, },
} },
}
</script> </script>

Loading…
Cancel
Save