month

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/YysDayPackageMapper.java

@@ -0,0 +1,16 @@
+package jnpf.mapper;
+
+
+import jnpf.entity.YysDayPackageEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * yysDayPackage
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-08-06
+ */
+public interface YysDayPackageMapper extends BaseMapper<YysDayPackageEntity> {
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDayPackageService.java

@@ -0,0 +1,35 @@
+package jnpf.service;
+
+import jnpf.model.yysdaypackage.*;
+import jnpf.entity.*;
+import java.util.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * yysDayPackage
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-08-06
+ */
+public interface YysDayPackageService extends IService<YysDayPackageEntity> {
+    List<YysDayPackageEntity> getList(YysDayPackagePagination yysDayPackagePagination);
+
+    List<YysDayPackageEntity> getTypeList(YysDayPackagePagination yysDayPackagePagination,String dataType);
+
+    YysDayPackageEntity getInfo(String id);
+
+    void delete(YysDayPackageEntity entity);
+
+    void create(YysDayPackageEntity entity);
+
+    boolean update(String id, YysDayPackageEntity entity);
+
+    //子表方法
+    //副表数据方法
+	String checkForm(YysDayPackageForm form,int i);
+
+    void saveOrUpdate(YysDayPackageForm yysDayPackageForm,String id, boolean isSave) throws Exception;
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayPackageServiceImpl.java

@@ -0,0 +1,325 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.YysDayPackageMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.yysdaypackage.*;
+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;
+/**
+ *
+ * yysDayPackage
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-08-06
+ */
+@Service
+public class YysDayPackageServiceImpl extends ServiceImpl<YysDayPackageMapper, YysDayPackageEntity> implements YysDayPackageService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Override
+    public List<YysDayPackageEntity> getList(YysDayPackagePagination yysDayPackagePagination){
+        return getTypeList(yysDayPackagePagination,yysDayPackagePagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<YysDayPackageEntity> getTypeList(YysDayPackagePagination yysDayPackagePagination,String dataType){
+        String userId=userProvider.get().getUserId();
+        List<String> AllIdList =new ArrayList();
+        List<List<String>> intersectionList =new ArrayList<>();
+        boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+        String columnData = !isPc ? YysDayPackageConstant.getAppColumnData() : YysDayPackageConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int yysDayPackageNum =0;
+        QueryWrapper<YysDayPackageEntity> yysDayPackageQueryWrapper=new QueryWrapper<>();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(yysDayPackagePagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = yysDayPackagePagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<YysDayPackageEntity> yysDayPackageSuperWrapper = new QueryWrapper<>();
+            yysDayPackageSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayPackageSuperWrapper,YysDayPackageEntity.class,queryJson,"0"));
+            int yysDayPackageNum1 = yysDayPackageSuperWrapper.getExpression().getNormal().size();
+            if (yysDayPackageNum1>0){
+                List<String> yysDayPackageList =this.list(yysDayPackageSuperWrapper).stream().map(YysDayPackageEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(yysDayPackageList);
+                intersectionSuperList.add(yysDayPackageList);
+                superNum++;
+            }
+            superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
+            //and or
+            if(superOp.equalsIgnoreCase("and")){
+                allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
+            }else{
+                allSuperIDlist = allSuperList;
+            }
+        }
+        List<String> allRuleIDlist = new ArrayList<>();
+        String ruleOp ="";
+        if (ObjectUtil.isNotEmpty(ruleJson)){
+            List<String> allRuleList = new ArrayList<>();
+            List<List<String>> intersectionRuleList  = new ArrayList<>();
+            SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
+            int ruleNum = 0;
+            QueryWrapper<YysDayPackageEntity> yysDayPackageSuperWrapper = new QueryWrapper<>();
+            yysDayPackageSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayPackageSuperWrapper,YysDayPackageEntity.class,ruleJson,"0"));
+            int yysDayPackageNum1 = yysDayPackageSuperWrapper.getExpression().getNormal().size();
+            if (yysDayPackageNum1>0){
+                List<String> yysDayPackageList =this.list(yysDayPackageSuperWrapper).stream().map(YysDayPackageEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(yysDayPackageList);
+                intersectionRuleList.add(yysDayPackageList);
+                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 yysDayPackageObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayPackageQueryWrapper,YysDayPackageEntity.class,yysDayPackagePagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(yysDayPackageObj)){
+        return new ArrayList<>();
+        } else {
+        yysDayPackageQueryWrapper = (QueryWrapper<YysDayPackageEntity>)yysDayPackageObj;
+        if( yysDayPackageQueryWrapper.getExpression().getNormal().size()>0){
+        yysDayPackageNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object yysDayPackageObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayPackageQueryWrapper,YysDayPackageEntity.class,yysDayPackagePagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(yysDayPackageObj)){
+        return new ArrayList<>();
+        } else {
+        yysDayPackageQueryWrapper = (QueryWrapper<YysDayPackageEntity>)yysDayPackageObj;
+        if( yysDayPackageQueryWrapper.getExpression().getNormal().size()>0){
+        yysDayPackageNum++;
+        }
+        }
+
+
+    }
+    }
+        if(isPc){
+            if(ObjectUtil.isNotEmpty(yysDayPackagePagination.getManufactureTime())){
+            yysDayPackageNum++;
+
+                List ManufactureTimeList =  JsonUtil.getJsonToList(yysDayPackagePagination.getManufactureTime(),String.class);
+                    Long fir = Long.valueOf(String.valueOf(ManufactureTimeList.get(0)));
+                    Long sec = Long.valueOf(String.valueOf(ManufactureTimeList.get(1)));
+
+                    yysDayPackageQueryWrapper.lambda().ge(YysDayPackageEntity::getManufactureTime, new Date(fir))
+                    .le(YysDayPackageEntity::getManufactureTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
+
+
+            }
+
+            if(ObjectUtil.isNotEmpty(yysDayPackagePagination.getProductCode())){
+            yysDayPackageNum++;
+
+                String value = yysDayPackagePagination.getProductCode() instanceof List ?
+                    JsonUtil.getObjectToString(yysDayPackagePagination.getProductCode()) :
+                    String.valueOf(yysDayPackagePagination.getProductCode());
+                yysDayPackageQueryWrapper.lambda().like(YysDayPackageEntity::getProductCode,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(yysDayPackagePagination.getProductName())){
+            yysDayPackageNum++;
+
+                String value = yysDayPackagePagination.getProductName() instanceof List ?
+                    JsonUtil.getObjectToString(yysDayPackagePagination.getProductName()) :
+                    String.valueOf(yysDayPackagePagination.getProductName());
+                yysDayPackageQueryWrapper.lambda().like(YysDayPackageEntity::getProductName,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(yysDayPackagePagination.getDeviceName())){
+            yysDayPackageNum++;
+
+                String value = yysDayPackagePagination.getDeviceName() instanceof List ?
+                    JsonUtil.getObjectToString(yysDayPackagePagination.getDeviceName()) :
+                    String.valueOf(yysDayPackagePagination.getDeviceName());
+                yysDayPackageQueryWrapper.lambda().like(YysDayPackageEntity::getDeviceName,value);
+
+            }
+
+        }
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            yysDayPackageQueryWrapper.lambda().in(YysDayPackageEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            yysDayPackageQueryWrapper.lambda().and(t->t.in(YysDayPackageEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            yysDayPackageQueryWrapper.lambda().and(t->t.in(YysDayPackageEntity::getId, finalAllRuleIDlist));
+        }
+        //假删除标志
+        yysDayPackageQueryWrapper.lambda().isNull(YysDayPackageEntity::getDeleteMark);
+
+        //排序
+        if(StringUtil.isEmpty(yysDayPackagePagination.getSidx())){
+            yysDayPackageQueryWrapper.lambda().orderByDesc(YysDayPackageEntity::getPost);
+        }else{
+            try {
+                String sidx = yysDayPackagePagination.getSidx();
+                String[] strs= sidx.split("_name");
+                YysDayPackageEntity yysDayPackageEntity = new YysDayPackageEntity();
+                Field declaredField = yysDayPackageEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                yysDayPackageQueryWrapper="asc".equals(yysDayPackagePagination.getSort().toLowerCase())?yysDayPackageQueryWrapper.orderByAsc(value):yysDayPackageQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<YysDayPackageEntity> page=new Page<>(yysDayPackagePagination.getCurrentPage(), yysDayPackagePagination.getPageSize());
+                IPage<YysDayPackageEntity> userIPage=this.page(page, yysDayPackageQueryWrapper);
+                return yysDayPackagePagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<YysDayPackageEntity> list = new ArrayList();
+                return yysDayPackagePagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(yysDayPackageQueryWrapper);
+        }
+    }
+    @Override
+    public YysDayPackageEntity getInfo(String id){
+        QueryWrapper<YysDayPackageEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(YysDayPackageEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(YysDayPackageEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, YysDayPackageEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(YysDayPackageEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(YysDayPackageForm 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.getProductCode())){
+                    return "产品编码不能为空";
+                }
+                if(StringUtil.isNotEmpty(form.getProductName())){
+                    form.setProductName(form.getProductName().trim());
+                    QueryWrapper<YysDayPackageEntity> productNameWrapper=new QueryWrapper<>();
+                    productNameWrapper.lambda().eq(YysDayPackageEntity::getProductName,form.getProductName());
+                        //假删除标志
+                        productNameWrapper.lambda().isNull(YysDayPackageEntity::getDeleteMark);
+                    if (isUp){
+                        productNameWrapper.lambda().ne(YysDayPackageEntity::getId, id);
+                    }
+                    if((int) this.count(productNameWrapper)>0){
+                        countRecover = "产品名称不能重复";
+                    }
+                }
+                if(StringUtil.isEmpty(form.getModels())){
+                    return "规格型号不能为空";
+                }
+                if(StringUtil.isEmpty(form.getMeasurementUnit())){
+                    return "计量单位不能为空";
+                }
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param yysDayPackageForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(YysDayPackageForm yysDayPackageForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        yysDayPackageForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(YysDayPackageConstant.getFormData(),yysDayPackageForm),YysDayPackageForm.class);
+        YysDayPackageEntity entity = JsonUtil.getJsonToBean(yysDayPackageForm, YysDayPackageEntity.class);
+
+        if(isSave){
+            String mainId =  RandomUtil.uuId() ;
+            entity.setId(mainId);
+            entity.setVersion(0);
+        }else{
+        }
+        this.saveOrUpdate(entity);
+
+    }
+}

jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDayPackageController.java

@@ -0,0 +1,530 @@
+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.yysdaypackage.*;
+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;
+
+/**
+ * yysDayPackage
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-06
+ */
+@Slf4j
+@RestController
+@Tag(name = "yysDayPackage" , description = "example")
+@RequestMapping("/api/example/YysDayPackage")
+public class YysDayPackageController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private YysDayPackageService yysDayPackageService;
+
+
+
+    @Autowired
+    private ConfigValueUtil configValueUtil;
+
+    /**
+    * 列表
+    *
+    * @param yysDayPackagePagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody YysDayPackagePagination yysDayPackagePagination)throws IOException{
+        List<YysDayPackageEntity> list= yysDayPackageService.getList(yysDayPackagePagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (YysDayPackageEntity entity : list) {
+        Map<String, Object> yysDayPackageMap=JsonUtil.entityToMap(entity);
+        yysDayPackageMap.put("id", yysDayPackageMap.get("id"));
+        //副表数据
+        //子表数据
+            realList.add(yysDayPackageMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, YysDayPackageConstant.getFormData(), YysDayPackageConstant.getColumnData(), yysDayPackagePagination.getModuleId(),false);
+
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(yysDayPackagePagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 创建
+    *
+    * @param yysDayPackageForm
+    * @return
+    */
+    @PostMapping()
+    @Operation(summary = "创建")
+    public ActionResult create(@RequestBody @Valid YysDayPackageForm yysDayPackageForm) {
+        String b = yysDayPackageService.checkForm(yysDayPackageForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            yysDayPackageService.saveOrUpdate(yysDayPackageForm, null ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 导出Excel
+    *
+    * @return
+    */
+    @Operation(summary = "导出Excel")
+    @PostMapping("/Actions/Export")
+    public ActionResult Export(@RequestBody YysDayPackagePagination yysDayPackagePagination) throws IOException {
+        if (StringUtil.isEmpty(yysDayPackagePagination.getSelectKey())){
+            return ActionResult.fail("请选择导出字段");
+        }
+        List<YysDayPackageEntity> list= yysDayPackageService.getList(yysDayPackagePagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (YysDayPackageEntity entity : list) {
+        Map<String, Object> yysDayPackageMap=JsonUtil.entityToMap(entity);
+        yysDayPackageMap.put("id", yysDayPackageMap.get("id"));
+        //副表数据
+        //子表数据
+            realList.add(yysDayPackageMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, YysDayPackageConstant.getFormData(), YysDayPackageConstant.getColumnData(), yysDayPackagePagination.getModuleId(),false);
+        String[]keys=!StringUtil.isEmpty(yysDayPackagePagination.getSelectKey())?yysDayPackagePagination.getSelectKey():new String[0];
+        UserInfo userInfo=userProvider.get();
+            DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo);
+        return ActionResult.success(vo);
+    }
+
+    /**
+    * 导出表格方法
+    */
+    public DownloadVO creatModelExcel(String path,List<Map<String, Object>>list,String[]keys,UserInfo userInfo){
+        DownloadVO vo=DownloadVO.builder().build();
+        List<ExcelExportEntity> entitys=new ArrayList<>();
+        if(keys.length>0){
+            for(String key:keys){
+                switch(key){
+                    case "manufactureTime" :
+                    entitys.add(new ExcelExportEntity("生产日期" ,"manufactureTime"));
+                    break;
+                    case "deviceCode" :
+                    entitys.add(new ExcelExportEntity("设备编码" ,"deviceCode"));
+                    break;
+                    case "deviceName" :
+                    entitys.add(new ExcelExportEntity("设备名称" ,"deviceName"));
+                    break;
+                    case "sort" :
+                    entitys.add(new ExcelExportEntity("顺序号" ,"sort"));
+                    break;
+                    case "post" :
+                    entitys.add(new ExcelExportEntity("班次" ,"post"));
+                    break;
+                    case "startTime" :
+                    entitys.add(new ExcelExportEntity("开始时间" ,"startTime"));
+                    break;
+                    case "endTime" :
+                    entitys.add(new ExcelExportEntity("结束时间" ,"endTime"));
+                    break;
+                    case "productCode" :
+                    entitys.add(new ExcelExportEntity("产品编码" ,"productCode"));
+                    break;
+                    case "productName" :
+                    entitys.add(new ExcelExportEntity("产品名称" ,"productName"));
+                    break;
+                    case "models" :
+                    entitys.add(new ExcelExportEntity("规格型号" ,"models"));
+                    break;
+                    case "measurementUnit" :
+                    entitys.add(new ExcelExportEntity("计量单位" ,"measurementUnit"));
+                    break;
+                    case "planNumber" :
+                    entitys.add(new ExcelExportEntity("计量数量" ,"planNumber"));
+                    break;
+                    default:
+                    break;
+                }
+            }
+        }
+
+        ExportParams exportParams = new ExportParams(null, "表单信息");
+        exportParams.setType(ExcelType.XSSF);
+        try{
+            @Cleanup Workbook workbook = new HSSFWorkbook();
+            if (entitys.size()>0){
+                if (list.size()==0){
+                    list.add(new HashMap<>());
+                }
+                //去除空数据
+                List<Map<String, Object>> dataList = new ArrayList<>();
+                for (Map<String, Object> map : list) {
+                    int i = 0;
+                    for (String key : keys) {
+                        //子表
+                        if (key.toLowerCase().startsWith("tablefield")) {
+                            String tableField = key.substring(0, key.indexOf("-" ));
+                            String field = key.substring(key.indexOf("-" ) + 1);
+                            Object o = map.get(tableField);
+                            if (o != null) {
+                                List<Map<String, Object>> childList = (List<Map<String, Object>>) o;
+                                for (Map<String, Object> childMap : childList) {
+                                    if (childMap.get(field) != null) {
+                                        i++;
+                                    }
+                                }
+                            }
+                        } else {
+                            Object o = map.get(key);
+                            if (o != null) {
+                                i++;
+                            }
+                        }
+                    }
+                    if (i > 0) {
+                        dataList.add(map);
+                    }
+                }
+                //复杂表头-表头和数据处理
+                ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(YysDayPackageConstant.getColumnData(), ColumnDataModel.class);
+                List<HeaderModel> complexHeaderList = columnDataModel.getComplexHeaderList();
+                if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) {
+                    entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList);
+                    dataList =  VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList);
+                }
+
+                workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList);
+            }
+            String fileName = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
+            MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName);
+            String temporaryFilePath = configValueUtil.getTemporaryFilePath();
+            FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName);
+            vo.setName(fileInfo.getFilename());
+            vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName);
+        } catch (Exception e) {
+            log.error("信息导出Excel错误:{}", e.getMessage());
+            e.printStackTrace();
+        }
+        return vo;
+    }
+    @Operation(summary = "上传文件")
+    @PostMapping("/Uploader")
+    public ActionResult<Object> Uploader() {
+        List<MultipartFile> list = UpUtil.getFileAll();
+        MultipartFile file = list.get(0);
+        if (file.getOriginalFilename().endsWith(".xlsx") || file.getOriginalFilename().endsWith(".xls")) {
+            String filePath = XSSEscape.escape(configValueUtil.getTemporaryFilePath());
+            String fileName = XSSEscape.escape(RandomUtil.uuId() + "." + UpUtil.getFileType(file));
+            //上传文件
+            FileInfo fileInfo = FileUploadUtils.uploadFile(file, filePath, fileName);
+            DownloadVO vo = DownloadVO.builder().build();
+            vo.setName(fileInfo.getFilename());
+            return ActionResult.success(vo);
+        } else {
+            return ActionResult.fail("选择文件不符合导入");
+        }
+    }
+
+    /**
+    * 模板下载
+    *
+    * @return
+    */
+    @Operation(summary = "模板下载")
+    @GetMapping("/TemplateDownload")
+    public ActionResult<DownloadVO>  TemplateDownload(){
+        DownloadVO vo = DownloadVO.builder().build();
+        UserInfo userInfo = userProvider.get();
+        Map<String, Object> dataMap = new HashMap<>();
+        //主表对象
+        List<ExcelExportEntity> entitys = new ArrayList<>();
+        //以下添加字段
+                entitys.add(new ExcelExportEntity("生产日期" ,"manufactureTime"));
+            dataMap.put("manufactureTime", "例: yyyy-MM-dd");
+                entitys.add(new ExcelExportEntity("班次" ,"post"));
+                entitys.add(new ExcelExportEntity("开始时间" ,"startTime"));
+            dataMap.put("startTime", "例: HH:mm");
+                entitys.add(new ExcelExportEntity("结束时间" ,"endTime"));
+            dataMap.put("endTime", "例: HH:mm");
+                entitys.add(new ExcelExportEntity("产品编码" ,"productCode"));
+                entitys.add(new ExcelExportEntity("规格型号" ,"models"));
+                entitys.add(new ExcelExportEntity("计量单位" ,"measurementUnit"));
+                entitys.add(new ExcelExportEntity("计量数量" ,"planNumber"));
+                entitys.add(new ExcelExportEntity("设备名称" ,"deviceName"));
+                entitys.add(new ExcelExportEntity("产品名称" ,"productName"));
+        List<Map<String, Object>> list = new ArrayList<>();
+        list.add(dataMap);
+
+        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<>());
+        }
+        //复杂表头-表头和数据处理
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(YysDayPackageConstant.getColumnData(), ColumnDataModel.class);
+        List<HeaderModel> complexHeaderList = columnDataModel.getComplexHeaderList();
+        if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) {
+            entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList);
+            list =  VisualUtils.complexHeaderDataHandel(list, complexHeaderList);
+        }
+        workbook = ExcelExportUtil.exportExcel(exportParams, entitys, list);
+        }
+        String fileName = "日包装工单模板" + DateUtil.dateNow("yyyyMMddHHmmss") + ".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 ActionResult.success(vo);
+    }
+
+    /**
+    * 导入预览
+    *
+    * @return
+    */
+    @Operation(summary = "导入预览" )
+    @GetMapping("/ImportPreview")
+    public ActionResult<Map<String, Object>> ImportPreview(String fileName) throws Exception {
+        Map<String, Object> headAndDataMap = new HashMap<>(2);
+            String filePath = FileUploadUtils.getLocalBasePath() + configValueUtil.getTemporaryFilePath();
+            FileUploadUtils.downLocal(configValueUtil.getTemporaryFilePath(), filePath, fileName);
+        File temporary = new File(XSSEscape.escapePath(filePath + fileName));
+            int headerRowIndex = 1;
+        ImportParams params = new ImportParams();
+        params.setTitleRows(0);
+        params.setHeadRows(headerRowIndex);
+        params.setNeedVerify(true);
+        try {
+            List<YysDayPackageExcelVO> excelDataList = ExcelImportUtil.importExcel(temporary, YysDayPackageExcelVO.class, params);
+            // 导入字段
+            List<ExcelImFieldModel> columns = new ArrayList<>();
+            columns.add(new ExcelImFieldModel("manufactureTime","生产日期"));
+            columns.add(new ExcelImFieldModel("post","班次"));
+            columns.add(new ExcelImFieldModel("startTime","开始时间"));
+            columns.add(new ExcelImFieldModel("endTime","结束时间"));
+            columns.add(new ExcelImFieldModel("productCode","产品编码"));
+            columns.add(new ExcelImFieldModel("models","规格型号"));
+            columns.add(new ExcelImFieldModel("measurementUnit","计量单位"));
+            columns.add(new ExcelImFieldModel("planNumber","计量数量"));
+            columns.add(new ExcelImFieldModel("deviceName","设备名称"));
+            columns.add(new ExcelImFieldModel("productName","产品名称"));
+            headAndDataMap.put("dataRow" , JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(excelDataList)));
+            headAndDataMap.put("headerRow" , JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(columns)));
+            } catch (Exception e){
+            e.printStackTrace();
+            return ActionResult.fail("表头名称不可更改,表头行不能删除");
+        }
+        return ActionResult.success(headAndDataMap);
+    }
+
+    /**
+    * 导入数据
+    *
+    * @return
+    */
+    @Operation(summary = "导入数据" )
+    @PostMapping("/ImportData")
+    public ActionResult<ExcelImportModel> ImportData(@RequestBody VisualImportModel visualImportModel) throws Exception {
+        List<Map<String, Object>> listData=new ArrayList<>();
+        for(Map<String, Object> map : visualImportModel.getList()){
+            listData.add(map);
+        }
+        ImportFormCheckUniqueModel uniqueModel = new ImportFormCheckUniqueModel();
+        uniqueModel.setDbLinkId(YysDayPackageConstant.DBLINKID);
+        uniqueModel.setUpdate(Objects.equals("2", "2"));
+        ExcelImportModel excelImportModel = generaterSwapUtil.importData(YysDayPackageConstant.getFormData(),listData,uniqueModel,
+            YysDayPackageConstant.TABLEFIELDKEY,YysDayPackageConstant.getTableList());
+        List<ImportDataModel> importDataModel = uniqueModel.getImportDataModel();
+        for (ImportDataModel model : importDataModel) {
+            String id = model.getId();
+            Map<String, Object> result = model.getResultData();
+            if(StringUtil.isNotEmpty(id)){
+                update(id, JsonUtil.getJsonToBean(result,YysDayPackageForm.class), true);
+            }else {
+                create( JsonUtil.getJsonToBean(result,YysDayPackageForm.class));
+            }
+        }
+        return ActionResult.success(excelImportModel);
+    }
+
+    /**
+    * 导出异常报告
+    *
+    * @return
+    */
+    @Operation(summary = "导出异常报告")
+    @PostMapping("/ImportExceptionData")
+    public ActionResult<DownloadVO> ImportExceptionData(@RequestBody VisualImportModel visualImportModel) {
+        DownloadVO vo=DownloadVO.builder().build();
+        List<YysDayPackageExcelErrorVO> yysDayPackageVOList = JsonUtil.getJsonToList(visualImportModel.getList(), YysDayPackageExcelErrorVO.class);
+        UserInfo userInfo = userProvider.get();
+
+        try{
+        @Cleanup Workbook workbook = new HSSFWorkbook();
+        ExportParams exportParams = new ExportParams(null, "错误报告");
+        exportParams.setType(ExcelType.XSSF);
+        workbook = ExcelExportUtil.exportExcel(exportParams,
+        YysDayPackageExcelErrorVO.class, yysDayPackageVOList);
+
+        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) {
+        e.printStackTrace();
+        }
+        return ActionResult.success(vo);
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param yysDayPackageForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid YysDayPackageForm yysDayPackageForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        yysDayPackageForm.setId(id);
+        if (!isImport) {
+            String b =  yysDayPackageService.checkForm(yysDayPackageForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        YysDayPackageEntity entity= yysDayPackageService.getInfo(id);
+        if(entity!=null){
+            try{
+                yysDayPackageService.saveOrUpdate(yysDayPackageForm,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){
+        YysDayPackageEntity entity= yysDayPackageService.getInfo(id);
+        if(entity!=null){
+            //假删除
+            entity.setDeleteMark(1);
+            yysDayPackageService.update(id,entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        YysDayPackageEntity entity= yysDayPackageService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> yysDayPackageMap=JsonUtil.entityToMap(entity);
+        yysDayPackageMap.put("id", yysDayPackageMap.get("id"));
+        //副表数据
+        //子表数据
+        yysDayPackageMap = generaterSwapUtil.swapDataDetail(yysDayPackageMap,YysDayPackageConstant.getFormData(),"590536677781408453",false);
+        return ActionResult.success(yysDayPackageMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        YysDayPackageEntity entity= yysDayPackageService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> yysDayPackageMap=JsonUtil.entityToMap(entity);
+        yysDayPackageMap.put("id", yysDayPackageMap.get("id"));
+        //副表数据
+        //子表数据
+        yysDayPackageMap = generaterSwapUtil.swapDataForm(yysDayPackageMap,YysDayPackageConstant.getFormData(),YysDayPackageConstant.TABLEFIELDKEY,YysDayPackageConstant.TABLERENAMES);
+        return ActionResult.success(yysDayPackageMap);
+    }
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysDayPackageEntity.java

@@ -0,0 +1,69 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+/**
+ * 
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-06
+ */
+@Data
+@TableName("yys_day_package")
+public class YysDayPackageEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField(value = "MANUFACTURE_TIME" , updateStrategy = FieldStrategy.IGNORED)
+    private Date manufactureTime;
+    @TableField(value = "DEVICE_CODE" , updateStrategy = FieldStrategy.IGNORED)
+    private String deviceCode;
+    @TableField(value = "DEVICE_NAME" , updateStrategy = FieldStrategy.IGNORED)
+    private String deviceName;
+    @TableField(value = "SORT" , updateStrategy = FieldStrategy.IGNORED)
+    private Integer sort;
+    @TableField(value = "POST" , updateStrategy = FieldStrategy.IGNORED)
+    private String post;
+    @TableField(value = "START_TIME" , updateStrategy = FieldStrategy.IGNORED)
+    private String startTime;
+    @TableField(value = "END_TIME" , updateStrategy = FieldStrategy.IGNORED)
+    private String endTime;
+    @TableField(value = "PRODUCT_CODE" , updateStrategy = FieldStrategy.IGNORED)
+    private String productCode;
+    @TableField(value = "PRODUCT_NAME" , updateStrategy = FieldStrategy.IGNORED)
+    private String productName;
+    @TableField(value = "MODELS" , updateStrategy = FieldStrategy.IGNORED)
+    private String models;
+    @TableField(value = "MEASUREMENT_UNIT" , updateStrategy = FieldStrategy.IGNORED)
+    private String measurementUnit;
+    @TableField(value = "PLAN_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
+    private String planNumber;
+    @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;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageExcelErrorVO.java

@@ -0,0 +1,22 @@
+
+
+package jnpf.model.yysdaypackage;
+
+import lombok.Data;
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.annotation.JSONField;
+/**
+ *
+ * yysDayPackage
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-06
+ */
+@Data
+public class YysDayPackageExcelErrorVO extends YysDayPackageExcelVO{
+
+	@Excel(name = "异常原因",orderNum = "999")
+    @JSONField(name = "errorsInfo")
+	private String errorsInfo;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageExcelVO.java

@@ -0,0 +1,77 @@
+package jnpf.model.yysdaypackage;
+
+import lombok.Data;
+import java.sql.Time;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.alibaba.fastjson.annotation.JSONField;
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelEntity;
+import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
+import java.math.BigDecimal;
+import java.util.List;
+/**
+ *
+ * yysDayPackage
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-06
+ */
+@Data
+public class YysDayPackageExcelVO{
+
+    /** 生产日期 **/
+    @JSONField(name = "manufactureTime")
+    @Excel(name = "生产日期",orderNum = "1", isImportField = "true" )
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private String manufactureTime;
+
+    /** 班次 **/
+    @JSONField(name = "post")
+    @Excel(name = "班次",orderNum = "1", isImportField = "true" )
+    private String post;
+
+    /** 开始时间 **/
+    @JSONField(name = "startTime")
+    @Excel(name = "开始时间",orderNum = "1", isImportField = "true" )
+    private String startTime;
+
+    /** 结束时间 **/
+    @JSONField(name = "endTime")
+    @Excel(name = "结束时间",orderNum = "1", isImportField = "true" )
+    private String endTime;
+
+    /** 产品编码 **/
+    @JSONField(name = "productCode")
+    @Excel(name = "产品编码",orderNum = "1", isImportField = "true" )
+    private String productCode;
+
+    /** 规格型号 **/
+    @JSONField(name = "models")
+    @Excel(name = "规格型号",orderNum = "1", isImportField = "true" )
+    private String models;
+
+    /** 计量单位 **/
+    @JSONField(name = "measurementUnit")
+    @Excel(name = "计量单位",orderNum = "1", isImportField = "true" )
+    private String measurementUnit;
+
+    /** 计量数量 **/
+    @JSONField(name = "planNumber")
+    @Excel(name = "计量数量",orderNum = "1", isImportField = "true" )
+    private Integer planNumber;
+
+    /** 设备名称 **/
+    @JSONField(name = "deviceName")
+    @Excel(name = "设备名称",orderNum = "1", isImportField = "true" )
+    private String deviceName;
+
+    /** 产品名称 **/
+    @JSONField(name = "productName")
+    @Excel(name = "产品名称",orderNum = "1", isImportField = "true" )
+    private String productName;
+
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageForm.java

@@ -0,0 +1,59 @@
+package jnpf.model.yysdaypackage;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * yysDayPackage
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-06
+ */
+@Data
+public class YysDayPackageForm  {
+    /** 主键 */
+    private String id;
+    /** 乐观锁 **/
+    @JsonProperty("version")
+    private Integer version;
+
+    /** 生产日期 **/
+    @JsonProperty("manufactureTime")
+    private String manufactureTime;
+    /** 设备编码 **/
+    @JsonProperty("deviceCode")
+    private String deviceCode;
+    /** 设备名称 **/
+    @JsonProperty("deviceName")
+    private String deviceName;
+    /** 顺序号 **/
+    @JsonProperty("sort")
+    private BigDecimal sort;
+    /** 班次 **/
+    @JsonProperty("post")
+    private Object post;
+    /** 开始时间 **/
+    @JsonProperty("startTime")
+    private String startTime;
+    /** 结束时间 **/
+    @JsonProperty("endTime")
+    private String endTime;
+    /** 产品编码 **/
+    @JsonProperty("productCode")
+    private String productCode;
+    /** 产品名称 **/
+    @JsonProperty("productName")
+    private String productName;
+    /** 规格型号 **/
+    @JsonProperty("models")
+    private String models;
+    /** 计量单位 **/
+    @JsonProperty("measurementUnit")
+    private String measurementUnit;
+    /** 计量数量 **/
+    @JsonProperty("planNumber")
+    private BigDecimal planNumber;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackagePagination.java

@@ -0,0 +1,42 @@
+package jnpf.model.yysdaypackage;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * yysDayPackage
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-06
+ */
+@Data
+public class YysDayPackagePagination 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("manufactureTime")
+    private Object manufactureTime;
+    /** 产品编码 */
+    @JsonProperty("productCode")
+    private Object productCode;
+    /** 产品名称 */
+    @JsonProperty("productName")
+    private Object productName;
+    /** 设备名称 */
+    @JsonProperty("deviceName")
+    private Object deviceName;
+}

jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/Detail.vue

@@ -0,0 +1,182 @@
+<template>
+<transition name="el-zoom-in-center">
+<div class="JNPF-preview-main">
+    <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
+    <div class="JNPF-common-page-header">
+        <el-page-header @back="goBack"
+                        content="详情"/>
+        <div class="options">
+            <el-button @click="goBack">取 消</el-button>
+        </div>
+    </div>
+<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
+    <template v-if="!loading">
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="生产日期"  
+ prop="manufactureTime"  >
+                        <p>{{dataForm.manufactureTime}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="设备编码"  
+ prop="deviceCode"  >
+                        <p>{{dataForm.deviceCode}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="设备名称"  
+ prop="deviceName"  >
+                        <p>{{dataForm.deviceName}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="顺序号"  
+ prop="sort"  >
+                    <JnpfNumber    v-model="dataForm.sort"
+ placeholder="顺序号"  disabled
+ :min="1"  :step="1"  >
+                </JnpfNumber>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="班次"  
+ prop="post"  >
+                         <p>{{ dataForm.post }} </p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="开始时间"  
+ prop="startTime"  >
+                        <p>{{dataForm.startTime}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="结束时间"  
+ prop="endTime"  >
+                        <p>{{dataForm.endTime}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="产品编码"  
+ prop="productCode"  >
+                        <p>{{dataForm.productCode}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="产品名称"  
+ prop="productName"  >
+                        <p>{{dataForm.productName}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="规格型号"  
+ prop="models"  >
+                        <p>{{dataForm.models}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="计量单位"  
+ prop="measurementUnit"  >
+                        <p>{{dataForm.measurementUnit}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="计量数量"  
+ prop="planNumber"  >
+                    <JnpfNumber    v-model="dataForm.planNumber"
+ placeholder="请输入计量数量"  disabled
+ :step="1"  >
+                </JnpfNumber>
+                </jnpf-form-tip-item>
+            </el-col>
+    </template>
+</el-form>
+    </el-row>
+    </div>
+</transition>
+</template>
+<script>
+    import request from '@/utils/request'
+
+    import { getConfigData } from '@/api/onlineDev/visualDev'
+    import jnpf from '@/utils/jnpf'
+    import Detail from '@/views/basic/dynamicModel/list/detail'
+    import { thousandsFormat } from "@/components/Generator/utils/index"
+    export default {
+        components: { Detail},
+        props: [],
+        data() {
+            return {
+                visible: false,
+                detailVisible: false,
+                loading: false,
+
+            dataForm: {
+                id :'',
+                            manufactureTime : '',
+                            deviceCode : "",
+                            deviceName : '',
+                            sort : 1,
+                            post : "1",
+                            startTime : '',
+                            endTime : '',
+                            productCode : '',
+                            productName : '',
+                            models : '',
+                            measurementUnit : '',
+                            planNumber : '',
+            },
+                            postOptions:[{"fullName":"旺季白班","id":"1"},{"fullName":"旺季晚班","id":"2"}],
+                        postProps:{"label":"fullName","value":"id"  },
+
+        }
+        },
+        computed: {},
+        watch: {},
+        created() {
+
+        },
+        mounted() {},
+        methods: {
+            toDetail(defaultValue, modelId) {
+                if (!defaultValue) return
+                getConfigData(modelId).then(res => {
+                    if (!res.data || !res.data.formData) return
+                    let formData = JSON.parse(res.data.formData)
+                    formData.popupType = 'general'
+                    this.detailVisible = true
+                    this.$nextTick(() => {
+                        this.$refs.Detail.init(formData, modelId, defaultValue)
+                    })
+                })
+            },
+            dataInfo(dataAll){
+                let _dataAll =dataAll
+                this.dataForm = _dataAll
+            },
+
+                goBack() {
+                    this.$emit('refresh')
+                },
+            init(id) {
+                this.dataForm.id = id || 0;
+                this.visible = true;
+                this.$nextTick(() => {
+                    if(this.dataForm.id){
+                        this.loading = true
+                        request({
+                            url: '/api/example/YysDayPackage/detail/'+this.dataForm.id,
+                            method: 'get'
+                        }).then(res => {
+                            this.dataInfo(res.data)
+                            this.loading = false
+                        })
+                    }
+
+                })
+            },
+        },
+    }
+
+</script>

jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/form.vue

@@ -0,0 +1,586 @@
+<template>
+    <transition name="el-zoom-in-center">
+        <div class="JNPF-preview-main">
+            <div class="JNPF-common-page-header">
+                <el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
+                <div class="options">
+                    <el-dropdown class="dropdown" placement="bottom">
+                        <el-button style="width:70px">
+                            更 多<i class="el-icon-arrow-down el-icon--right"></i>
+                        </el-button>
+                        <el-dropdown-menu slot="dropdown">
+                            <template v-if="dataForm.id">
+                                <el-dropdown-item @click.native="prev" :disabled='prevDis'>
+                                    {{ '上一条' }}
+                                </el-dropdown-item>
+                                <el-dropdown-item @click.native="next" :disabled='nextDis'>
+                                    {{ '下一条' }}
+                                </el-dropdown-item>
+                            </template>
+                            <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
+                                :loading="continueBtnLoading" :disabled='btnLoading'>
+                                {{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown>
+                    <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
+                        :disabled='continueBtnLoading'> 保
+                        存</el-button>
+                    <el-button @click="goBack"> 取 消</el-button>
+                </div>
+            </div>
+            <el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
+                <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
+                    label-position="right">
+                    <template v-if="!loading">
+                        <!-- 具体表单 -->
+
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="生产日期" prop="manufactureTime">
+                                <JnpfDatePicker v-model="dataForm.manufactureTime"
+                                    @change="changeData('manufactureTime', -1)" :startTime="dateTime(false, 1, 1, '', '')"
+                                    :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择生产日期" clearable
+                                    :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
+                                </JnpfDatePicker>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备编码" prop="deviceCode">
+                                <JnpfPopupSelect v-model="dataForm.deviceCode" @change="changeData('deviceCode', -1)"
+                                    :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.deviceCode"
+                                    placeholder="请选择设备编码" propsValue="device_code" popupWidth="800px" popupTitle="选择数据"
+                                    popupType="dialog" relationField='device_name' field='deviceCode'
+                                    interfaceId="590497496266971845" :pageSize="20"
+                                    :columnOptions="deviceCodecolumnOptions" clearable :style='{ "width": "100%" }'>
+                                </JnpfPopupSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备名称" prop="deviceName">
+                                <JnpfInput v-model="dataForm.deviceName" @change="changeData('deviceName', -1)"
+                                    placeholder="选择设备后自动带入" disabled clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="顺序号" prop="sort">
+                                <JnpfInputNumber v-model="dataForm.sort" @change="changeData('sort', -1)"
+                                    placeholder="顺序号" :min="1" :step="1">
+                                </JnpfInputNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="班次" prop="post">
+                                <JnpfSelect v-model="dataForm.post" @change="changeData('post', -1)" placeholder="请选择班次"
+                                    clearable :style='{ "width": "100%" }' :options="postOptions" :props="postProps">
+                                </JnpfSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="开始时间" prop="startTime">
+                                <JnpfTimePicker v-model="dataForm.startTime" @change="changeData('startTime', -1)"
+                                    :startTime="time(false, 1, 1, '', 'HH:mm', '')" :endTime="time(false, 1, 1, '', 'HH:mm', '')"
+                                    placeholder="请选择开始时间" clearable :style='{ "width": "100%" }' format="HH:mm">
+                                </JnpfTimePicker>
+                            </jnpf-form-tip-item>
+                        </el-col>
+
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="结束时间" prop="endTime">
+                                <JnpfTimePicker v-model="dataForm.endTime" @change="changeData('endTime', -1)"
+                                    :startTime="time(false, 1, 1, '', 'HH:mm', '')" :endTime="time(false, 1, 1, '', 'HH:mm', '')"
+                                    placeholder="请选择结束时间" clearable :style='{ "width": "100%" }' format="HH:mm">
+                                </JnpfTimePicker>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="产品编码" prop="productCode">
+                                <JnpfInput v-model="dataForm.productCode" @change="changeData('productCode', -1)"
+                                    placeholder="请输入产品编码" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="产品名称" prop="productName">
+                                <JnpfInput v-model="dataForm.productName" @change="changeData('productName', -1)"
+                                    placeholder="请输入产品名称" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="规格型号" prop="models">
+                                <JnpfInput v-model="dataForm.models" @change="changeData('models', -1)"
+                                    placeholder="请输入规格型号" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="计量单位" prop="measurementUnit">
+                                <JnpfInput v-model="dataForm.measurementUnit" @change="changeData('measurementUnit', -1)"
+                                    placeholder="请输入计量单位" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="计量数量" prop="planNumber">
+                                <JnpfInputNumber v-model="dataForm.planNumber" @change="changeData('planNumber', -1)"
+                                    placeholder="请输入计量数量" :step="1">
+                                </JnpfInputNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <!-- 表单结束 -->
+                    </template>
+                </el-form>
+                <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
+                    @select="addForSelect" @close="selectDialogVisible = false" />
+            </el-row>
+        </div>
+    </transition>
+</template>
+
+
+<script>
+import request from '@/utils/request'
+import { mapGetters } from "vuex";
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { getDefaultCurrentValueUserId } from '@/api/permission/user'
+import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
+import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+    components: {},
+    props: [],
+    data() {
+        return {
+            dataFormSubmitType: 0,
+            continueBtnLoading: false,
+            index: 0,
+            prevDis: false,
+            nextDis: false,
+            allList: [],
+            visible: false,
+            loading: false,
+            btnLoading: false,
+            formRef: 'formRef',
+            setting: {},
+            eventType: '',
+            userBoxVisible: false,
+            selectDialogVisible: false,
+            currTableConf: {},
+            dataValueAll: {},
+            addTableConf: {
+            },
+            //可选范围默认值
+            ableAll: {
+            },
+            tableRows: {
+            },
+            Vmodel: "",
+            currVmodel: "",
+            dataForm: {
+                manufactureTime: undefined,
+                deviceCode: undefined,
+                deviceName: undefined,
+                sort: 1,
+                post: "1",
+                startTime: undefined,
+                endTime: undefined,
+                productCode: undefined,
+                productName: undefined,
+                models: undefined,
+                measurementUnit: undefined,
+                planNumber: undefined,
+                version: 0,
+            },
+            tableRequiredData: {},
+            dataRule:
+            {
+                manufactureTime: [
+                    {
+                        required: true,
+                        message: '请选择生产日期',
+                        trigger: 'change'
+                    },
+                ],
+                deviceCode: [
+                    {
+                        required: true,
+                        message: '请选择设备编码',
+                        trigger: 'change'
+                    },
+                ],
+                post: [
+                    {
+                        required: true,
+                        message: '请至少选择一个',
+                        trigger: 'change'
+                    },
+                ],
+                startTime: [
+                    {
+                        required: true,
+                        message: '请选择开始时间',
+                        trigger: 'change'
+                    },
+                ],
+                endTime: [
+                    {
+                        required: true,
+                        message: '请选择结束时间',
+                        trigger: 'change'
+                    },
+                ],
+                productCode: [
+                    {
+                        required: true,
+                        message: '请输入产品编码',
+                        trigger: 'blur'
+                    },
+                ],
+                models: [
+                    {
+                        required: true,
+                        message: '请输入规格型号',
+                        trigger: 'blur'
+                    },
+                ],
+                measurementUnit: [
+                    {
+                        required: true,
+                        message: '请输入计量单位',
+                        trigger: 'blur'
+                    },
+                ],
+                planNumber: [
+                    {
+                        required: true,
+                        message: '请输入计量数量',
+                        trigger: ["blur", "change"]
+                    },
+                ],
+            },
+            deviceCodecolumnOptions: [{ "label": "设备编码", "value": "device_code" }, { "label": "设备名称", "value": "device_name" }, { "label": "设备类型", "value": "device_desc" },],
+            postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季晚班", "id": "2" }],
+            postProps: { "label": "fullName", "value": "id" },
+            childIndex: -1,
+            isEdit: false,
+            interfaceRes: {
+                manufactureTime: [],
+                deviceCode: [],
+                deviceName: [],
+                sort: [],
+                post: [],
+                startTime: [],
+                endTime: [],
+                productCode: [],
+                productName: [],
+                models: [],
+                measurementUnit: [],
+                planNumber: [],
+            },
+        }
+    },
+    computed: {
+        ...mapGetters(['userInfo'])
+    },
+    watch: {},
+    created() {
+        this.dataAll()
+        this.initDefaultData()
+        this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+    },
+    mounted() { },
+    methods: {
+        prev() {
+            this.index--
+            if (this.index === 0) {
+                this.prevDis = true
+            }
+            this.nextDis = false
+            for (let index = 0; index < this.allList.length; index++) {
+                const element = this.allList[index];
+                if (this.index == index) {
+                    this.getInfo(element.id)
+                }
+            }
+        },
+        next() {
+            this.index++
+            if (this.index === this.allList.length - 1) {
+                this.nextDis = true
+            }
+            this.prevDis = false
+            for (let index = 0; index < this.allList.length; index++) {
+                const element = this.allList[index];
+                if (this.index == index) {
+                    this.getInfo(element.id)
+                }
+            }
+        },
+        getInfo(id) {
+            request({
+                url: '/api/example/YysDayPackage/' + id,
+                method: 'get'
+            }).then(res => {
+                this.dataInfo(res.data)
+            });
+        },
+        goBack() {
+            this.visible = false
+            this.$emit('refreshDataList', true)
+        },
+        changeData(model, index) {
+            if (model == 'deviceCode' && this.dataForm.deviceCode != undefined) {
+                request({
+                    url: '/api/example/YysDevice/queryNameByCode/' + this.dataForm.deviceCode,
+                    method: 'get'
+                }).then(res => {
+                    this.dataForm.deviceName = res.msg;
+                });
+            }
+            this.isEdit = false
+            this.childIndex = index
+            let modelAll = model.split("-");
+            let faceMode = "";
+            for (let i = 0; i < modelAll.length; i++) {
+                faceMode += modelAll[i];
+            }
+            for (let key in this.interfaceRes) {
+                if (key != faceMode) {
+                    let faceReList = this.interfaceRes[key]
+                    for (let i = 0; i < faceReList.length; i++) {
+                        if (faceReList[i].relationField == model) {
+                            let options = 'get' + key + 'Options';
+                            if (this[options]) {
+                                this[options]()
+                            }
+                            this.changeData(key, index)
+                        }
+                    }
+                }
+            }
+        },
+        changeDataFormData(type, data, model, index, defaultValue) {
+            if (!this.isEdit) {
+                if (type == 2) {
+                    for (let i = 0; i < this.dataForm[data].length; i++) {
+                        if (index == -1) {
+                            this.dataForm[data][i][model] = defaultValue
+                        } else if (index == i) {
+                            this.dataForm[data][i][model] = defaultValue
+                        }
+                    }
+                } else {
+                    this.dataForm[data] = defaultValue
+                }
+            }
+        },
+        dataAll() {
+        },
+        goBack() {
+            this.$emit('refresh')
+        },
+        clearData() {
+            this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+        },
+        init(id, isDetail, allList) {
+            this.prevDis = false
+            this.nextDis = false
+            this.allList = allList || []
+            if (allList.length) {
+                this.index = this.allList.findIndex(item => item.id === id)
+                if (this.index == 0) {
+                    this.prevDis = true
+                }
+                if (this.index == this.allList.length - 1) {
+                    this.nextDis = true
+                }
+            } else {
+                this.prevDis = true
+                this.nextDis = true
+            }
+            this.dataForm.id = id || 0;
+            this.visible = true;
+            this.$nextTick(() => {
+                if (this.dataForm.id) {
+                    this.loading = true
+                    request({
+                        url: '/api/example/YysDayPackage/' + this.dataForm.id,
+                        method: 'get'
+                    }).then(res => {
+                        this.dataInfo(res.data)
+                        this.loading = false
+                    });
+                } else {
+                    this.clearData()
+                    this.initDefaultData()
+                }
+            });
+            this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+        },
+        //初始化默认数据
+        initDefaultData() {
+
+        },
+        // 表单提交
+        dataFormSubmit(type) {
+            this.dataFormSubmitType = type ? type : 0
+            this.$refs['formRef'].validate((valid) => {
+                if (valid) {
+                    this.request()
+                }
+            })
+        },
+        request() {
+            let _data = this.dataList()
+            if (this.dataFormSubmitType == 2) {
+                this.continueBtnLoading = true
+            } else {
+                this.btnLoading = true
+            }
+            if (!this.dataForm.id) {
+                request({
+                    url: '/api/example/YysDayPackage',
+                    method: 'post',
+                    data: _data
+                }).then((res) => {
+                    this.$message({
+                        message: res.msg,
+                        type: 'success',
+                        duration: 1000,
+                        onClose: () => {
+                            if (this.dataFormSubmitType == 2) {
+                                this.$nextTick(() => {
+                                    this.clearData()
+                                    this.initDefaultData()
+                                })
+                                this.continueBtnLoading = false
+                                return
+                            }
+                            this.visible = false
+                            this.btnLoading = false
+                            this.$emit('refresh', true)
+                        }
+                    })
+                }).catch(() => {
+                    this.btnLoading = false
+                    this.continueBtnLoading = false
+                })
+            } else {
+                request({
+                    url: '/api/example/YysDayPackage/' + this.dataForm.id,
+                    method: 'PUT',
+                    data: _data
+                }).then((res) => {
+                    this.$message({
+                        message: res.msg,
+                        type: 'success',
+                        duration: 1000,
+                        onClose: () => {
+                            if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+                            this.visible = false
+                            this.btnLoading = false
+                            this.$emit('refresh', true)
+                        }
+                    })
+                }).catch(() => {
+                    this.btnLoading = false
+                    this.continueBtnLoading = false
+                })
+            }
+        },
+        openSelectDialog(key) {
+            this.currTableConf = this.addTableConf[key]
+            this.currVmodel = key
+            this.selectDialogVisible = true
+            this.$nextTick(() => {
+                this.$refs.selectDialog.init()
+            })
+        },
+        addForSelect(data) {
+            for (let i = 0; i < data.length; i++) {
+                let t = data[i]
+                if (this['get' + this.currVmodel]) {
+                    this['get' + this.currVmodel](t)
+                }
+            }
+        },
+        dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+            let timeDataValue = null;
+            let timeValue = Number(timeValueData)
+            if (timeRule) {
+                if (timeType == 1) {
+                    timeDataValue = timeValue
+                } else if (timeType == 2) {
+                    timeDataValue = dataValue
+                } else if (timeType == 3) {
+                    timeDataValue = new Date().getTime()
+                } else if (timeType == 4) {
+                    let previousDate = '';
+                    if (timeTarget == 1 || timeTarget == 2) {
+                        previousDate = getDateDay(timeTarget, timeType, timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else if (timeTarget == 3) {
+                        previousDate = getBeforeData(timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else {
+                        timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+                    }
+                } else if (timeType == 5) {
+                    let previousDate = '';
+                    if (timeTarget == 1 || timeTarget == 2) {
+                        previousDate = getDateDay(timeTarget, timeType, timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else if (timeTarget == 3) {
+                        previousDate = getLaterData(timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else {
+                        timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
+                    }
+                }
+            }
+            return timeDataValue;
+        },
+        time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+            let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+            let timeDataValue = null
+            if (timeRule) {
+                if (timeType == 1) {
+                    timeDataValue = timeValue || '00:00:00'
+                    if (timeDataValue.split(':').length == 3) {
+                        timeDataValue = timeDataValue
+                    } else {
+                        timeDataValue = timeDataValue + ':00'
+                    }
+                } else if (timeType == 2) {
+                    timeDataValue = dataValue
+                } else if (timeType == 3) {
+                    timeDataValue = this.jnpf.toDate(new Date(), format)
+                } else if (timeType == 4) {
+                    let previousDate = '';
+                    previousDate = getBeforeTime(timeTarget, timeValue)
+                    timeDataValue = this.jnpf.toDate(previousDate, format)
+                } else if (timeType == 5) {
+                    let previousDate = '';
+                    previousDate = getLaterTime(timeTarget, timeValue)
+                    timeDataValue = this.jnpf.toDate(previousDate, format)
+                }
+            }
+            return timeDataValue;
+        },
+        dataList() {
+            var _data = this.dataForm;
+            return _data;
+        },
+        dataInfo(dataAll) {
+            let _dataAll = dataAll
+            this.dataForm = _dataAll
+            this.isEdit = true
+            this.dataAll()
+            this.childIndex = -1
+        },
+    },
+}
+
+</script>

jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/index.vue

@@ -0,0 +1,537 @@
+
+
+
+
+
+
+
+<template>
+    <div class="JNPF-common-layout">
+        <div class="JNPF-common-layout-center">
+            <el-row class="JNPF-common-search-box" :gutter="16">
+                <el-form @submit.native.prevent>
+                            <el-col :span="6">
+                                <el-form-item label="生产日期">
+                                        <JnpfDateRangePicker v-model="query.manufactureTime"
+                                                             format="yyyy-MM-dd" startPlaceholder="开始日期"
+                                                             endPlaceholder="结束日期" >
+                                        </JnpfDateRangePicker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="产品编码">
+                                        <el-input v-model="query.productCode" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="产品名称">
+                                        <el-input v-model="query.productName" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                        <template v-if="showAll">
+                                    <el-col :span="6">
+                                        <el-form-item label="设备名称">
+                                                <el-input v-model="query.deviceName" placeholder="请输入" clearable>  </el-input>
+                                        </el-form-item>
+                                    </el-col>
+                        </template>
+                    <el-col :span="6">
+                        <el-form-item>
+                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+                                <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
+                                    展开
+                                </el-button>
+                                <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
+                                    收起
+                                </el-button>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <div class="JNPF-common-layout-main JNPF-flex-main">
+                <div class="JNPF-common-head">
+                    <div>
+                                    <el-button type="primary" icon="icon-ym icon-ym-btn-add"  @click="addOrUpdateHandle()">新增
+                                    </el-button>
+                                    <el-button type="success" icon="icon-ym icon-ym-btn-download" @click="exportData()" >导出
+                                    </el-button>
+                                    <el-button type="success" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()" >导入
+                                    </el-button>
+                    </div>
+                    <div class="JNPF-common-head-right">
+                            <el-tooltip content="高级查询" placement="top" v-if="true">
+                                <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                                         @click="openSuperQuery()" />
+                            </el-tooltip>
+                            <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
+                                <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                                         @click="initData()" />
+                            </el-tooltip>
+                    </div>
+                </div>
+                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
+ :span-method="arraySpanMethod"  
+
+>
+                                                <el-table-column
+                                                            prop="manufactureTime"
+ label="生产日期"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="deviceCode"
+ label="设备编码"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="deviceName"
+ label="设备名称"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="sort"
+ label="顺序号"  align="left"
+ >
+                                                        <template slot-scope="scope"   v-if="scope.row.sort" >
+                                                            <JnpfNumber v-model="scope.row.sort" :thousands="false"/>
+                                                        </template>
+                                                </el-table-column>
+                                        <el-table-column label="班次"  prop="post" algin="left"
+ >
+                                            <template slot-scope="scope">
+                                                {{ scope.row.post}}
+                                            </template>
+                                        </el-table-column>
+                                                <el-table-column
+                                                            prop="startTime"
+ label="开始时间"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="endTime"
+ label="结束时间"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="productCode"
+ label="产品编码"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="productName"
+ label="产品名称"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="models"
+ label="规格型号"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="measurementUnit"
+ label="计量单位"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="planNumber"
+ label="计量数量"  align="left"
+ >
+                                                        <template slot-scope="scope"   v-if="scope.row.planNumber" >
+                                                            <JnpfNumber v-model="scope.row.planNumber" :thousands="false"/>
+                                                        </template>
+                                                </el-table-column>
+                        <el-table-column label="操作"
+ fixed="right" width="150" >
+                            <template slot-scope="scope"  >
+                                            <el-button type="text"
+                                                       @click="addOrUpdateHandle(scope.row)" >编辑
+                                            </el-button>
+                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
+                                        </el-button>
+                                        <el-button type="text"  
+                                                   @click="goDetail(scope.row.id)">详情
+                                        </el-button>
+                            </template>
+                        </el-table-column>
+                </JNPF-table>
+                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
+             </div>
+        </div>
+        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
+        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
+
+
+
+
+        <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
+        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+        <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+            <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+                        @superQuery="superQuery" />
+    </div>
+</template>
+
+<script>
+
+    import request from '@/utils/request'
+    import {mapGetters} from "vuex";
+    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
+    import JNPFForm from './form'
+    import Detail from './Detail'
+    import ExportBox from '@/components/ExportBox'
+    import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
+    import { getConfigData } from '@/api/onlineDev/visualDev'
+    import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
+    import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
+            import columnList from './columnList'
+    import { thousandsFormat } from "@/components/Generator/utils/index"
+        import SuperQuery from '@/components/SuperQuery'
+        import superQueryJson from './superQueryJson'
+
+    export default {
+        components: {
+                JNPFForm,
+                Detail,
+ ExportBox,ToFormDetail , SuperQuery
+        },
+        data() {
+            return {
+
+                keyword:'',
+                expandsTree: true,
+                refreshTree: true,
+                toFormDetailVisible:false,
+                                expandObj:{},
+                columnOptions: [],
+                mergeList: [],
+                exportList:[],
+                    columnList,
+
+                    showAll: false,
+                    superQueryVisible: false,
+                    superQueryJson,
+                uploadBoxVisible: false,
+                detailVisible: false,
+                query: {
+                        manufactureTime:undefined,
+                        productCode:undefined,
+                        productName:undefined,
+                        deviceName:undefined,
+            },
+            treeProps: {
+                    children: 'children',
+                    label: 'fullName',
+                    value: 'id',
+                    isLeaf: 'isLeaf'
+            },
+            list: [],
+            listLoading: true,
+                    total: 0,
+            queryData: {},
+            listQuery: {
+                    superQueryJson: '',
+                        currentPage: 1,
+                        pageSize: 20,
+                sort: "desc",
+                        sidx: "post",
+            },
+            formVisible: false,
+            flowVisible: false,
+            flowListVisible: false,
+            flowList: [],
+            exportBoxVisible: false,
+                                                                                                                                                                postOptions:[{"fullName":"旺季白班","id":"1"},{"fullName":"旺季晚班","id":"2"}],
+                        postProps:{"label":"fullName","value":"id"  },
+            interfaceRes: {
+                        deviceCode:[] ,
+                },
+            }
+        },
+        computed: {
+            ...mapGetters(['userInfo']),
+            menuId() {
+                return this.$route.meta.modelId || ''
+            }
+        },
+        created() {
+                        this.getColumnList(),
+                this.initSearchDataAndListData()
+            this.queryData = JSON.parse(JSON.stringify(this.query))
+        },
+        methods: {
+            toDetail(defaultValue, modelId) {
+                if (!defaultValue) return
+                getConfigData(modelId).then(res => {
+                    if (!res.data || !res.data.formData) return
+                    let formData = JSON.parse(res.data.formData)
+                    formData.popupType = 'general'
+                    this.toFormDetailVisible = true
+                    this.$nextTick(() => {
+                        this.$refs.toFormDetail.init(formData, modelId, defaultValue)
+                    })
+                })
+            },
+            toggleTreeExpand(expands) {
+                this.refreshTree = false
+                this.expandsTree = expands
+                this.$nextTick(() => {
+                    this.refreshTree = true
+                    this.$nextTick(() => {
+                        this.$refs.treeBox.setCurrentKey(null)
+                    })
+                })
+            },
+            filterNode(value, data) {
+                if (!value) return true;
+                return data[this.treeProps.label].indexOf(value) !== -1;
+            },
+            loadNode(node, resolve) {
+                const nodeData = node.data
+                const config ={
+                    treeInterfaceId:"",
+                    treeTemplateJson:[]
+                }
+                if (config.treeInterfaceId) {
+                    //这里是为了拿到参数中关联的字段的值，后端自行拿
+                    if (config.treeTemplateJson && config.treeTemplateJson.length) {
+                        for (let i = 0; i < config.treeTemplateJson.length; i++) {
+                            const element = config.treeTemplateJson[i];
+                            element.defaultValue = nodeData[element.relationField] || ''
+                        }
+                    }
+                    //参数
+                    let query = {
+                        paramList: config.treeTemplateJson || [],
+                    }
+                    //接口
+                    getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+                        let data = res.data
+                        if (Array.isArray(data)) {
+                            resolve(data);
+                        } else {
+                            resolve([]);
+                        }
+                    })
+                }
+            },
+                        getColumnList() {
+                    // 没有开启权限
+                    this.columnOptions = this.transformColumnList(this.columnList)
+            },
+            transformColumnList(columnList) {
+                let list = []
+                for (let i = 0; i < columnList.length; i++) {
+                    const e = columnList[i];
+                    if (!e.prop.includes('-')) {
+                        list.push(e)
+                    } else {
+                        let prop = e.prop.split('-')[0]
+                        let label = e.label.split('-')[0]
+                        let vModel = e.prop.split('-')[1]
+                        let newItem = {
+                            align: "center",
+                            jnpfKey: "table",
+                            prop,
+                            label,
+                            children: []
+                        }
+                        e.vModel = vModel
+                        if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
+                        if (!list.some(o => o.prop === prop)) list.push(newItem)
+                        for (let i = 0; i < list.length; i++) {
+                            if (list[i].prop === prop) {
+                                list[i].children.push(e)
+                                break
+                            }
+                        }
+                    }
+                }
+                this.getMergeList(list)
+                this.getExportList(list)
+                return list
+            },
+            arraySpanMethod({ column }) {
+                for (let i = 0; i < this.mergeList.length; i++) {
+                    if (column.property == this.mergeList[i].prop) {
+                        return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
+                    }
+                }
+            },
+            getMergeList(list) {
+                let newList = JSON.parse(JSON.stringify(list))
+                newList.forEach(item => {
+                    if (item.children && item.children.length) {
+                        let child = {
+                            prop: item.prop + '-child-first'
+                        }
+                        item.children.unshift(child)
+                    }
+                })
+                newList.forEach(item => {
+                    if (item.children && item.children.length ) {
+                        item.children.forEach((child, index) => {
+                            if (index == 0) {
+                                this.mergeList.push({
+                                    prop: child.prop,
+                                    rowspan: 1,
+                                    colspan: item.children.length
+                                })
+                            } else {
+                                this.mergeList.push({
+                                    prop: child.prop,
+                                    rowspan: 0,
+                                    colspan: 0
+                                })
+                            }
+                        })
+                    } else {
+                        this.mergeList.push({
+                            prop: item.prop,
+                            rowspan: 1,
+                            colspan: 1
+                        })
+                    }
+                })
+            },
+            getExportList(list) {
+                let exportList = []
+                for (let i = 0; i < list.length; i++) {
+                    if (list[i].jnpfKey === 'table') {
+                        for (let j = 0; j < list[i].children.length; j++) {
+                            exportList.push(list[i].children[j])
+                        }
+                    } else {
+                        exportList.push(list[i])
+                    }
+                }
+                this.exportList = exportList
+            },
+            goDetail(id){
+                this.detailVisible = true
+                this.$nextTick(() => {
+                    this.$refs.Detail.init(id)
+                })
+            },
+            sortChange({column, prop, order}) {
+                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+                this.listQuery.sidx = !order ? '' : prop
+                this.initData()
+            },
+            async initSearchDataAndListData() {
+                await this.initSearchData()
+                this.initData()
+            },
+            //初始化查询的默认数据
+            async initSearchData() {
+            },
+            initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query,
+                        keyword: this.keyword,
+                        dataType: 0,
+                    menuId:this.menuId,
+                    moduleId:'590536677781408453',
+                    type:1,
+                };
+                request({
+                    url: `/api/example/YysDayPackage/getList`,
+                    method: 'post',
+                    data: _query
+                }).then(res => {
+                    var _list =res.data.list;
+                                            this.list = _list.map(o => ({
+                            ...o,
+                            ...this.expandObj,
+                        }))
+                            this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+            handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/example/YysDayPackage/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+            handelUpload(){
+                this.uploadBoxVisible = true
+                this.$nextTick(() => {
+                    this.$refs.UploadBox.init("","example/YysDayPackage")
+                })
+            },
+                openSuperQuery() {
+                    this.superQueryVisible = true
+                    this.$nextTick(() => {
+                        this.$refs.SuperQuery.init()
+                    })
+                },
+                superQuery(queryJson) {
+                    this.listQuery.superQueryJson = queryJson
+                    this.listQuery.currentPage = 1
+                    this.initData()
+                },
+            addOrUpdateHandle(row, isDetail) {
+                let id = row?row.id:""
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.JNPFForm.init(id, isDetail,this.list)
+                })
+            },
+            exportData() {
+                this.exportBoxVisible = true
+                this.$nextTick(() => {
+                    this.$refs.ExportBox.init(this.exportList)
+                })
+            },
+            download(data) {
+                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
+                request({
+                    url: `/api/example/YysDayPackage/Actions/Export`,
+                    method: 'post',
+                    data: query
+                }).then(res => {
+                    if (!res.data.url) return
+                    this.jnpf.downloadFile(res.data.url)
+                    this.$refs.ExportBox.visible = false
+                    this.exportBoxVisible = false
+                })
+            },
+            search() {
+                    this.listQuery.currentPage=1
+                        this.listQuery.pageSize=20
+                    this.listQuery.sort="desc"
+                this.listQuery.sidx="post"
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                this.query = JSON.parse(JSON.stringify(this.queryData))
+                this.search()
+            },
+            colseFlow(isrRefresh) {
+                this.flowVisible = false
+                if (isrRefresh) this.reset()
+            },
+        }
+    }
+</script>