diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/YysCalendarMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/YysCalendarMapper.java new file mode 100644 index 0000000..ec34257 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/YysCalendarMapper.java @@ -0,0 +1,16 @@ +package jnpf.mapper; + + +import jnpf.entity.YysCalendarEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * yysCalendar + * 版本: V3.5 + * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) + * 作者: JNPF开发平台组 + * 日期: 2024-08-05 + */ +public interface YysCalendarMapper extends BaseMapper { + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/YysGroupMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/YysGroupMapper.java new file mode 100644 index 0000000..db52764 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/YysGroupMapper.java @@ -0,0 +1,16 @@ +package jnpf.mapper; + + +import jnpf.entity.YysGroupEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * yysGroup + * 版本: V3.5 + * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) + * 作者: JNPF开发平台组 + * 日期: 2024-08-05 + */ +public interface YysGroupMapper extends BaseMapper { + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysCalendarService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysCalendarService.java new file mode 100644 index 0000000..8d482df --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysCalendarService.java @@ -0,0 +1,43 @@ +package jnpf.service; + +import jnpf.model.yyscalendar.*; +import jnpf.entity.*; + +import java.util.*; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + +/** + * yysCalendar + * 版本: V3.5 + * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) + * 作者: JNPF开发平台组 + * 日期: 2024-08-05 + */ +public interface YysCalendarService extends IService { + List getList(YysCalendarPagination yysCalendarPagination); + + List getTypeList(YysCalendarPagination yysCalendarPagination, String dataType); + + YysCalendarEntity getInfo(String id); + + void delete(YysCalendarEntity entity); + + void create(YysCalendarEntity entity); + + boolean update(String id, YysCalendarEntity entity); + + //子表方法 + //副表数据方法 + String checkForm(YysCalendarForm form, int i); + + String saveOrUpdate(YysCalendarForm yysCalendarForm, String id, boolean isSave); + + /** + * 根据条件更新状态 + * + * @param yysCalendarForm 条件 + */ + void updateStatus(YysCalendarForm yysCalendarForm); +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysGroupService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysGroupService.java new file mode 100644 index 0000000..aa2902f --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysGroupService.java @@ -0,0 +1,35 @@ +package jnpf.service; + +import jnpf.model.yysgroup.*; +import jnpf.entity.*; +import java.util.*; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + +/** + * yysGroup + * 版本: V3.5 + * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) + * 作者: JNPF开发平台组 + * 日期: 2024-08-05 + */ +public interface YysGroupService extends IService { + List getList(YysGroupPagination yysGroupPagination); + + List getTypeList(YysGroupPagination yysGroupPagination,String dataType); + + YysGroupEntity getInfo(String id); + + void delete(YysGroupEntity entity); + + void create(YysGroupEntity entity); + + boolean update(String id, YysGroupEntity entity); + + //子表方法 + //副表数据方法 + String checkForm(YysGroupForm form,int i); + + void saveOrUpdate(YysGroupForm yysGroupForm,String id, boolean isSave) throws Exception; + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysCalendarServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysCalendarServiceImpl.java new file mode 100644 index 0000000..e22b71d --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysCalendarServiceImpl.java @@ -0,0 +1,324 @@ +package jnpf.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.common.collect.Lists; +import jnpf.base.UserInfo; +import jnpf.base.model.ColumnDataModel; +import jnpf.database.model.superQuery.SuperJsonModel; +import jnpf.entity.YysCalendarEntity; +import jnpf.mapper.YysCalendarMapper; +import jnpf.model.QueryModel; +import jnpf.model.yyscalendar.YysCalendarConstant; +import jnpf.model.yyscalendar.YysCalendarForm; +import jnpf.model.yyscalendar.YysCalendarPagination; +import jnpf.service.YysCalendarService; +import jnpf.util.*; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.lang.reflect.Field; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; +import java.time.temporal.ChronoField; +import java.time.temporal.TemporalAccessor; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + + +/** + * yysCalendar + * 版本: V3.5 + * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) + * 作者: JNPF开发平台组 + * 日期: 2024-08-05 + */ +@Service +@Slf4j +public class YysCalendarServiceImpl extends ServiceImpl implements YysCalendarService { + @Autowired + private GeneraterSwapUtil generaterSwapUtil; + + @Autowired + private UserProvider userProvider; + + @Override + public List getList(YysCalendarPagination yysCalendarPagination) { + return getTypeList(yysCalendarPagination, yysCalendarPagination.getDataType()); + } + + /** + * 列表查询 + */ + @Override + public List getTypeList(YysCalendarPagination yysCalendarPagination, String dataType) { + String userId = userProvider.get().getUserId(); + List AllIdList = new ArrayList(); + List> intersectionList = new ArrayList<>(); + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + String columnData = !isPc ? YysCalendarConstant.getAppColumnData() : YysCalendarConstant.getColumnData(); + ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class); + String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList()); + + int total = 0; + int yysCalendarNum = 0; + QueryWrapper yysCalendarQueryWrapper = new QueryWrapper<>(); + List allSuperIDlist = new ArrayList<>(); + String superOp = ""; + if (ObjectUtil.isNotEmpty(yysCalendarPagination.getSuperQueryJson())) { + List allSuperList = new ArrayList<>(); + List> intersectionSuperList = new ArrayList<>(); + String queryJson = yysCalendarPagination.getSuperQueryJson(); + SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); + int superNum = 0; + QueryWrapper yysCalendarSuperWrapper = new QueryWrapper<>(); + yysCalendarSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysCalendarSuperWrapper, YysCalendarEntity.class, queryJson, "0")); + int yysCalendarNum1 = yysCalendarSuperWrapper.getExpression().getNormal().size(); + if (yysCalendarNum1 > 0) { + List yysCalendarList = this.list(yysCalendarSuperWrapper).stream().map(YysCalendarEntity::getId).collect(Collectors.toList()); + allSuperList.addAll(yysCalendarList); + intersectionSuperList.add(yysCalendarList); + superNum++; + } + superOp = superNum > 0 ? superJsonModel.getMatchLogic() : ""; + //and or + if (superOp.equalsIgnoreCase("and")) { + allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList); + } else { + allSuperIDlist = allSuperList; + } + } + List allRuleIDlist = new ArrayList<>(); + String ruleOp = ""; + if (ObjectUtil.isNotEmpty(ruleJson)) { + List allRuleList = new ArrayList<>(); + List> intersectionRuleList = new ArrayList<>(); + SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class); + int ruleNum = 0; + QueryWrapper yysCalendarSuperWrapper = new QueryWrapper<>(); + yysCalendarSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysCalendarSuperWrapper, YysCalendarEntity.class, ruleJson, "0")); + int yysCalendarNum1 = yysCalendarSuperWrapper.getExpression().getNormal().size(); + if (yysCalendarNum1 > 0) { + List yysCalendarList = this.list(yysCalendarSuperWrapper).stream().map(YysCalendarEntity::getId).collect(Collectors.toList()); + allRuleList.addAll(yysCalendarList); + intersectionRuleList.add(yysCalendarList); + 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 yysCalendarObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysCalendarQueryWrapper, YysCalendarEntity.class, yysCalendarPagination.getMenuId(), "0")); + if (ObjectUtil.isEmpty(yysCalendarObj)) { + return new ArrayList<>(); + } else { + yysCalendarQueryWrapper = (QueryWrapper) yysCalendarObj; + if (yysCalendarQueryWrapper.getExpression().getNormal().size() > 0) { + yysCalendarNum++; + } + } + } + } + if (!isPc && appPermission) { + if (!userProvider.get().getIsAdministrator()) { + Object yysCalendarObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysCalendarQueryWrapper, YysCalendarEntity.class, yysCalendarPagination.getMenuId(), "0")); + if (ObjectUtil.isEmpty(yysCalendarObj)) { + return new ArrayList<>(); + } else { + yysCalendarQueryWrapper = (QueryWrapper) yysCalendarObj; + if (yysCalendarQueryWrapper.getExpression().getNormal().size() > 0) { + yysCalendarNum++; + } + } + + + } + } + if (isPc) { + if (ObjectUtil.isNotEmpty(yysCalendarPagination.getYears())) { + yysCalendarNum++; + +// List YearsList = JsonUtil.getJsonToList(yysCalendarPagination.getYears(), String.class); +// Long fir = Long.valueOf(String.valueOf(YearsList.get(0))); +// Long sec = Long.valueOf(String.valueOf(YearsList.get(1))); +// +// yysCalendarQueryWrapper.lambda().ge(YysCalendarEntity::getYears, new Date(fir)) +// .le(YysCalendarEntity::getYears, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + + yysCalendarQueryWrapper.lambda().eq(YysCalendarEntity::getYears, yysCalendarPagination.getYears().toString()); + } + + } + List intersection = generaterSwapUtil.getIntersection(intersectionList); + if (total > 0) { + if (intersection.size() == 0) { + intersection.add("jnpfNullList"); + } + yysCalendarQueryWrapper.lambda().in(YysCalendarEntity::getId, intersection); + } + //是否有高级查询 + if (StringUtil.isNotEmpty(superOp)) { + if (allSuperIDlist.size() == 0) { + allSuperIDlist.add("jnpfNullList"); + } + List finalAllSuperIDlist = allSuperIDlist; + yysCalendarQueryWrapper.lambda().and(t -> t.in(YysCalendarEntity::getId, finalAllSuperIDlist)); + } + //是否有数据过滤查询 + if (StringUtil.isNotEmpty(ruleOp)) { + if (allRuleIDlist.size() == 0) { + allRuleIDlist.add("jnpfNullList"); + } + List finalAllRuleIDlist = allRuleIDlist; + yysCalendarQueryWrapper.lambda().and(t -> t.in(YysCalendarEntity::getId, finalAllRuleIDlist)); + } + //假删除标志 + yysCalendarQueryWrapper.lambda().isNull(YysCalendarEntity::getDeleteMark); + + //排序 + if (StringUtil.isEmpty(yysCalendarPagination.getSidx())) { + yysCalendarQueryWrapper.lambda().orderByDesc(YysCalendarEntity::getId); + } else { + try { + String sidx = yysCalendarPagination.getSidx(); + String[] strs = sidx.split("_name"); + YysCalendarEntity yysCalendarEntity = new YysCalendarEntity(); + Field declaredField = yysCalendarEntity.getClass().getDeclaredField(strs[0]); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + yysCalendarQueryWrapper = "asc".equals(yysCalendarPagination.getSort().toLowerCase()) ? yysCalendarQueryWrapper.orderByAsc(value) : yysCalendarQueryWrapper.orderByDesc(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + + if ("0".equals(dataType)) { + if ((total > 0 && AllIdList.size() > 0) || total == 0) { + Page page = new Page<>(yysCalendarPagination.getCurrentPage(), yysCalendarPagination.getPageSize()); + IPage userIPage = this.page(page, yysCalendarQueryWrapper); + return yysCalendarPagination.setData(userIPage.getRecords(), userIPage.getTotal()); + } else { + List list = new ArrayList(); + return yysCalendarPagination.setData(list, list.size()); + } + } else { + return this.list(yysCalendarQueryWrapper); + } + } + + @Override + public YysCalendarEntity getInfo(String id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(YysCalendarEntity::getId, id); + return this.getOne(queryWrapper); + } + + @Override + public void create(YysCalendarEntity entity) { + this.save(entity); + } + + @Override + public boolean update(String id, YysCalendarEntity entity) { + return this.updateById(entity); + } + + @Override + public void delete(YysCalendarEntity entity) { + if (entity != null) { + this.removeById(entity.getId()); + } + } + + /** + * 验证表单唯一字段,正则,非空 i-0新增-1修改 + */ + @Override + public String checkForm(YysCalendarForm form, int i) { + boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); + String id = ""; + String countRecover = ""; + if (isUp) { + id = form.getId(); + } + //主表字段验证 + return countRecover; + } + + /** + * 新增修改数据(事务回滚) + * + * @param id + * @param yysCalendarForm + * @return + */ + @Override + @Transactional + public String saveOrUpdate(YysCalendarForm yysCalendarForm, String id, boolean isSave) throws Exception { + UserInfo userInfo = userProvider.get(); + YysCalendarEntity entity = BeanUtil.copyProperties(yysCalendarForm, YysCalendarEntity.class); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(YysCalendarEntity.class) + .eq(YysCalendarEntity::getYears, yysCalendarForm.getYears()); + if (CollectionUtils.isNotEmpty(this.list(wrapper))) { + return "所选年月已被创建"; + } + List list = Lists.newArrayList(); + //根据年月判断多少天 然后循环创建多少条数据 + int countedDays = this.countDays(yysCalendarForm.getYears()); + for (int i = 1; i <= countedDays; i++) { + String mainId = RandomUtil.uuId(); + entity.setCreatorTime(DateUtil.getNowDate()); + entity.setCreatorUserId(userInfo.getUserId()); + entity.setId(mainId); + entity.setVersion(0); + entity.setDay(String.valueOf(i)); + list.add(entity); + } + boolean result = this.saveBatch(list); + if (result) { + return "创建成功"; + } + return "创建失败"; + } + + @Override + public void updateStatus(YysCalendarForm yysCalendarForm) { + log.info("根据条件更新状态,yysCalendarForm:{}", yysCalendarForm); + YysCalendarEntity calendar = this.getById(yysCalendarForm.getId()); + if (ObjectUtil.isNull(calendar)) { + return; + } + calendar.setIsHoliday(yysCalendarForm.getIsHoliday()); + calendar.setLastModifyTime(DateUtil.getNowDate()); + calendar.setLastModifyUserId(userProvider.get().getUserId()); + this.updateById(calendar); + } + + private int countDays(String dateStr) { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM"); + TemporalAccessor parsed = formatter.parse(dateStr); + LocalDate date = LocalDate.of(parsed.get(ChronoField.YEAR), parsed.get(ChronoField.MONTH_OF_YEAR), 1); + // 获取这个月的天数 + return date.lengthOfMonth(); + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysGroupServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysGroupServiceImpl.java new file mode 100644 index 0000000..8c1ff0a --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysGroupServiceImpl.java @@ -0,0 +1,307 @@ +package jnpf.service.impl; + +import jnpf.entity.*; +import jnpf.mapper.YysGroupMapper; +import jnpf.service.*; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.model.yysgroup.*; +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; +/** + * + * yysGroup + * 版本: V3.5 + * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) + * 作者: JNPF开发平台组 + * 日期: 2024-08-05 + */ +@Service +public class YysGroupServiceImpl extends ServiceImpl implements YysGroupService{ + @Autowired + private GeneraterSwapUtil generaterSwapUtil; + + @Autowired + private UserProvider userProvider; + + @Override + public List getList(YysGroupPagination yysGroupPagination){ + return getTypeList(yysGroupPagination,yysGroupPagination.getDataType()); + } + /** 列表查询 */ + @Override + public List getTypeList(YysGroupPagination yysGroupPagination,String dataType){ + String userId=userProvider.get().getUserId(); + List AllIdList =new ArrayList(); + List> intersectionList =new ArrayList<>(); + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + String columnData = !isPc ? YysGroupConstant.getAppColumnData() : YysGroupConstant.getColumnData(); + ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class); + String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList()); + + int total=0; + int yysGroupNum =0; + QueryWrapper yysGroupQueryWrapper=new QueryWrapper<>(); + List allSuperIDlist = new ArrayList<>(); + String superOp =""; + if (ObjectUtil.isNotEmpty(yysGroupPagination.getSuperQueryJson())){ + List allSuperList = new ArrayList<>(); + List> intersectionSuperList = new ArrayList<>(); + String queryJson = yysGroupPagination.getSuperQueryJson(); + SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); + int superNum = 0; + QueryWrapper yysGroupSuperWrapper = new QueryWrapper<>(); + yysGroupSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysGroupSuperWrapper,YysGroupEntity.class,queryJson,"0")); + int yysGroupNum1 = yysGroupSuperWrapper.getExpression().getNormal().size(); + if (yysGroupNum1>0){ + List yysGroupList =this.list(yysGroupSuperWrapper).stream().map(YysGroupEntity::getId).collect(Collectors.toList()); + allSuperList.addAll(yysGroupList); + intersectionSuperList.add(yysGroupList); + superNum++; + } + superOp = superNum > 0 ? superJsonModel.getMatchLogic() : ""; + //and or + if(superOp.equalsIgnoreCase("and")){ + allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList); + }else{ + allSuperIDlist = allSuperList; + } + } + List allRuleIDlist = new ArrayList<>(); + String ruleOp =""; + if (ObjectUtil.isNotEmpty(ruleJson)){ + List allRuleList = new ArrayList<>(); + List> intersectionRuleList = new ArrayList<>(); + SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class); + int ruleNum = 0; + QueryWrapper yysGroupSuperWrapper = new QueryWrapper<>(); + yysGroupSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysGroupSuperWrapper,YysGroupEntity.class,ruleJson,"0")); + int yysGroupNum1 = yysGroupSuperWrapper.getExpression().getNormal().size(); + if (yysGroupNum1>0){ + List yysGroupList =this.list(yysGroupSuperWrapper).stream().map(YysGroupEntity::getId).collect(Collectors.toList()); + allRuleList.addAll(yysGroupList); + intersectionRuleList.add(yysGroupList); + 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 yysGroupObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysGroupQueryWrapper,YysGroupEntity.class,yysGroupPagination.getMenuId(),"0")); + if (ObjectUtil.isEmpty(yysGroupObj)){ + return new ArrayList<>(); + } else { + yysGroupQueryWrapper = (QueryWrapper)yysGroupObj; + if( yysGroupQueryWrapper.getExpression().getNormal().size()>0){ + yysGroupNum++; + } + } + } + } + if(!isPc && appPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object yysGroupObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysGroupQueryWrapper,YysGroupEntity.class,yysGroupPagination.getMenuId(),"0")); + if (ObjectUtil.isEmpty(yysGroupObj)){ + return new ArrayList<>(); + } else { + yysGroupQueryWrapper = (QueryWrapper)yysGroupObj; + if( yysGroupQueryWrapper.getExpression().getNormal().size()>0){ + yysGroupNum++; + } + } + + + } + } + if(isPc){ + if(ObjectUtil.isNotEmpty(yysGroupPagination.getGroupName())){ + yysGroupNum++; + + String value = yysGroupPagination.getGroupName() instanceof List ? + JsonUtil.getObjectToString(yysGroupPagination.getGroupName()) : + String.valueOf(yysGroupPagination.getGroupName()); + yysGroupQueryWrapper.lambda().like(YysGroupEntity::getGroupName,value); + + } + + if(ObjectUtil.isNotEmpty(yysGroupPagination.getEnabledStatus())){ + yysGroupNum++; + + List idList = new ArrayList<>(); + try { + String[][] enabledStatus = JsonUtil.getJsonToBean(yysGroupPagination.getEnabledStatus(),String[][].class); + for(int i=0;i0){ + idList.add(JsonUtil.getObjectToString(Arrays.asList(enabledStatus[i]))); + } + } + }catch (Exception e1){ + try { + List enabledStatus = JsonUtil.getJsonToList(yysGroupPagination.getEnabledStatus(),String.class); + if(enabledStatus.size()>0){ + idList.addAll(enabledStatus); + } + }catch (Exception e2){ + idList.add(String.valueOf(yysGroupPagination.getEnabledStatus())); + } + } + yysGroupQueryWrapper.lambda().and(t->{ + idList.forEach(tt->{ + t.like(YysGroupEntity::getEnabledStatus, tt).or(); + }); + }); + + } + + } + List intersection = generaterSwapUtil.getIntersection(intersectionList); + if (total>0){ + if (intersection.size()==0){ + intersection.add("jnpfNullList"); + } + yysGroupQueryWrapper.lambda().in(YysGroupEntity::getId, intersection); + } + //是否有高级查询 + if (StringUtil.isNotEmpty(superOp)){ + if (allSuperIDlist.size()==0){ + allSuperIDlist.add("jnpfNullList"); + } + List finalAllSuperIDlist = allSuperIDlist; + yysGroupQueryWrapper.lambda().and(t->t.in(YysGroupEntity::getId, finalAllSuperIDlist)); + } + //是否有数据过滤查询 + if (StringUtil.isNotEmpty(ruleOp)){ + if (allRuleIDlist.size()==0){ + allRuleIDlist.add("jnpfNullList"); + } + List finalAllRuleIDlist = allRuleIDlist; + yysGroupQueryWrapper.lambda().and(t->t.in(YysGroupEntity::getId, finalAllRuleIDlist)); + } + //假删除标志 + yysGroupQueryWrapper.lambda().isNull(YysGroupEntity::getDeleteMark); + + //排序 + if(StringUtil.isEmpty(yysGroupPagination.getSidx())){ + yysGroupQueryWrapper.lambda().orderByDesc(YysGroupEntity::getId); + }else{ + try { + String sidx = yysGroupPagination.getSidx(); + String[] strs= sidx.split("_name"); + YysGroupEntity yysGroupEntity = new YysGroupEntity(); + Field declaredField = yysGroupEntity.getClass().getDeclaredField(strs[0]); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + yysGroupQueryWrapper="asc".equals(yysGroupPagination.getSort().toLowerCase())?yysGroupQueryWrapper.orderByAsc(value):yysGroupQueryWrapper.orderByDesc(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + + if("0".equals(dataType)){ + if((total>0 && AllIdList.size()>0) || total==0){ + Page page=new Page<>(yysGroupPagination.getCurrentPage(), yysGroupPagination.getPageSize()); + IPage userIPage=this.page(page, yysGroupQueryWrapper); + return yysGroupPagination.setData(userIPage.getRecords(),userIPage.getTotal()); + }else{ + List list = new ArrayList(); + return yysGroupPagination.setData(list, list.size()); + } + }else{ + return this.list(yysGroupQueryWrapper); + } + } + @Override + public YysGroupEntity getInfo(String id){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.lambda().eq(YysGroupEntity::getId,id); + return this.getOne(queryWrapper); + } + @Override + public void create(YysGroupEntity entity){ + this.save(entity); + } + @Override + public boolean update(String id, YysGroupEntity entity){ + entity.setDeleteTime(DateUtil.getNowDate()); + return this.updateById(entity); + } + @Override + public void delete(YysGroupEntity entity){ + if(entity!=null){ + this.removeById(entity.getId()); + } + } + /** 验证表单唯一字段,正则,非空 i-0新增-1修改*/ + @Override + public String checkForm(YysGroupForm 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.getGroupName())){ + return "班组名称不能为空"; + } + return countRecover; + } + /** + * 新增修改数据(事务回滚) + * @param id + * @param yysGroupForm + * @return + */ + @Override + @Transactional + public void saveOrUpdate(YysGroupForm yysGroupForm,String id, boolean isSave) throws Exception{ + UserInfo userInfo=userProvider.get(); + UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); + yysGroupForm = JsonUtil.getJsonToBean( + generaterSwapUtil.swapDatetime(YysGroupConstant.getFormData(),yysGroupForm),YysGroupForm.class); + YysGroupEntity entity = JsonUtil.getJsonToBean(yysGroupForm, YysGroupEntity.class); + + if(isSave){ + String mainId = RandomUtil.uuId() ; + entity.setCreatorTime(DateUtil.getNowDate()); + entity.setCreatorUserId(userInfo.getUserId()); + entity.setId(mainId); + entity.setVersion(0); + }else{ + entity.setLastModifyTime(DateUtil.getNowDate()); + entity.setLastModifyUserId(userInfo.getUserId()); + } + this.saveOrUpdate(entity); + + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysCalendarController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysCalendarController.java new file mode 100644 index 0000000..4dbb8c7 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysCalendarController.java @@ -0,0 +1,338 @@ +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.yyscalendar.*; +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; + +/** + * yysCalendar + * + * @版本: V3.5 + * @版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) + * @作者: JNPF开发平台组 + * @日期: 2024-08-05 + */ +@Slf4j +@RestController +@Tag(name = "yysCalendar", description = "example") +@RequestMapping("/api/example/YysCalendar") +public class YysCalendarController { + + @Autowired + private GeneraterSwapUtil generaterSwapUtil; + + @Autowired + private UserProvider userProvider; + + @Autowired + private YysCalendarService yysCalendarService; + + + @Autowired + private ConfigValueUtil configValueUtil; + + /** + * 列表 + * + * @param yysCalendarPagination + * @return + */ + @Operation(summary = "获取列表") + @PostMapping("/getList") + public ActionResult list(@RequestBody YysCalendarPagination yysCalendarPagination) throws IOException { + List list = yysCalendarService.getList(yysCalendarPagination); + List> realList = new ArrayList<>(); + for (YysCalendarEntity entity : list) { + Map yysCalendarMap = JsonUtil.entityToMap(entity); + yysCalendarMap.put("id", yysCalendarMap.get("id")); + //副表数据 + //子表数据 + realList.add(yysCalendarMap); + } + //数据转换 +// realList = generaterSwapUtil.swapDataList(realList, YysCalendarConstant.getFormData(), YysCalendarConstant.getColumnData(), yysCalendarPagination.getModuleId(),false); + + //返回对象 + PageListVO vo = new PageListVO(); + vo.setList(realList); + PaginationVO page = JsonUtil.getJsonToBean(yysCalendarPagination, PaginationVO.class); + vo.setPagination(page); + return ActionResult.success(vo); + } + + /** + * 创建 + * + * @param yysCalendarForm + * @return + */ + @PostMapping() + @Operation(summary = "创建") + public ActionResult create(@RequestBody @Valid YysCalendarForm yysCalendarForm) { + String b = yysCalendarService.checkForm(yysCalendarForm, 0); + if (StringUtil.isNotEmpty(b)) { + return ActionResult.fail(b); + } + return ActionResult.success(yysCalendarService.saveOrUpdate(yysCalendarForm, null, true)); + } + + /** + * 导出Excel + * + * @return + */ + @Operation(summary = "导出Excel") + @PostMapping("/Actions/Export") + public ActionResult Export(@RequestBody YysCalendarPagination yysCalendarPagination) { + if (StringUtil.isEmpty(yysCalendarPagination.getSelectKey())) { + return ActionResult.fail("请选择导出字段"); + } + List list = yysCalendarService.getList(yysCalendarPagination); + List> realList = new ArrayList<>(); + for (YysCalendarEntity entity : list) { + Map yysCalendarMap = JsonUtil.entityToMap(entity); + yysCalendarMap.put("id", yysCalendarMap.get("id")); + //副表数据 + //子表数据 + realList.add(yysCalendarMap); + } + //数据转换 + realList = generaterSwapUtil.swapDataList(realList, YysCalendarConstant.getFormData(), YysCalendarConstant.getColumnData(), yysCalendarPagination.getModuleId(), false); + String[] keys = !StringUtil.isEmpty(yysCalendarPagination.getSelectKey()) ? yysCalendarPagination.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> list, String[] keys, UserInfo userInfo) { + DownloadVO vo = DownloadVO.builder().build(); + List entitys = new ArrayList<>(); + if (keys.length > 0) { + for (String key : keys) { + switch (key) { + case "years": + entitys.add(new ExcelExportEntity("年月", "years")); + 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> dataList = new ArrayList<>(); + for (Map 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> childList = (List>) o; + for (Map 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(YysCalendarConstant.getColumnData(), ColumnDataModel.class); + List 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 yysCalendarForm + * @return + */ + @PutMapping("/{id}") + @Operation(summary = "更新") + public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid YysCalendarForm yysCalendarForm, + @RequestParam(value = "isImport", required = false) boolean isImport) { + yysCalendarForm.setId(id); + if (!isImport) { + String b = yysCalendarService.checkForm(yysCalendarForm, 1); + if (StringUtil.isNotEmpty(b)) { + return ActionResult.fail(b); + } + } + YysCalendarEntity entity = yysCalendarService.getInfo(id); + if (entity != null) { + try { + yysCalendarService.saveOrUpdate(yysCalendarForm, 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) { + YysCalendarEntity entity = yysCalendarService.getInfo(id); + if (entity != null) { + //假删除 + entity.setDeleteMark(1); + entity.setDeleteTime(DateUtil.getNowDate()); + yysCalendarService.update(id, entity); + } + return ActionResult.success("删除成功"); + } + + /** + * 表单信息(详情页) + * 详情页面使用-转换数据 + * + * @param id + * @return + */ + @Operation(summary = "表单信息(详情页)") + @GetMapping("/detail/{id}") + public ActionResult detailInfo(@PathVariable("id") String id) { + YysCalendarEntity entity = yysCalendarService.getInfo(id); + if (entity == null) { + return ActionResult.fail("表单数据不存在!"); + } + Map yysCalendarMap = JsonUtil.entityToMap(entity); + yysCalendarMap.put("id", yysCalendarMap.get("id")); + //副表数据 + //子表数据 + yysCalendarMap = generaterSwapUtil.swapDataDetail(yysCalendarMap, YysCalendarConstant.getFormData(), "590186598289642885", false); + return ActionResult.success(yysCalendarMap); + } + + /** + * 获取详情(编辑页) + * 编辑页面使用-不转换数据 + * + * @param id + * @return + */ + @Operation(summary = "信息") + @GetMapping("/{id}") + public ActionResult info(@PathVariable("id") String id) { + YysCalendarEntity entity = yysCalendarService.getInfo(id); + if (entity == null) { + return ActionResult.fail("表单数据不存在!"); + } + Map yysCalendarMap = JsonUtil.entityToMap(entity); + yysCalendarMap.put("id", yysCalendarMap.get("id")); + //副表数据 + //子表数据 +// yysCalendarMap = generaterSwapUtil.swapDataForm(yysCalendarMap,YysCalendarConstant.getFormData(),YysCalendarConstant.TABLEFIELDKEY,YysCalendarConstant.TABLERENAMES); + return ActionResult.success(yysCalendarMap); + } + + @Operation(summary = "更新状态") + @PostMapping("/updateStatus") + public ActionResult updateStatus(@RequestBody YysCalendarForm yysCalendarForm) { + yysCalendarService.updateStatus(yysCalendarForm); + return ActionResult.success(); + } + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysGroupController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysGroupController.java new file mode 100644 index 0000000..af20866 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysGroupController.java @@ -0,0 +1,331 @@ +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.yysgroup.*; +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; + +/** + * yysGroup + * @版本: V3.5 + * @版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) + * @作者: JNPF开发平台组 + * @日期: 2024-08-05 + */ +@Slf4j +@RestController +@Tag(name = "yysGroup" , description = "example") +@RequestMapping("/api/example/YysGroup") +public class YysGroupController { + + @Autowired + private GeneraterSwapUtil generaterSwapUtil; + + @Autowired + private UserProvider userProvider; + + @Autowired + private YysGroupService yysGroupService; + + + + @Autowired + private ConfigValueUtil configValueUtil; + + /** + * 列表 + * + * @param yysGroupPagination + * @return + */ + @Operation(summary = "获取列表") + @PostMapping("/getList") + public ActionResult list(@RequestBody YysGroupPagination yysGroupPagination)throws IOException{ + List list= yysGroupService.getList(yysGroupPagination); + List> realList=new ArrayList<>(); + for (YysGroupEntity entity : list) { + Map yysGroupMap=JsonUtil.entityToMap(entity); + yysGroupMap.put("id", yysGroupMap.get("id")); + //副表数据 + //子表数据 + realList.add(yysGroupMap); + } + //数据转换 + realList = generaterSwapUtil.swapDataList(realList, YysGroupConstant.getFormData(), YysGroupConstant.getColumnData(), yysGroupPagination.getModuleId(),false); + + //返回对象 + PageListVO vo = new PageListVO(); + vo.setList(realList); + PaginationVO page = JsonUtil.getJsonToBean(yysGroupPagination, PaginationVO.class); + vo.setPagination(page); + return ActionResult.success(vo); + } + /** + * 创建 + * + * @param yysGroupForm + * @return + */ + @PostMapping() + @Operation(summary = "创建") + public ActionResult create(@RequestBody @Valid YysGroupForm yysGroupForm) { + String b = yysGroupService.checkForm(yysGroupForm,0); + if (StringUtil.isNotEmpty(b)){ + return ActionResult.fail(b ); + } + try{ + yysGroupService.saveOrUpdate(yysGroupForm, null ,true); + }catch(Exception e){ + return ActionResult.fail("新增数据失败"); + } + return ActionResult.success("创建成功"); + } + /** + * 导出Excel + * + * @return + */ + @Operation(summary = "导出Excel") + @PostMapping("/Actions/Export") + public ActionResult Export(@RequestBody YysGroupPagination yysGroupPagination) throws IOException { + if (StringUtil.isEmpty(yysGroupPagination.getSelectKey())){ + return ActionResult.fail("请选择导出字段"); + } + List list= yysGroupService.getList(yysGroupPagination); + List> realList=new ArrayList<>(); + for (YysGroupEntity entity : list) { + Map yysGroupMap=JsonUtil.entityToMap(entity); + yysGroupMap.put("id", yysGroupMap.get("id")); + //副表数据 + //子表数据 + realList.add(yysGroupMap); + } + //数据转换 + realList = generaterSwapUtil.swapDataList(realList, YysGroupConstant.getFormData(), YysGroupConstant.getColumnData(), yysGroupPagination.getModuleId(),false); + String[]keys=!StringUtil.isEmpty(yysGroupPagination.getSelectKey())?yysGroupPagination.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>list,String[]keys,UserInfo userInfo){ + DownloadVO vo=DownloadVO.builder().build(); + List entitys=new ArrayList<>(); + if(keys.length>0){ + for(String key:keys){ + switch(key){ + case "groupName" : + entitys.add(new ExcelExportEntity("班组名称" ,"groupName")); + break; + case "groupType" : + entitys.add(new ExcelExportEntity("班组类型" ,"groupType")); + break; + case "leader" : + entitys.add(new ExcelExportEntity("组长" ,"leader")); + break; + case "member" : + entitys.add(new ExcelExportEntity("成员" ,"member")); + 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> dataList = new ArrayList<>(); + for (Map 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> childList = (List>) o; + for (Map 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(YysGroupConstant.getColumnData(), ColumnDataModel.class); + List 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 yysGroupForm + * @return + */ + @PutMapping("/{id}") + @Operation(summary = "更新") + public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid YysGroupForm yysGroupForm, + @RequestParam(value = "isImport", required = false) boolean isImport){ + yysGroupForm.setId(id); + if (!isImport) { + String b = yysGroupService.checkForm(yysGroupForm,1); + if (StringUtil.isNotEmpty(b)){ + return ActionResult.fail(b ); + } + } + YysGroupEntity entity= yysGroupService.getInfo(id); + if(entity!=null){ + try{ + yysGroupService.saveOrUpdate(yysGroupForm,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){ + YysGroupEntity entity= yysGroupService.getInfo(id); + if(entity!=null){ + //假删除 + entity.setDeleteMark(1); + yysGroupService.update(id,entity); + } + return ActionResult.success("删除成功"); + } + /** + * 表单信息(详情页) + * 详情页面使用-转换数据 + * @param id + * @return + */ + @Operation(summary = "表单信息(详情页)") + @GetMapping("/detail/{id}") + public ActionResult detailInfo(@PathVariable("id") String id){ + YysGroupEntity entity= yysGroupService.getInfo(id); + if(entity==null){ + return ActionResult.fail("表单数据不存在!"); + } + Map yysGroupMap=JsonUtil.entityToMap(entity); + yysGroupMap.put("id", yysGroupMap.get("id")); + //副表数据 + //子表数据 + yysGroupMap = generaterSwapUtil.swapDataDetail(yysGroupMap,YysGroupConstant.getFormData(),"590181470316795141",false); + return ActionResult.success(yysGroupMap); + } + /** + * 获取详情(编辑页) + * 编辑页面使用-不转换数据 + * @param id + * @return + */ + @Operation(summary = "信息") + @GetMapping("/{id}") + public ActionResult info(@PathVariable("id") String id){ + YysGroupEntity entity= yysGroupService.getInfo(id); + if(entity==null){ + return ActionResult.fail("表单数据不存在!"); + } + Map yysGroupMap=JsonUtil.entityToMap(entity); + yysGroupMap.put("id", yysGroupMap.get("id")); + //副表数据 + //子表数据 + yysGroupMap = generaterSwapUtil.swapDataForm(yysGroupMap,YysGroupConstant.getFormData(),YysGroupConstant.TABLEFIELDKEY,YysGroupConstant.TABLERENAMES); + return ActionResult.success(yysGroupMap); + } + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysCalendarEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysCalendarEntity.java new file mode 100644 index 0000000..5e4b94f --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysCalendarEntity.java @@ -0,0 +1,51 @@ +package jnpf.entity; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import java.util.Date; +/** + * + * + * @版本: V3.5 + * @版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) + * @作者: JNPF开发平台组 + * @日期: 2024-08-05 + */ +@Data +@TableName("yys_calendar") +public class YysCalendarEntity { + @TableId(value ="ID" ) + private String id; + @TableField(value = "YEARS" , updateStrategy = FieldStrategy.IGNORED) + private String years; + @TableField("DAY") + private String day; + @TableField("IS_HOLIDAY") + private String isHoliday; + @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_VERSION") + private Integer version; + @TableField("F_FLOW_ID") + private String flowId; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysGroupEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysGroupEntity.java new file mode 100644 index 0000000..d0b2ea8 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysGroupEntity.java @@ -0,0 +1,55 @@ +package jnpf.entity; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import java.util.Date; +/** + * + * + * @版本: V3.5 + * @版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) + * @作者: JNPF开发平台组 + * @日期: 2024-08-05 + */ +@Data +@TableName("yys_group") +public class YysGroupEntity { + @TableId(value ="ID" ) + private String id; + @TableField(value = "GROUP_NAME" , updateStrategy = FieldStrategy.IGNORED) + private String groupName; + @TableField(value = "GROUP_TYPE" , updateStrategy = FieldStrategy.IGNORED) + private String groupType; + @TableField(value = "LEADER" , updateStrategy = FieldStrategy.IGNORED) + private String leader; + @TableField(value = "MEMBER" , updateStrategy = FieldStrategy.IGNORED) + private String member; + @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_VERSION") + private Integer version; + @TableField("F_FLOW_ID") + private String flowId; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yyscalendar/YysCalendarConstant.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yyscalendar/YysCalendarConstant.java new file mode 100644 index 0000000..f562589 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yyscalendar/YysCalendarConstant.java @@ -0,0 +1,41 @@ +package jnpf.model.yyscalendar; + +import jnpf.util.JsonUtil; +import java.util.Map; + +/** + * yysCalendar配置json + * + * @版本: V3.5 + * @版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) + * @作者: JNPF开发平台组 + * @日期: 2024-08-05 + */ +public class YysCalendarConstant{ + /** 数据库链接 */ + public static final String DBLINKID = "0"; + /** 表别名 map */ + public static final Map TABLERENAMES = JsonUtil.getJsonToBean("{\"yys_calendar\":\"yysCalendar\"}",Map.class); + /** 子表model map */ + public static final Map TABLEFIELDKEY = JsonUtil.getJsonToBean("{}",Map.class); + /** 整个表单配置json */ + public static final String getFormData(){ + StringBuilder sb = new StringBuilder(); +sb.append("{\"popupType\":\"general\",\"idGlobal\":101,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":true,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":true,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":true,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":1722441600000,\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_calendar\",\"renderKey\":1722847742112,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"年月\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":24},\"readonly\":false,\"format\":\"yyyy-MM\",\"__vModel__\":\"years\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择年月\",\"type\":\"month\"}],\"span\":24}"); return sb.toString(); + } + /** 列表字段配置json */ + public static final String getColumnData(){ + StringBuilder sb = new StringBuilder(); +sb.append("{\"showSummary\":false,\"hasPage\":true,\"searchList\":[{\"clearable\":true,\"searchType\":3,\"jnpfKey\":\"datePicker\",\"format\":\"yyyy-MM\",\"fullName\":\"年月\",\"label\":\"年月\",\"type\":\"month\",\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":1722441600000,\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_calendar\",\"renderKey\":1722847742112,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"年月\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"years\",\"__vModel__\":\"years\",\"searchMultiple\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"years\",\"placeholder\":\"请选择年月\",\"value\":[]}],\"treeInterfaceId\":\"\",\"treePropsValue\":\"id\",\"ruleList\":{\"conditionList\":[],\"matchLogic\":\"and\"},\"childTableStyle\":1,\"columnOptions\":[{\"clearable\":true,\"format\":\"yyyy-MM\",\"fullName\":\"年月\",\"type\":\"month\",\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":1722441600000,\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_calendar\",\"renderKey\":1722847742112,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"年月\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":24},\"readonly\":false,\"__vModel__\":\"years\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"years\",\"placeholder\":\"请选择年月\"}],\"pageSize\":20,\"treePropsChildren\":\"children\",\"type\":1,\"columnBtnsList\":[{\"icon\":\"icon-ym icon-ym-btn-edit\",\"label\":\"编辑\",\"value\":\"edit\"},{\"icon\":\"icon-ym icon-ym-btn-clearn\",\"label\":\"删除\",\"value\":\"remove\"},{\"icon\":\"icon-ym icon-ym-generator-menu\",\"label\":\"详情\",\"value\":\"detail\"}],\"thousandsField\":[],\"treeTitle\":\"左侧标题\",\"defaultColumnList\":[{\"clearable\":true,\"jnpfKey\":\"datePicker\",\"format\":\"yyyy-MM\",\"fullName\":\"年月\",\"label\":\"年月\",\"sortable\":false,\"align\":\"left\",\"type\":\"month\",\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":1722441600000,\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_calendar\",\"renderKey\":1722847742112,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"年月\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"years\",\"__vModel__\":\"years\",\"checked\":true,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"years\",\"placeholder\":\"请选择年月\"}],\"treeTemplateJson\":[],\"treePropsName\":\"\",\"useColumnPermission\":false,\"treePropsUrl\":\"\",\"treeRelation\":\"\",\"treeSynType\":0,\"btnsList\":[{\"icon\":\"icon-ym icon-ym-btn-add\",\"label\":\"新增\",\"value\":\"add\"},{\"icon\":\"icon-ym icon-ym-btn-download\",\"label\":\"导出\",\"value\":\"download\"}],\"useDataPermission\":false,\"columnList\":[{\"clearable\":true,\"jnpfKey\":\"datePicker\",\"format\":\"yyyy-MM\",\"fullName\":\"年月\",\"label\":\"年月\",\"sortable\":false,\"align\":\"left\",\"type\":\"month\",\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":1722441600000,\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_calendar\",\"renderKey\":1722847742112,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"年月\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"years\",\"width\":0,\"__vModel__\":\"years\",\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"years\",\"placeholder\":\"请选择年月\"}],\"sort\":\"desc\",\"thousands\":false,\"hasSuperQuery\":true,\"summaryField\":[],\"parentField\":\"\",\"treePropsLabel\":\"fullName\",\"treeDataSource\":\"dictionary\",\"groupField\":\"\",\"printIds\":[],\"uploaderTemplateJson\":{},\"treeDictionary\":\"\",\"hasTreeQuery\":false,\"useFormPermission\":false,\"customBtnsList\":[],\"complexHeaderList\":[],\"useBtnPermission\":false,\"treeInterfaceName\":\"\",\"defaultSidx\":\"\"}"); return sb.toString(); + } + /** app列表字段配置json */ + public static final String getAppColumnData(){ + StringBuilder sb = new StringBuilder(); +sb.append("{\"hasPage\":true,\"useColumnPermission\":false,\"searchList\":[],\"btnsList\":[{\"icon\":\"icon-ym icon-ym-btn-add\",\"label\":\"新增\",\"value\":\"add\"}],\"useDataPermission\":false,\"ruleListApp\":{\"conditionList\":[],\"matchLogic\":\"and\"},\"columnList\":[{\"clearable\":true,\"jnpfKey\":\"datePicker\",\"format\":\"yyyy-MM\",\"fullName\":\"年月\",\"label\":\"年月\",\"sortable\":false,\"align\":\"left\",\"type\":\"month\",\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":1722441600000,\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_calendar\",\"renderKey\":1722847742112,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"年月\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"years\",\"width\":0,\"__vModel__\":\"years\",\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"years\",\"placeholder\":\"请选择年月\"}],\"columnOptions\":[{\"clearable\":true,\"format\":\"yyyy-MM\",\"fullName\":\"年月\",\"type\":\"month\",\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":1722441600000,\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_calendar\",\"renderKey\":1722847742112,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"年月\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":24},\"readonly\":false,\"__vModel__\":\"years\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择年月\",\"id\":\"years\"}],\"pageSize\":20,\"sort\":\"desc\",\"thousands\":false,\"columnBtnsList\":[{\"icon\":\"icon-ym icon-ym-btn-edit\",\"label\":\"编辑\",\"value\":\"edit\"},{\"icon\":\"icon-ym icon-ym-btn-clearn\",\"label\":\"删除\",\"value\":\"remove\"},{\"icon\":\"icon-ym icon-ym-generator-menu\",\"label\":\"详情\",\"value\":\"detail\"}],\"loading\":false,\"hasSuperQuery\":false,\"thousandsField\":[],\"defaultColumnList\":[{\"clearable\":true,\"jnpfKey\":\"datePicker\",\"format\":\"yyyy-MM\",\"fullName\":\"年月\",\"label\":\"年月\",\"sortable\":false,\"align\":\"left\",\"type\":\"month\",\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":1722441600000,\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_calendar\",\"renderKey\":1722847742112,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"年月\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"years\",\"__vModel__\":\"years\",\"checked\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择年月\",\"id\":\"years\"}],\"sortList\":[],\"useFormPermission\":false,\"customBtnsList\":[],\"useBtnPermission\":false,\"defaultSidx\":\"\"}"); return sb.toString(); + } + /** 表列表 */ + public static final String getTableList(){ + StringBuilder sb = new StringBuilder(); +sb.append("[{\"relationField\":\"\",\"relationTable\":\"\",\"table\":\"yys_calendar\",\"tableName\":\"\",\"tableField\":\"\",\"typeId\":\"1\",\"fields\":[{\"columnName\":\"id\",\"field\":\"id\",\"fieldName\":\"主键\",\"dataType\":\"varchar\",\"dataLength\":\"20\",\"primaryKey\":1,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"years\",\"field\":\"years\",\"fieldName\":\"年月\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"day\",\"field\":\"day\",\"fieldName\":\"日期\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"is_holiday\",\"field\":\"isHoliday\",\"fieldName\":\"是否节假日(1:是 2:否)\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_time\",\"field\":\"creatorTime\",\"fieldName\":\"创建时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_user_id\",\"field\":\"creatorUserId\",\"fieldName\":\"创建用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_time\",\"field\":\"lastModifyTime\",\"fieldName\":\"修改时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_user_id\",\"field\":\"lastModifyUserId\",\"fieldName\":\"修改用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_time\",\"field\":\"deleteTime\",\"fieldName\":\"删除时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_user_id\",\"field\":\"deleteUserId\",\"fieldName\":\"删除用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_mark\",\"field\":\"deleteMark\",\"fieldName\":\"删除标志\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_tenant_id\",\"field\":\"tenantId\",\"fieldName\":\"租户id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"company_id\",\"field\":\"companyId\",\"fieldName\":\"公司id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"department_id\",\"field\":\"departmentId\",\"fieldName\":\"部门id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"organize_json_id\",\"field\":\"organizeJsonId\",\"fieldName\":\"\",\"dataType\":\"varchar\",\"dataLength\":\"1000\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0}]}]"); return sb.toString(); + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yyscalendar/YysCalendarForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yyscalendar/YysCalendarForm.java new file mode 100644 index 0000000..56993c4 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yyscalendar/YysCalendarForm.java @@ -0,0 +1,37 @@ +package jnpf.model.yyscalendar; + +import lombok.Data; + +import java.util.List; +import java.math.BigDecimal; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * yysCalendar + * + * @版本: V3.5 + * @版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) + * @作者: JNPF开发平台组 + * @日期: 2024-08-05 + */ +@Data +public class YysCalendarForm { + /** + * 主键 + */ + private String id; + /** + * 乐观锁 + **/ + @JsonProperty("version") + private Integer version; + + /** + * 年月 + **/ + @JsonProperty("years") + private String years; + + private String isHoliday; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yyscalendar/YysCalendarPagination.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yyscalendar/YysCalendarPagination.java new file mode 100644 index 0000000..64499a6 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yyscalendar/YysCalendarPagination.java @@ -0,0 +1,33 @@ +package jnpf.model.yyscalendar; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import jnpf.base.Pagination; +import java.util.List; + +/** + * + * yysCalendar + * @版本: V3.5 + * @版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) + * @作者: JNPF开发平台组 + * @日期: 2024-08-05 + */ +@Data +public class YysCalendarPagination 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("years") + private Object years; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysgroup/YysGroupConstant.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysgroup/YysGroupConstant.java new file mode 100644 index 0000000..3830240 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysgroup/YysGroupConstant.java @@ -0,0 +1,41 @@ +package jnpf.model.yysgroup; + +import jnpf.util.JsonUtil; +import java.util.Map; + +/** + * yysGroup配置json + * + * @版本: V3.5 + * @版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) + * @作者: JNPF开发平台组 + * @日期: 2024-08-05 + */ +public class YysGroupConstant{ + /** 数据库链接 */ + public static final String DBLINKID = "0"; + /** 表别名 map */ + public static final Map TABLERENAMES = JsonUtil.getJsonToBean("{\"yys_group\":\"yysGroup\"}",Map.class); + /** 子表model map */ + public static final Map TABLEFIELDKEY = JsonUtil.getJsonToBean("{}",Map.class); + /** 整个表单配置json */ + public static final String getFormData(){ + StringBuilder sb = new StringBuilder(); +sb.append("{\"popupType\":\"general\",\"idGlobal\":105,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":true,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":true,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":true,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班组名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846415741,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"groupName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入班组名称\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班组类型\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846446702,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":24},\"options\":[{\"fullName\":\"生产线\",\"id\":\"1\"},{\"fullName\":\"包装线\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"groupType\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择班组类型\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}},{\"clearable\":true,\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"userSelect\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"组长\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"relationField\":\"\",\"tableName\":\"yys_group\",\"renderKey\":1722846480279,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-user\",\"defaultCurrent\":false,\"tag\":\"JnpfUserSelect\",\"regList\":[],\"span\":24},\"ableIds\":[],\"multiple\":false,\"__vModel__\":\"leader\",\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"placeholder\":\"请选择组长\",\"relationField\":\"\"},{\"clearable\":true,\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"userSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"成员\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"relationField\":\"\",\"tableName\":\"yys_group\",\"renderKey\":1722846506336,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-user\",\"defaultCurrent\":false,\"tag\":\"JnpfUserSelect\",\"regList\":[],\"span\":24},\"ableIds\":[],\"multiple\":false,\"__vModel__\":\"member\",\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"placeholder\":\"请选择成员\",\"relationField\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"启用状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846553507,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":24},\"options\":[{\"fullName\":\"启用\",\"id\":\"1\"},{\"fullName\":\"未启用\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"enabledStatus\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择启用状态\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}}],\"span\":24}"); return sb.toString(); + } + /** 列表字段配置json */ + public static final String getColumnData(){ + StringBuilder sb = new StringBuilder(); +sb.append("{\"showSummary\":false,\"hasPage\":true,\"searchList\":[{\"clearable\":true,\"searchType\":2,\"jnpfKey\":\"input\",\"suffixIcon\":\"\",\"fullName\":\"班组名称\",\"label\":\"班组名称\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班组名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846415741,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"groupName\",\"showWordLimit\":false,\"__vModel__\":\"groupName\",\"searchMultiple\":false,\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"groupName\",\"placeholder\":\"请输入班组名称\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"searchType\":1,\"jnpfKey\":\"select\",\"multiple\":false,\"fullName\":\"启用状态\",\"label\":\"启用状态\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"},\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"启用状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846553507,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":24},\"prop\":\"enabledStatus\",\"options\":[{\"fullName\":\"启用\",\"id\":\"1\"},{\"fullName\":\"未启用\",\"id\":\"2\"}],\"__vModel__\":\"enabledStatus\",\"searchMultiple\":true,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"id\":\"enabledStatus\",\"placeholder\":\"请选择启用状态\",\"value\":[]}],\"treeInterfaceId\":\"\",\"treePropsValue\":\"id\",\"ruleList\":{\"conditionList\":[],\"matchLogic\":\"and\"},\"childTableStyle\":1,\"columnOptions\":[{\"clearable\":true,\"suffixIcon\":\"\",\"fullName\":\"班组名称\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班组名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846415741,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"groupName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"groupName\",\"placeholder\":\"请输入班组名称\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"multiple\":false,\"fullName\":\"班组类型\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"},\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班组类型\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846446702,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":24},\"options\":[{\"fullName\":\"生产线\",\"id\":\"1\"},{\"fullName\":\"包装线\",\"id\":\"2\"}],\"__vModel__\":\"groupType\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"id\":\"groupType\",\"placeholder\":\"请选择班组类型\"},{\"clearable\":true,\"ableIds\":[],\"multiple\":false,\"fullName\":\"组长\",\"relationField\":\"\",\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"userSelect\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"组长\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"relationField\":\"\",\"tableName\":\"yys_group\",\"renderKey\":1722846480279,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-user\",\"defaultCurrent\":false,\"tag\":\"JnpfUserSelect\",\"regList\":[],\"span\":24},\"__vModel__\":\"leader\",\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"id\":\"leader\",\"placeholder\":\"请选择组长\"},{\"clearable\":true,\"ableIds\":[],\"multiple\":false,\"fullName\":\"成员\",\"relationField\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"userSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"成员\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"relationField\":\"\",\"tableName\":\"yys_group\",\"renderKey\":1722846506336,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-user\",\"defaultCurrent\":false,\"tag\":\"JnpfUserSelect\",\"regList\":[],\"span\":24},\"__vModel__\":\"member\",\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"id\":\"member\",\"placeholder\":\"请选择成员\"},{\"filterable\":false,\"clearable\":true,\"multiple\":false,\"fullName\":\"启用状态\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"},\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"启用状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846553507,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":24},\"options\":[{\"fullName\":\"启用\",\"id\":\"1\"},{\"fullName\":\"未启用\",\"id\":\"2\"}],\"__vModel__\":\"enabledStatus\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"id\":\"enabledStatus\",\"placeholder\":\"请选择启用状态\"}],\"pageSize\":20,\"treePropsChildren\":\"children\",\"type\":1,\"columnBtnsList\":[{\"icon\":\"icon-ym icon-ym-btn-edit\",\"label\":\"编辑\",\"value\":\"edit\"},{\"icon\":\"icon-ym icon-ym-btn-clearn\",\"label\":\"删除\",\"value\":\"remove\"},{\"icon\":\"icon-ym icon-ym-generator-menu\",\"label\":\"详情\",\"value\":\"detail\"}],\"thousandsField\":[],\"treeTitle\":\"左侧标题\",\"defaultColumnList\":[{\"suffixIcon\":\"\",\"align\":\"left\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班组名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846415741,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"groupName\",\"showWordLimit\":false,\"__vModel__\":\"groupName\",\"checked\":true,\"disabled\":false,\"id\":\"groupName\",\"placeholder\":\"请输入班组名称\",\"addonBefore\":\"\",\"clearable\":true,\"jnpfKey\":\"input\",\"fullName\":\"班组名称\",\"label\":\"班组名称\",\"sortable\":false,\"addonAfter\":\"\",\"showPassword\":false,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"prefixIcon\":\"\"},{\"filterable\":false,\"clearable\":true,\"jnpfKey\":\"select\",\"multiple\":false,\"fullName\":\"班组类型\",\"label\":\"班组类型\",\"sortable\":false,\"align\":\"left\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"},\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班组类型\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846446702,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":24},\"prop\":\"groupType\",\"options\":[{\"fullName\":\"生产线\",\"id\":\"1\"},{\"fullName\":\"包装线\",\"id\":\"2\"}],\"__vModel__\":\"groupType\",\"checked\":true,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"id\":\"groupType\",\"placeholder\":\"请选择班组类型\"},{\"clearable\":true,\"jnpfKey\":\"userSelect\",\"ableIds\":[],\"multiple\":false,\"fullName\":\"组长\",\"label\":\"组长\",\"sortable\":false,\"align\":\"left\",\"relationField\":\"\",\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"userSelect\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"组长\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"relationField\":\"\",\"tableName\":\"yys_group\",\"renderKey\":1722846480279,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-user\",\"defaultCurrent\":false,\"tag\":\"JnpfUserSelect\",\"regList\":[],\"span\":24},\"prop\":\"leader\",\"__vModel__\":\"leader\",\"checked\":true,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"id\":\"leader\",\"placeholder\":\"请选择组长\"},{\"clearable\":true,\"jnpfKey\":\"userSelect\",\"ableIds\":[],\"multiple\":false,\"fullName\":\"成员\",\"label\":\"成员\",\"sortable\":false,\"align\":\"left\",\"relationField\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"userSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"成员\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"relationField\":\"\",\"tableName\":\"yys_group\",\"renderKey\":1722846506336,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-user\",\"defaultCurrent\":false,\"tag\":\"JnpfUserSelect\",\"regList\":[],\"span\":24},\"prop\":\"member\",\"__vModel__\":\"member\",\"checked\":true,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"id\":\"member\",\"placeholder\":\"请选择成员\"},{\"filterable\":false,\"clearable\":true,\"jnpfKey\":\"select\",\"multiple\":false,\"fullName\":\"启用状态\",\"label\":\"启用状态\",\"sortable\":false,\"align\":\"left\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"},\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"启用状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846553507,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":24},\"prop\":\"enabledStatus\",\"options\":[{\"fullName\":\"启用\",\"id\":\"1\"},{\"fullName\":\"未启用\",\"id\":\"2\"}],\"__vModel__\":\"enabledStatus\",\"checked\":true,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"id\":\"enabledStatus\",\"placeholder\":\"请选择启用状态\"}],\"treeTemplateJson\":[],\"treePropsName\":\"\",\"useColumnPermission\":false,\"treePropsUrl\":\"\",\"treeRelation\":\"\",\"treeSynType\":0,\"btnsList\":[{\"icon\":\"icon-ym icon-ym-btn-add\",\"label\":\"新增\",\"value\":\"add\"},{\"icon\":\"icon-ym icon-ym-btn-download\",\"label\":\"导出\",\"value\":\"download\"}],\"useDataPermission\":false,\"columnList\":[{\"clearable\":true,\"jnpfKey\":\"input\",\"suffixIcon\":\"\",\"fullName\":\"班组名称\",\"label\":\"班组名称\",\"sortable\":false,\"align\":\"left\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班组名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846415741,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"groupName\",\"showWordLimit\":false,\"width\":0,\"__vModel__\":\"groupName\",\"showPassword\":false,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"groupName\",\"placeholder\":\"请输入班组名称\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"jnpfKey\":\"select\",\"multiple\":false,\"fullName\":\"班组类型\",\"label\":\"班组类型\",\"sortable\":false,\"align\":\"left\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"},\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班组类型\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846446702,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":24},\"prop\":\"groupType\",\"width\":0,\"options\":[{\"fullName\":\"生产线\",\"id\":\"1\"},{\"fullName\":\"包装线\",\"id\":\"2\"}],\"__vModel__\":\"groupType\",\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"id\":\"groupType\",\"placeholder\":\"请选择班组类型\"},{\"clearable\":true,\"jnpfKey\":\"userSelect\",\"ableIds\":[],\"multiple\":false,\"fullName\":\"组长\",\"label\":\"组长\",\"sortable\":false,\"align\":\"left\",\"relationField\":\"\",\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"userSelect\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"组长\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"relationField\":\"\",\"tableName\":\"yys_group\",\"renderKey\":1722846480279,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-user\",\"defaultCurrent\":false,\"tag\":\"JnpfUserSelect\",\"regList\":[],\"span\":24},\"prop\":\"leader\",\"width\":0,\"__vModel__\":\"leader\",\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"id\":\"leader\",\"placeholder\":\"请选择组长\"},{\"clearable\":true,\"jnpfKey\":\"userSelect\",\"ableIds\":[],\"multiple\":false,\"fullName\":\"成员\",\"label\":\"成员\",\"sortable\":false,\"align\":\"left\",\"relationField\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"userSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"成员\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"relationField\":\"\",\"tableName\":\"yys_group\",\"renderKey\":1722846506336,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-user\",\"defaultCurrent\":false,\"tag\":\"JnpfUserSelect\",\"regList\":[],\"span\":24},\"prop\":\"member\",\"width\":0,\"__vModel__\":\"member\",\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"id\":\"member\",\"placeholder\":\"请选择成员\"},{\"filterable\":false,\"clearable\":true,\"jnpfKey\":\"select\",\"multiple\":false,\"fullName\":\"启用状态\",\"label\":\"启用状态\",\"sortable\":false,\"align\":\"left\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"},\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"启用状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846553507,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":24},\"prop\":\"enabledStatus\",\"width\":0,\"options\":[{\"fullName\":\"启用\",\"id\":\"1\"},{\"fullName\":\"未启用\",\"id\":\"2\"}],\"__vModel__\":\"enabledStatus\",\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"id\":\"enabledStatus\",\"placeholder\":\"请选择启用状态\"}],\"sort\":\"desc\",\"thousands\":false,\"hasSuperQuery\":true,\"summaryField\":[],\"parentField\":\"\",\"treePropsLabel\":\"fullName\",\"treeDataSource\":\"dictionary\",\"groupField\":\"\",\"printIds\":[],\"uploaderTemplateJson\":{},\"treeDictionary\":\"\",\"hasTreeQuery\":false,\"useFormPermission\":false,\"customBtnsList\":[],\"complexHeaderList\":[],\"useBtnPermission\":false,\"treeInterfaceName\":\"\",\"defaultSidx\":\"\"}"); return sb.toString(); + } + /** app列表字段配置json */ + public static final String getAppColumnData(){ + StringBuilder sb = new StringBuilder(); +sb.append("{\"hasPage\":true,\"useColumnPermission\":false,\"searchList\":[],\"btnsList\":[{\"icon\":\"icon-ym icon-ym-btn-add\",\"label\":\"新增\",\"value\":\"add\"}],\"useDataPermission\":false,\"ruleListApp\":{\"conditionList\":[],\"matchLogic\":\"and\"},\"columnList\":[{\"clearable\":true,\"jnpfKey\":\"input\",\"suffixIcon\":\"\",\"fullName\":\"班组名称\",\"label\":\"班组名称\",\"sortable\":false,\"align\":\"left\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班组名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846415741,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"groupName\",\"showWordLimit\":false,\"width\":0,\"__vModel__\":\"groupName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"fixed\":\"none\",\"placeholder\":\"请输入班组名称\",\"id\":\"groupName\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"jnpfKey\":\"select\",\"multiple\":false,\"fullName\":\"班组类型\",\"label\":\"班组类型\",\"sortable\":false,\"align\":\"left\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"},\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班组类型\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846446702,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":24},\"prop\":\"groupType\",\"width\":0,\"options\":[{\"fullName\":\"生产线\",\"id\":\"1\"},{\"fullName\":\"包装线\",\"id\":\"2\"}],\"__vModel__\":\"groupType\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"fixed\":\"none\",\"placeholder\":\"请选择班组类型\",\"id\":\"groupType\"},{\"clearable\":true,\"jnpfKey\":\"userSelect\",\"ableIds\":[],\"multiple\":false,\"fullName\":\"组长\",\"label\":\"组长\",\"sortable\":false,\"align\":\"left\",\"relationField\":\"\",\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"userSelect\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"组长\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"relationField\":\"\",\"tableName\":\"yys_group\",\"renderKey\":1722846480279,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-user\",\"defaultCurrent\":false,\"tag\":\"JnpfUserSelect\",\"regList\":[],\"span\":24},\"prop\":\"leader\",\"width\":0,\"__vModel__\":\"leader\",\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"fixed\":\"none\",\"placeholder\":\"请选择组长\",\"id\":\"leader\"},{\"clearable\":true,\"jnpfKey\":\"userSelect\",\"ableIds\":[],\"multiple\":false,\"fullName\":\"成员\",\"label\":\"成员\",\"sortable\":false,\"align\":\"left\",\"relationField\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"userSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"成员\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"relationField\":\"\",\"tableName\":\"yys_group\",\"renderKey\":1722846506336,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-user\",\"defaultCurrent\":false,\"tag\":\"JnpfUserSelect\",\"regList\":[],\"span\":24},\"prop\":\"member\",\"width\":0,\"__vModel__\":\"member\",\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"fixed\":\"none\",\"placeholder\":\"请选择成员\",\"id\":\"member\"},{\"filterable\":false,\"clearable\":true,\"jnpfKey\":\"select\",\"multiple\":false,\"fullName\":\"启用状态\",\"label\":\"启用状态\",\"sortable\":false,\"align\":\"left\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"},\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"启用状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846553507,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":24},\"prop\":\"enabledStatus\",\"width\":0,\"options\":[{\"fullName\":\"启用\",\"id\":\"1\"},{\"fullName\":\"未启用\",\"id\":\"2\"}],\"__vModel__\":\"enabledStatus\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"fixed\":\"none\",\"placeholder\":\"请选择启用状态\",\"id\":\"enabledStatus\"}],\"columnOptions\":[{\"clearable\":true,\"suffixIcon\":\"\",\"fullName\":\"班组名称\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班组名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846415741,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"groupName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入班组名称\",\"id\":\"groupName\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"multiple\":false,\"fullName\":\"班组类型\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"},\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班组类型\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846446702,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":24},\"options\":[{\"fullName\":\"生产线\",\"id\":\"1\"},{\"fullName\":\"包装线\",\"id\":\"2\"}],\"__vModel__\":\"groupType\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择班组类型\",\"id\":\"groupType\"},{\"clearable\":true,\"ableIds\":[],\"multiple\":false,\"fullName\":\"组长\",\"relationField\":\"\",\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"userSelect\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"组长\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"relationField\":\"\",\"tableName\":\"yys_group\",\"renderKey\":1722846480279,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-user\",\"defaultCurrent\":false,\"tag\":\"JnpfUserSelect\",\"regList\":[],\"span\":24},\"__vModel__\":\"leader\",\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"placeholder\":\"请选择组长\",\"id\":\"leader\"},{\"clearable\":true,\"ableIds\":[],\"multiple\":false,\"fullName\":\"成员\",\"relationField\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"userSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"成员\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"relationField\":\"\",\"tableName\":\"yys_group\",\"renderKey\":1722846506336,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-user\",\"defaultCurrent\":false,\"tag\":\"JnpfUserSelect\",\"regList\":[],\"span\":24},\"__vModel__\":\"member\",\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"placeholder\":\"请选择成员\",\"id\":\"member\"},{\"filterable\":false,\"clearable\":true,\"multiple\":false,\"fullName\":\"启用状态\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"},\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"启用状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846553507,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":24},\"options\":[{\"fullName\":\"启用\",\"id\":\"1\"},{\"fullName\":\"未启用\",\"id\":\"2\"}],\"__vModel__\":\"enabledStatus\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择启用状态\",\"id\":\"enabledStatus\"}],\"pageSize\":20,\"sort\":\"desc\",\"thousands\":false,\"columnBtnsList\":[{\"icon\":\"icon-ym icon-ym-btn-edit\",\"label\":\"编辑\",\"value\":\"edit\"},{\"icon\":\"icon-ym icon-ym-btn-clearn\",\"label\":\"删除\",\"value\":\"remove\"},{\"icon\":\"icon-ym icon-ym-generator-menu\",\"label\":\"详情\",\"value\":\"detail\"}],\"loading\":false,\"hasSuperQuery\":false,\"thousandsField\":[],\"defaultColumnList\":[{\"clearable\":true,\"jnpfKey\":\"input\",\"suffixIcon\":\"\",\"fullName\":\"班组名称\",\"label\":\"班组名称\",\"sortable\":false,\"align\":\"left\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班组名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846415741,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"groupName\",\"showWordLimit\":false,\"__vModel__\":\"groupName\",\"showPassword\":false,\"checked\":true,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入班组名称\",\"id\":\"groupName\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"jnpfKey\":\"select\",\"multiple\":false,\"fullName\":\"班组类型\",\"label\":\"班组类型\",\"sortable\":false,\"align\":\"left\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"},\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班组类型\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846446702,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":24},\"prop\":\"groupType\",\"options\":[{\"fullName\":\"生产线\",\"id\":\"1\"},{\"fullName\":\"包装线\",\"id\":\"2\"}],\"__vModel__\":\"groupType\",\"checked\":true,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择班组类型\",\"id\":\"groupType\"},{\"clearable\":true,\"jnpfKey\":\"userSelect\",\"ableIds\":[],\"multiple\":false,\"fullName\":\"组长\",\"label\":\"组长\",\"sortable\":false,\"align\":\"left\",\"relationField\":\"\",\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"userSelect\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"组长\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"relationField\":\"\",\"tableName\":\"yys_group\",\"renderKey\":1722846480279,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-user\",\"defaultCurrent\":false,\"tag\":\"JnpfUserSelect\",\"regList\":[],\"span\":24},\"prop\":\"leader\",\"__vModel__\":\"leader\",\"checked\":true,\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"placeholder\":\"请选择组长\",\"id\":\"leader\"},{\"clearable\":true,\"jnpfKey\":\"userSelect\",\"ableIds\":[],\"multiple\":false,\"fullName\":\"成员\",\"label\":\"成员\",\"sortable\":false,\"align\":\"left\",\"relationField\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"userSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"成员\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"relationField\":\"\",\"tableName\":\"yys_group\",\"renderKey\":1722846506336,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-user\",\"defaultCurrent\":false,\"tag\":\"JnpfUserSelect\",\"regList\":[],\"span\":24},\"prop\":\"member\",\"__vModel__\":\"member\",\"checked\":true,\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"placeholder\":\"请选择成员\",\"id\":\"member\"},{\"filterable\":false,\"clearable\":true,\"jnpfKey\":\"select\",\"multiple\":false,\"fullName\":\"启用状态\",\"label\":\"启用状态\",\"sortable\":false,\"align\":\"left\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"},\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"启用状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_group\",\"renderKey\":1722846553507,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":24},\"prop\":\"enabledStatus\",\"options\":[{\"fullName\":\"启用\",\"id\":\"1\"},{\"fullName\":\"未启用\",\"id\":\"2\"}],\"__vModel__\":\"enabledStatus\",\"checked\":true,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择启用状态\",\"id\":\"enabledStatus\"}],\"sortList\":[],\"useFormPermission\":false,\"customBtnsList\":[],\"useBtnPermission\":false,\"defaultSidx\":\"\"}"); return sb.toString(); + } + /** 表列表 */ + public static final String getTableList(){ + StringBuilder sb = new StringBuilder(); +sb.append("[{\"relationField\":\"\",\"relationTable\":\"\",\"table\":\"yys_group\",\"tableName\":\"\",\"tableField\":\"\",\"typeId\":\"1\",\"fields\":[{\"columnName\":\"id\",\"field\":\"id\",\"fieldName\":\"主键\",\"dataType\":\"varchar\",\"dataLength\":\"20\",\"primaryKey\":1,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"group_name\",\"field\":\"groupName\",\"fieldName\":\"班组名称\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"group_type\",\"field\":\"groupType\",\"fieldName\":\"班组类型(1:生产线,2:包装线,3:其它)\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"leader\",\"field\":\"leader\",\"fieldName\":\"组长\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"member\",\"field\":\"member\",\"fieldName\":\"成员\",\"dataType\":\"varchar\",\"dataLength\":\"500\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"enabled_status\",\"field\":\"enabledStatus\",\"fieldName\":\"启用状态(1:启用2:未启用)\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"f_creator_time\",\"field\":\"creatorTime\",\"fieldName\":\"创建时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_user_id\",\"field\":\"creatorUserId\",\"fieldName\":\"创建用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_time\",\"field\":\"lastModifyTime\",\"fieldName\":\"修改时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_user_id\",\"field\":\"lastModifyUserId\",\"fieldName\":\"修改用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_time\",\"field\":\"deleteTime\",\"fieldName\":\"删除时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_user_id\",\"field\":\"deleteUserId\",\"fieldName\":\"删除用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_mark\",\"field\":\"deleteMark\",\"fieldName\":\"删除标志\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_tenant_id\",\"field\":\"tenantId\",\"fieldName\":\"租户id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"company_id\",\"field\":\"companyId\",\"fieldName\":\"公司id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"department_id\",\"field\":\"departmentId\",\"fieldName\":\"部门id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"organize_json_id\",\"field\":\"organizeJsonId\",\"fieldName\":\"\",\"dataType\":\"varchar\",\"dataLength\":\"1000\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_version\",\"field\":\"version\",\"fieldName\":\"乐观锁\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_flow_id\",\"field\":\"flowId\",\"fieldName\":\"流程id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0}]}]"); return sb.toString(); + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysgroup/YysGroupForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysgroup/YysGroupForm.java new file mode 100644 index 0000000..c7ce4cd --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysgroup/YysGroupForm.java @@ -0,0 +1,38 @@ +package jnpf.model.yysgroup; + +import lombok.Data; +import java.util.List; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * yysGroup + * @版本: V3.5 + * @版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) + * @作者: JNPF开发平台组 + * @日期: 2024-08-05 + */ +@Data +public class YysGroupForm { + /** 主键 */ + private String id; + /** 乐观锁 **/ + @JsonProperty("version") + private Integer version; + + /** 班组名称 **/ + @JsonProperty("groupName") + private String groupName; + /** 班组类型 **/ + @JsonProperty("groupType") + private Object groupType; + /** 组长 **/ + @JsonProperty("leader") + private Object leader; + /** 成员 **/ + @JsonProperty("member") + private Object member; + /** 启用状态 **/ + @JsonProperty("enabledStatus") + private Object enabledStatus; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysgroup/YysGroupPagination.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysgroup/YysGroupPagination.java new file mode 100644 index 0000000..72ebd03 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysgroup/YysGroupPagination.java @@ -0,0 +1,36 @@ +package jnpf.model.yysgroup; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import jnpf.base.Pagination; +import java.util.List; + +/** + * + * yysGroup + * @版本: V3.5 + * @版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) + * @作者: JNPF开发平台组 + * @日期: 2024-08-05 + */ +@Data +public class YysGroupPagination 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("groupName") + private Object groupName; + /** 启用状态 */ + @JsonProperty("enabledStatus") + private Object enabledStatus; +} diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yyscalendar/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yyscalendar/Detail.vue new file mode 100644 index 0000000..3239ff6 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yyscalendar/Detail.vue @@ -0,0 +1,91 @@ + + diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yyscalendar/columnList.js b/jnpf-java-boot/jnpf-web/src/views/yys/yyscalendar/columnList.js new file mode 100644 index 0000000..aff171b --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yyscalendar/columnList.js @@ -0,0 +1,2 @@ +const columnList = [{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM","fullName":"年月","label":"年月","sortable":false,"align":"left","type":"month","__config__":{"endRelationField":"","defaultValue":1722441600000,"dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"yys_calendar","renderKey":1722847742112,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":101,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"年月","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":24},"readonly":false,"prop":"years","width":0,"__vModel__":"years","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"years","placeholder":"请选择年月","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] +export default columnList \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yyscalendar/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yyscalendar/form.vue new file mode 100644 index 0000000..76c138c --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yyscalendar/form.vue @@ -0,0 +1,402 @@ + + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yyscalendar/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yyscalendar/index.vue new file mode 100644 index 0000000..d6bee93 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yyscalendar/index.vue @@ -0,0 +1,447 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yyscalendar/superQueryJson.js b/jnpf-java-boot/jnpf-web/src/views/yys/yyscalendar/superQueryJson.js new file mode 100644 index 0000000..970710c --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yyscalendar/superQueryJson.js @@ -0,0 +1,2 @@ +const superQueryJson = [{"clearable":true,"format":"yyyy-MM","fullName":"年月","type":"month","__config__":{"endRelationField":"","defaultValue":1722441600000,"dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"yys_calendar","renderKey":1722847742112,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":101,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"年月","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":24},"readonly":false,"__vModel__":"years","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"years","placeholder":"请选择年月","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] +export default superQueryJson \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysclasses/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysclasses/index.vue index d772f7b..d8a9d95 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysclasses/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysclasses/index.vue @@ -44,18 +44,18 @@ - + - + - + - + - + diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysdevice/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysdevice/form.vue index 15b765b..ac980d4 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysdevice/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysdevice/form.vue @@ -1,108 +1,100 @@ - - - - diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysdevice/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysdevice/index.vue index 579064b..c22debe 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysdevice/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysdevice/index.vue @@ -1,28 +1,20 @@ - - - - - - - diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysgroup/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysgroup/Detail.vue new file mode 100644 index 0000000..3df3b52 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysgroup/Detail.vue @@ -0,0 +1,123 @@ + + diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysgroup/columnList.js b/jnpf-java-boot/jnpf-web/src/views/yys/yysgroup/columnList.js new file mode 100644 index 0000000..ae2e68f --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysgroup/columnList.js @@ -0,0 +1,2 @@ +const columnList = [{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"班组名称","label":"班组名称","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"班组名称","trigger":"blur","showLabel":true,"required":true,"tableName":"yys_group","renderKey":1722846415741,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"prop":"groupName","showWordLimit":false,"width":0,"__vModel__":"groupName","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"groupName","placeholder":"请输入班组名称","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"班组类型","label":"班组类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"班组类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"yys_group","renderKey":1722846446702,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"prop":"groupType","width":0,"options":[{"fullName":"生产线","id":"1"},{"fullName":"包装线","id":"2"}],"__vModel__":"groupType","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"groupType","placeholder":"请选择班组类型","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"jnpfKey":"userSelect","ableIds":[],"multiple":false,"fullName":"组长","label":"组长","sortable":false,"align":"left","relationField":"","__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"userSelect","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"组长","trigger":"change","showLabel":true,"required":true,"relationField":"","tableName":"yys_group","renderKey":1722846480279,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-user","defaultCurrent":false,"tag":"JnpfUserSelect","regList":[],"span":24},"prop":"leader","width":0,"__vModel__":"leader","fixed":"none","style":{"width":"100%"},"selectType":"all","disabled":false,"id":"leader","placeholder":"请选择组长","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"jnpfKey":"userSelect","ableIds":[],"multiple":false,"fullName":"成员","label":"成员","sortable":false,"align":"left","relationField":"","__config__":{"formId":104,"visibility":["pc","app"],"jnpfKey":"userSelect","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"成员","trigger":"change","showLabel":true,"required":true,"relationField":"","tableName":"yys_group","renderKey":1722846506336,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-user","defaultCurrent":false,"tag":"JnpfUserSelect","regList":[],"span":24},"prop":"member","width":0,"__vModel__":"member","fixed":"none","style":{"width":"100%"},"selectType":"all","disabled":false,"id":"member","placeholder":"请选择成员","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"启用状态","label":"启用状态","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":105,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"1","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"启用状态","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"yys_group","renderKey":1722846553507,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"prop":"enabledStatus","width":0,"options":[{"fullName":"启用","id":"1"},{"fullName":"未启用","id":"2"}],"__vModel__":"enabledStatus","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"enabledStatus","placeholder":"请选择启用状态","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] +export default columnList diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysgroup/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysgroup/form.vue new file mode 100644 index 0000000..9b2ee7a --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysgroup/form.vue @@ -0,0 +1,464 @@ + + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysgroup/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysgroup/index.vue new file mode 100644 index 0000000..889c75d --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysgroup/index.vue @@ -0,0 +1,456 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysgroup/superQueryJson.js b/jnpf-java-boot/jnpf-web/src/views/yys/yysgroup/superQueryJson.js new file mode 100644 index 0000000..f82e8b9 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysgroup/superQueryJson.js @@ -0,0 +1,2 @@ +const superQueryJson = [{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"班组名称","addonAfter":"","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"班组名称","trigger":"blur","showLabel":true,"required":true,"tableName":"yys_group","renderKey":1722846415741,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"groupName","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"groupName","placeholder":"请输入班组名称","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"multiple":false,"fullName":"班组类型","props":{"label":"fullName","value":"id"},"__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"班组类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"yys_group","renderKey":1722846446702,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"options":[{"fullName":"生产线","id":"1"},{"fullName":"包装线","id":"2"}],"__vModel__":"groupType","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"groupType","placeholder":"请选择班组类型","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"ableIds":[],"multiple":false,"fullName":"组长","relationField":"","__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"userSelect","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"组长","trigger":"change","showLabel":true,"required":true,"relationField":"","tableName":"yys_group","renderKey":1722846480279,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-user","defaultCurrent":false,"tag":"JnpfUserSelect","regList":[],"span":24},"__vModel__":"leader","style":{"width":"100%"},"selectType":"all","disabled":false,"id":"leader","placeholder":"请选择组长","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"ableIds":[],"multiple":false,"fullName":"成员","relationField":"","__config__":{"formId":104,"visibility":["pc","app"],"jnpfKey":"userSelect","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"成员","trigger":"change","showLabel":true,"required":true,"relationField":"","tableName":"yys_group","renderKey":1722846506336,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-user","defaultCurrent":false,"tag":"JnpfUserSelect","regList":[],"span":24},"__vModel__":"member","style":{"width":"100%"},"selectType":"all","disabled":false,"id":"member","placeholder":"请选择成员","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"multiple":false,"fullName":"启用状态","props":{"label":"fullName","value":"id"},"__config__":{"formId":105,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"1","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"启用状态","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"yys_group","renderKey":1722846553507,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"options":[{"fullName":"启用","id":"1"},{"fullName":"未启用","id":"2"}],"__vModel__":"enabledStatus","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"enabledStatus","placeholder":"请选择启用状态","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] +export default superQueryJson diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yyspost/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yyspost/index.vue index 248cda1..e93bed9 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yyspost/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yyspost/index.vue @@ -49,15 +49,15 @@ - + - + - + - + - +