month

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

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

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

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

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

@@ -0,0 +1,347 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.YysPackageReportMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.yyspackagereport.*;
+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;
+/**
+ *
+ * yysPackageReport
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-08-07
+ */
+@Service
+public class YysPackageReportServiceImpl extends ServiceImpl<YysPackageReportMapper, YysPackageReportEntity> implements YysPackageReportService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Override
+    public List<YysPackageReportEntity> getList(YysPackageReportPagination yysPackageReportPagination){
+        return getTypeList(yysPackageReportPagination,yysPackageReportPagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<YysPackageReportEntity> getTypeList(YysPackageReportPagination yysPackageReportPagination,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 ? YysPackageReportConstant.getAppColumnData() : YysPackageReportConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int yysPackageReportNum =0;
+        QueryWrapper<YysPackageReportEntity> yysPackageReportQueryWrapper=new QueryWrapper<>();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(yysPackageReportPagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = yysPackageReportPagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<YysPackageReportEntity> yysPackageReportSuperWrapper = new QueryWrapper<>();
+            yysPackageReportSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysPackageReportSuperWrapper,YysPackageReportEntity.class,queryJson,"0"));
+            int yysPackageReportNum1 = yysPackageReportSuperWrapper.getExpression().getNormal().size();
+            if (yysPackageReportNum1>0){
+                List<String> yysPackageReportList =this.list(yysPackageReportSuperWrapper).stream().map(YysPackageReportEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(yysPackageReportList);
+                intersectionSuperList.add(yysPackageReportList);
+                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<YysPackageReportEntity> yysPackageReportSuperWrapper = new QueryWrapper<>();
+            yysPackageReportSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysPackageReportSuperWrapper,YysPackageReportEntity.class,ruleJson,"0"));
+            int yysPackageReportNum1 = yysPackageReportSuperWrapper.getExpression().getNormal().size();
+            if (yysPackageReportNum1>0){
+                List<String> yysPackageReportList =this.list(yysPackageReportSuperWrapper).stream().map(YysPackageReportEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(yysPackageReportList);
+                intersectionRuleList.add(yysPackageReportList);
+                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 yysPackageReportObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysPackageReportQueryWrapper,YysPackageReportEntity.class,yysPackageReportPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(yysPackageReportObj)){
+        return new ArrayList<>();
+        } else {
+        yysPackageReportQueryWrapper = (QueryWrapper<YysPackageReportEntity>)yysPackageReportObj;
+        if( yysPackageReportQueryWrapper.getExpression().getNormal().size()>0){
+        yysPackageReportNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object yysPackageReportObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysPackageReportQueryWrapper,YysPackageReportEntity.class,yysPackageReportPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(yysPackageReportObj)){
+        return new ArrayList<>();
+        } else {
+        yysPackageReportQueryWrapper = (QueryWrapper<YysPackageReportEntity>)yysPackageReportObj;
+        if( yysPackageReportQueryWrapper.getExpression().getNormal().size()>0){
+        yysPackageReportNum++;
+        }
+        }
+
+
+    }
+    }
+        if(isPc){
+            if(ObjectUtil.isNotEmpty(yysPackageReportPagination.getManufactureTime())){
+            yysPackageReportNum++;
+
+                List ManufactureTimeList =  JsonUtil.getJsonToList(yysPackageReportPagination.getManufactureTime(),String.class);
+                    Long fir = Long.valueOf(String.valueOf(ManufactureTimeList.get(0)));
+                    Long sec = Long.valueOf(String.valueOf(ManufactureTimeList.get(1)));
+
+                    yysPackageReportQueryWrapper.lambda().ge(YysPackageReportEntity::getManufactureTime, new Date(fir))
+                    .le(YysPackageReportEntity::getManufactureTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
+
+
+            }
+
+            if(ObjectUtil.isNotEmpty(yysPackageReportPagination.getProductName())){
+            yysPackageReportNum++;
+
+                String value = yysPackageReportPagination.getProductName() instanceof List ?
+                    JsonUtil.getObjectToString(yysPackageReportPagination.getProductName()) :
+                    String.valueOf(yysPackageReportPagination.getProductName());
+                yysPackageReportQueryWrapper.lambda().like(YysPackageReportEntity::getProductName,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(yysPackageReportPagination.getProductCode())){
+            yysPackageReportNum++;
+
+                String value = yysPackageReportPagination.getProductCode() instanceof List ?
+                    JsonUtil.getObjectToString(yysPackageReportPagination.getProductCode()) :
+                    String.valueOf(yysPackageReportPagination.getProductCode());
+                yysPackageReportQueryWrapper.lambda().like(YysPackageReportEntity::getProductCode,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(yysPackageReportPagination.getDeviceName())){
+            yysPackageReportNum++;
+
+                String value = yysPackageReportPagination.getDeviceName() instanceof List ?
+                    JsonUtil.getObjectToString(yysPackageReportPagination.getDeviceName()) :
+                    String.valueOf(yysPackageReportPagination.getDeviceName());
+                yysPackageReportQueryWrapper.lambda().like(YysPackageReportEntity::getDeviceName,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(yysPackageReportPagination.getStatus())){
+            yysPackageReportNum++;
+
+        List<String> idList = new ArrayList<>();
+        try {
+        String[][] status = JsonUtil.getJsonToBean(yysPackageReportPagination.getStatus(),String[][].class);
+        for(int i=0;i<status.length;i++){
+        if(status[i].length>0){
+        idList.add(JsonUtil.getObjectToString(Arrays.asList(status[i])));
+        }
+        }
+        }catch (Exception e1){
+        try {
+        List<String> status = JsonUtil.getJsonToList(yysPackageReportPagination.getStatus(),String.class);
+        if(status.size()>0){
+            idList.addAll(status);
+        }
+        }catch (Exception e2){
+        idList.add(String.valueOf(yysPackageReportPagination.getStatus()));
+        }
+        }
+        yysPackageReportQueryWrapper.lambda().and(t->{
+        idList.forEach(tt->{
+        t.like(YysPackageReportEntity::getStatus, tt).or();
+        });
+        });
+
+            }
+
+        }
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            yysPackageReportQueryWrapper.lambda().in(YysPackageReportEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            yysPackageReportQueryWrapper.lambda().and(t->t.in(YysPackageReportEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            yysPackageReportQueryWrapper.lambda().and(t->t.in(YysPackageReportEntity::getId, finalAllRuleIDlist));
+        }
+        //假删除标志
+        yysPackageReportQueryWrapper.lambda().isNull(YysPackageReportEntity::getDeleteMark);
+
+        //排序
+        if(StringUtil.isEmpty(yysPackageReportPagination.getSidx())){
+            yysPackageReportQueryWrapper.lambda().orderByDesc(YysPackageReportEntity::getId);
+        }else{
+            try {
+                String sidx = yysPackageReportPagination.getSidx();
+                String[] strs= sidx.split("_name");
+                YysPackageReportEntity yysPackageReportEntity = new YysPackageReportEntity();
+                Field declaredField = yysPackageReportEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                yysPackageReportQueryWrapper="asc".equals(yysPackageReportPagination.getSort().toLowerCase())?yysPackageReportQueryWrapper.orderByAsc(value):yysPackageReportQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<YysPackageReportEntity> page=new Page<>(yysPackageReportPagination.getCurrentPage(), yysPackageReportPagination.getPageSize());
+                IPage<YysPackageReportEntity> userIPage=this.page(page, yysPackageReportQueryWrapper);
+                return yysPackageReportPagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<YysPackageReportEntity> list = new ArrayList();
+                return yysPackageReportPagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(yysPackageReportQueryWrapper);
+        }
+    }
+    @Override
+    public YysPackageReportEntity getInfo(String id){
+        QueryWrapper<YysPackageReportEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(YysPackageReportEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(YysPackageReportEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, YysPackageReportEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(YysPackageReportEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(YysPackageReportForm 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.getDeviceName())){
+                    return "设备名称不能为空";
+                }
+                if(StringUtil.isEmpty(form.getProductCode())){
+                    return "产品编码不能为空";
+                }
+                if(StringUtil.isEmpty(form.getProductName())){
+                    return "产品名称不能为空";
+                }
+                if(StringUtil.isEmpty(form.getModels())){
+                    return "规格型号不能为空";
+                }
+                if(StringUtil.isEmpty(form.getMeasurementUnit())){
+                    return "计量单位不能为空";
+                }
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param yysPackageReportForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(YysPackageReportForm yysPackageReportForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        yysPackageReportForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(YysPackageReportConstant.getFormData(),yysPackageReportForm),YysPackageReportForm.class);
+        YysPackageReportEntity entity = JsonUtil.getJsonToBean(yysPackageReportForm, YysPackageReportEntity.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/YysPackageReportController.java

@@ -0,0 +1,393 @@
+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.yyspackagereport.*;
+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;
+
+/**
+ * yysPackageReport
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-07
+ */
+@Slf4j
+@RestController
+@Tag(name = "yysPackageReport" , description = "example")
+@RequestMapping("/api/example/YysPackageReport")
+public class YysPackageReportController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private YysPackageReportService yysPackageReportService;
+
+
+
+    @Autowired
+    private ConfigValueUtil configValueUtil;
+
+    /**
+    * 列表
+    *
+    * @param yysPackageReportPagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody YysPackageReportPagination yysPackageReportPagination)throws IOException{
+        List<YysPackageReportEntity> list= yysPackageReportService.getList(yysPackageReportPagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (YysPackageReportEntity entity : list) {
+        Map<String, Object> yysPackageReportMap=JsonUtil.entityToMap(entity);
+        yysPackageReportMap.put("id", yysPackageReportMap.get("id"));
+        //副表数据
+        //子表数据
+            realList.add(yysPackageReportMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, YysPackageReportConstant.getFormData(), YysPackageReportConstant.getColumnData(), yysPackageReportPagination.getModuleId(),false);
+
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(yysPackageReportPagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 导出Excel
+    *
+    * @return
+    */
+    @Operation(summary = "导出Excel")
+    @PostMapping("/Actions/Export")
+    public ActionResult Export(@RequestBody YysPackageReportPagination yysPackageReportPagination) throws IOException {
+        if (StringUtil.isEmpty(yysPackageReportPagination.getSelectKey())){
+            return ActionResult.fail("请选择导出字段");
+        }
+        List<YysPackageReportEntity> list= yysPackageReportService.getList(yysPackageReportPagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (YysPackageReportEntity entity : list) {
+        Map<String, Object> yysPackageReportMap=JsonUtil.entityToMap(entity);
+        yysPackageReportMap.put("id", yysPackageReportMap.get("id"));
+        //副表数据
+        //子表数据
+            realList.add(yysPackageReportMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, YysPackageReportConstant.getFormData(), YysPackageReportConstant.getColumnData(), yysPackageReportPagination.getModuleId(),false);
+        String[]keys=!StringUtil.isEmpty(yysPackageReportPagination.getSelectKey())?yysPackageReportPagination.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 "steatTime" :
+                    entitys.add(new ExcelExportEntity("开始时间" ,"steatTime"));
+                    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 "planNum" :
+                    entitys.add(new ExcelExportEntity("计划数量" ,"planNum"));
+                    break;
+                    case "acquisitionNum" :
+                    entitys.add(new ExcelExportEntity("数采数量" ,"acquisitionNum"));
+                    break;
+                    case "defectiveNum" :
+                    entitys.add(new ExcelExportEntity("次品数量" ,"defectiveNum"));
+                    break;
+                    case "qualifiedNum" :
+                    entitys.add(new ExcelExportEntity("合格数量" ,"qualifiedNum"));
+                    break;
+                    case "compensatoryHour" :
+                    entitys.add(new ExcelExportEntity("补偿工时" ,"compensatoryHour"));
+                    break;
+                    case "reportGroup" :
+                    entitys.add(new ExcelExportEntity("报工班组" ,"reportGroup"));
+                    break;
+                    case "reportMember" :
+                    entitys.add(new ExcelExportEntity("报工成员" ,"reportMember"));
+                    break;
+                    case "status" :
+                    entitys.add(new ExcelExportEntity("确认状态" ,"status"));
+                    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(YysPackageReportConstant.getColumnData(), ColumnDataModel.class);
+                List<HeaderModel> complexHeaderList = columnDataModel.getComplexHeaderList();
+                if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) {
+                    entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList);
+                    dataList =  VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList);
+                }
+
+                workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList);
+            }
+            String fileName = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
+            MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName);
+            String temporaryFilePath = configValueUtil.getTemporaryFilePath();
+            FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName);
+            vo.setName(fileInfo.getFilename());
+            vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName);
+        } catch (Exception e) {
+            log.error("信息导出Excel错误:{}", e.getMessage());
+            e.printStackTrace();
+        }
+        return vo;
+    }
+    /**
+    * 批量删除
+    * @param ids
+    * @return
+    */
+    @DeleteMapping("/batchRemove")
+    @Transactional
+    @Operation(summary = "批量删除")
+    public ActionResult batchRemove(@RequestBody String ids){
+        List<String> idList = JsonUtil.getJsonToList(ids, String.class);
+        int i =0;
+        for (String allId : idList){
+            this.delete(allId);
+            i++;
+        }
+        if (i == 0 ){
+        return ActionResult.fail("删除失败");
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 创建
+    *
+    * @param yysPackageReportForm
+    * @return
+    */
+    @PostMapping()
+    @Operation(summary = "创建")
+    public ActionResult create(@RequestBody @Valid YysPackageReportForm yysPackageReportForm) {
+        String b = yysPackageReportService.checkForm(yysPackageReportForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            yysPackageReportService.saveOrUpdate(yysPackageReportForm, null ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param yysPackageReportForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid YysPackageReportForm yysPackageReportForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        yysPackageReportForm.setId(id);
+        if (!isImport) {
+            String b =  yysPackageReportService.checkForm(yysPackageReportForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        YysPackageReportEntity entity= yysPackageReportService.getInfo(id);
+        if(entity!=null){
+            try{
+                yysPackageReportService.saveOrUpdate(yysPackageReportForm,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){
+        YysPackageReportEntity entity= yysPackageReportService.getInfo(id);
+        if(entity!=null){
+            //假删除
+            entity.setDeleteMark(1);
+            yysPackageReportService.update(id,entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        YysPackageReportEntity entity= yysPackageReportService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> yysPackageReportMap=JsonUtil.entityToMap(entity);
+        yysPackageReportMap.put("id", yysPackageReportMap.get("id"));
+        //副表数据
+        //子表数据
+        yysPackageReportMap = generaterSwapUtil.swapDataDetail(yysPackageReportMap,YysPackageReportConstant.getFormData(),"590884575421402309",false);
+        return ActionResult.success(yysPackageReportMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        YysPackageReportEntity entity= yysPackageReportService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> yysPackageReportMap=JsonUtil.entityToMap(entity);
+        yysPackageReportMap.put("id", yysPackageReportMap.get("id"));
+        //副表数据
+        //子表数据
+        yysPackageReportMap = generaterSwapUtil.swapDataForm(yysPackageReportMap,YysPackageReportConstant.getFormData(),YysPackageReportConstant.TABLEFIELDKEY,YysPackageReportConstant.TABLERENAMES);
+        return ActionResult.success(yysPackageReportMap);
+    }
+
+}

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

@@ -0,0 +1,84 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+import java.math.BigDecimal;
+/**
+ * 
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-07
+ */
+@Data
+@TableName("yys_package_report")
+public class YysPackageReportEntity  {
+    @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 = "STEAT_TIME" , updateStrategy = FieldStrategy.IGNORED)
+    private String steatTime;
+    @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_NUM" , updateStrategy = FieldStrategy.IGNORED)
+    private String planNum;
+    @TableField(value = "ACQUISITION_NUM" , updateStrategy = FieldStrategy.IGNORED)
+    private String acquisitionNum;
+    @TableField(value = "DEFECTIVE_NUM" , updateStrategy = FieldStrategy.IGNORED)
+    private String defectiveNum;
+    @TableField(value = "QUALIFIED_NUM" , updateStrategy = FieldStrategy.IGNORED)
+    private String qualifiedNum;
+    @TableField(value = "COMPENSATORY_HOUR" , updateStrategy = FieldStrategy.IGNORED)
+    private BigDecimal compensatoryHour;
+    @TableField(value = "REPORT_GROUP" , updateStrategy = FieldStrategy.IGNORED)
+    private String reportGroup;
+    @TableField(value = "REPORT_MEMBER" , updateStrategy = FieldStrategy.IGNORED)
+    private String reportMember;
+    @TableField(value = "STATUS" , updateStrategy = FieldStrategy.IGNORED)
+    private String status;
+    @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/yyspackagereport/YysPackageReportForm.java

@@ -0,0 +1,80 @@
+package jnpf.model.yyspackagereport;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * yysPackageReport
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-07
+ */
+@Data
+public class YysPackageReportForm  {
+    /** 主键 */
+    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("steatTime")
+    private String steatTime;
+    /** 结束时间 **/
+    @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("planNum")
+    private BigDecimal planNum;
+    /** 数采数量 **/
+    @JsonProperty("acquisitionNum")
+    private BigDecimal acquisitionNum;
+    /** 次品数量 **/
+    @JsonProperty("defectiveNum")
+    private BigDecimal defectiveNum;
+    /** 合格数量 **/
+    @JsonProperty("qualifiedNum")
+    private BigDecimal qualifiedNum;
+    /** 补偿工时 **/
+    @JsonProperty("compensatoryHour")
+    private BigDecimal compensatoryHour;
+    /** 报工班组 **/
+    @JsonProperty("reportGroup")
+    private String reportGroup;
+    /** 报工成员 **/
+    @JsonProperty("reportMember")
+    private Object reportMember;
+    /** 确认状态 **/
+    @JsonProperty("status")
+    private Object status;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yyspackagereport/YysPackageReportPagination.java

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

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

@@ -0,0 +1,245 @@
+<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="steatTime"  >
+                        <p>{{dataForm.steatTime}}</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="planNum"  >
+                    <JnpfNumber    v-model="dataForm.planNum"
+ placeholder="计划数量"  disabled
+ :step="1"  >
+                </JnpfNumber>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="数采数量"
+ prop="acquisitionNum"  >
+                    <JnpfNumber    v-model="dataForm.acquisitionNum"
+ placeholder="数采数量"  disabled
+ :step="1"  >
+                </JnpfNumber>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="次品数量"
+ prop="defectiveNum"  >
+                    <JnpfNumber    v-model="dataForm.defectiveNum"
+ placeholder="次品数量"  disabled
+ :step="1"  >
+                </JnpfNumber>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="合格数量"
+ prop="qualifiedNum"  >
+                    <JnpfNumber    v-model="dataForm.qualifiedNum"
+ placeholder="合格数量"  disabled
+ :step="1"  >
+                </JnpfNumber>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="补偿工时"
+ prop="compensatoryHour"  >
+                    <JnpfNumber    v-model="dataForm.compensatoryHour"
+ placeholder="数字文本"  disabled
+ :step="1"  :precision="1"  >
+                </JnpfNumber>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="报工班组"
+ prop="reportGroup"  >
+                        <p>{{dataForm.reportGroup}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="报工成员"
+ prop="reportMember"  >
+                        <p>{{dataForm.reportMember}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="确认状态"
+ prop="status"  >
+                         <p>{{ dataForm.status }} </p>
+                </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",
+                            steatTime : '',
+                            endTime : '',
+                            productCode : '',
+                            productName : '',
+                            models : '',
+                            measurementUnit : '',
+                            planNum : 0,
+                            acquisitionNum : 0,
+                            defectiveNum : 0,
+                            qualifiedNum : 0,
+                            compensatoryHour : 0,
+                            reportGroup : "",
+                            reportMember : [],
+                            status : "1",
+            },
+                            postOptions:[{"fullName":"旺季白班","id":"1"},{"fullName":"旺季夜班","id":"2"}],
+                        postProps:{"label":"fullName","value":"id"  },
+                            statusOptions:[{"fullName":"待确认","id":"1"},{"fullName":"已确认","id":"2"}],
+                        statusProps:{"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/yyspackagereport/detail/'+this.dataForm.id,
+                            method: 'get'
+                        }).then(res => {
+                            this.dataInfo(res.data)
+                            this.loading = false
+                        })
+                    }
+
+                })
+            },
+        },
+    }
+
+</script>

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

@@ -0,0 +1,668 @@
+<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-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_code' 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="steatTime">
+                                <JnpfTimePicker v-model="dataForm.steatTime" @change="changeData('steatTime', -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="planNum">
+                                <JnpfInputNumber v-model="dataForm.planNum" @change="changeData('planNum', -1)"
+                                    placeholder="计划数量" :step="1">
+                                </JnpfInputNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="数采数量" prop="acquisitionNum">
+                                <JnpfInputNumber v-model="dataForm.acquisitionNum"
+                                    @change="changeData('acquisitionNum', -1)" placeholder="数采数量" :step="1">
+                                </JnpfInputNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="次品数量" prop="defectiveNum">
+                                <JnpfInputNumber v-model="dataForm.defectiveNum" @change="changeData('defectiveNum', -1)"
+                                    placeholder="次品数量" :step="1">
+                                </JnpfInputNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="合格数量" prop="qualifiedNum">
+                                <JnpfInputNumber v-model="dataForm.qualifiedNum" @change="changeData('qualifiedNum', -1)"
+                                    placeholder="合格数量" :step="1">
+                                </JnpfInputNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="补偿工时" prop="compensatoryHour">
+                                <JnpfInputNumber v-model="dataForm.compensatoryHour"
+                                    @change="changeData('compensatoryHour', -1)" placeholder="数字文本" :precision="1"
+                                    :step="1">
+                                </JnpfInputNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="报工班组" prop="reportGroup">
+                                <JnpfPopupSelect v-model="dataForm.reportGroup" @change="changeData('reportGroup', -1)"
+                                    :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.reportGroup"
+                                    placeholder="请选择报工班组" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                                    popupType="dialog" relationField='group_name' field='reportGroup'
+                                    interfaceId="590871154491662213" :pageSize="20"
+                                    :columnOptions="reportGroupcolumnOptions" clearable :style='{ "width": "100%" }'>
+                                </JnpfPopupSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="报工成员" prop="reportMember">
+                                <JnpfUserSelect v-model="dataForm.reportMember" @change="changeData('reportMember', -1)"
+                                    placeholder="请选择报工成员" selectType="all" :ableIds="ableAll.reportMemberableIds"
+                                    clearable :style='{ "width": "100%" }' :multiple="true">
+                                </JnpfUserSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="确认状态" prop="status">
+                                <JnpfSelect v-model="dataForm.status" @change="changeData('status', -1)"
+                                    placeholder="请选择" clearable :style='{ "width": "100%" }' :options="statusOptions"
+                                    :props="statusProps">
+                                </JnpfSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <!-- 表单结束 -->
+                    </template>
+                </el-form>
+                <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
+                    @select="addForSelect" @close="selectDialogVisible = false" />
+            </el-row>
+        </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",
+                steatTime: undefined,
+                endTime: undefined,
+                productCode: undefined,
+                productName: undefined,
+                models: undefined,
+                measurementUnit: undefined,
+                planNum: 0,
+                acquisitionNum: 0,
+                defectiveNum: 0,
+                qualifiedNum: 0,
+                compensatoryHour: 0,
+                reportGroup: undefined,
+                reportMember: [],
+                status: "1",
+                version: 0,
+            },
+            tableRequiredData: {},
+            dataRule:
+            {
+                manufactureTime: [
+                    {
+                        required: true,
+                        message: '请选择生产日期',
+                        trigger: 'change'
+                    },
+                ],
+                deviceCode: [
+                    {
+                        required: true,
+                        message: '请选择设备编码',
+                        trigger: 'change'
+                    },
+                ],
+                deviceName: [
+                    {
+                        required: true,
+                        message: '选择设备编码后自动带入',
+                        trigger: 'blur'
+                    },
+                ],
+                post: [
+                    {
+                        required: true,
+                        message: '请至少选择一个',
+                        trigger: 'change'
+                    },
+                ],
+                steatTime: [
+                    {
+                        required: true,
+                        message: '请选择开始时间',
+                        trigger: 'change'
+                    },
+                ],
+                endTime: [
+                    {
+                        required: true,
+                        message: '请选择结束时间',
+                        trigger: 'change'
+                    },
+                ],
+                productCode: [
+                    {
+                        required: true,
+                        message: '请输入产品编码',
+                        trigger: 'blur'
+                    },
+                ],
+                productName: [
+                    {
+                        required: true,
+                        message: '请输入产品名称',
+                        trigger: 'blur'
+                    },
+                ],
+                models: [
+                    {
+                        required: true,
+                        message: '请输入规格型号',
+                        trigger: 'blur'
+                    },
+                ],
+                measurementUnit: [
+                    {
+                        required: true,
+                        message: '请输入计量单位',
+                        trigger: 'blur'
+                    },
+                ],
+                planNum: [
+                    {
+                        required: true,
+                        message: '计划数量',
+                        trigger: ["blur", "change"]
+                    },
+                ],
+                acquisitionNum: [
+                    {
+                        required: true,
+                        message: '数采数量',
+                        trigger: ["blur", "change"]
+                    },
+                ],
+                status: [
+                    {
+                        required: true,
+                        message: '请至少选择一个',
+                        trigger: '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" },
+            reportGroupcolumnOptions: [{ "label": "班组名称", "value": "group_name" }, { "label": "班组组长", "value": "f_real_name" }, { "label": "班组类型", "value": "group_desc" },],
+            statusOptions: [{ "fullName": "待确认", "id": "1" }, { "fullName": "已确认", "id": "2" }],
+            statusProps: { "label": "fullName", "value": "id" },
+            childIndex: -1,
+            isEdit: false,
+            interfaceRes: {
+                manufactureTime: [],
+                deviceCode: [],
+                deviceName: [],
+                sort: [],
+                post: [],
+                steatTime: [],
+                endTime: [],
+                productCode: [],
+                productName: [],
+                models: [],
+                measurementUnit: [],
+                planNum: [],
+                acquisitionNum: [],
+                defectiveNum: [],
+                qualifiedNum: [],
+                compensatoryHour: [],
+                reportGroup: [],
+                reportMember: [],
+                status: [],
+            },
+        }
+    },
+    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/yyspackagereport/' + 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/yyspackagereport/' + 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/yyspackagereport',
+                    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/yyspackagereport/' + 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/yyspackagereport/index.vue

@@ -0,0 +1,558 @@
+<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.productName" placeholder="请输入" clearable> </el-input>
+                        </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>
+                    <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>
+                        <el-col :span="6">
+                            <el-form-item label="确认状态">
+                                <JnpfSelect v-model="query.status" placeholder="请选择" clearable :options="statusOptions"
+                                    :props="statusProps" multiple>
+                                </JnpfSelect>
+                            </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="success" icon="icon-ym icon-ym-btn-download" @click="exportData()">导出
+                        </el-button>
+                        <el-button type="primary" icon="icon-ym el-icon-check" @click="handleBatchConfirmDel()">批量确认
+                        </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' has-c
+                    @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
+                    <el-table-column prop="manufactureTime" label="生产日期" align="center">
+                    </el-table-column>
+                    <el-table-column prop="deviceCode" label="设备编码" align="center">
+                    </el-table-column>
+                    <el-table-column prop="deviceName" label="设备名称" align="center">
+                    </el-table-column>
+                    <el-table-column prop="sort" label="顺序号" align="center">
+                        <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="center">
+                        <template slot-scope="scope">
+                            {{ scope.row.post }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="steatTime" label="开始时间" align="center">
+                    </el-table-column>
+                    <el-table-column prop="endTime" label="结束时间" align="center">
+                    </el-table-column>
+                    <el-table-column prop="productCode" label="产品编码" align="center">
+                    </el-table-column>
+                    <el-table-column prop="productName" label="产品名称" align="center">
+                    </el-table-column>
+                    <el-table-column prop="models" label="规格型号" align="center">
+                    </el-table-column>
+                    <el-table-column prop="measurementUnit" label="计量单位" align="center">
+                    </el-table-column>
+                    <el-table-column prop="planNum" label="计划数量" align="center">
+                        <template slot-scope="scope" v-if="scope.row.planNum">
+                            <JnpfNumber v-model="scope.row.planNum" :thousands="false" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="acquisitionNum" label="数采数量" align="center">
+                        <template slot-scope="scope" v-if="scope.row.acquisitionNum">
+                            <JnpfNumber v-model="scope.row.acquisitionNum" :thousands="false" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="defectiveNum" label="次品数量" align="center">
+                        <template slot-scope="scope" v-if="scope.row.defectiveNum">
+                            <JnpfNumber v-model="scope.row.defectiveNum" :thousands="false" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="qualifiedNum" label="合格数量" align="center">
+                        <template slot-scope="scope" v-if="scope.row.qualifiedNum">
+                            <JnpfNumber v-model="scope.row.qualifiedNum" :thousands="false" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="compensatoryHour" label="补偿工时" align="center">
+                        <template slot-scope="scope" v-if="scope.row.compensatoryHour">
+                            <JnpfNumber v-model="scope.row.compensatoryHour" :thousands="false" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="reportGroup" label="报工班组" align="center">
+                    </el-table-column>
+                    <el-table-column prop="reportMember" label="报工成员" align="center">
+                    </el-table-column>
+                    <el-table-column label="确认状态" prop="status" align="center">
+                        <template slot-scope="scope">
+                            {{ scope.row.status }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" fixed="right" width="50">
+                        <template slot-scope="scope">
+                            <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
+                            </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,
+                productName: undefined,
+                productCode: undefined,
+                deviceName: undefined,
+                status: undefined,
+            },
+            treeProps: {
+                children: 'children',
+                label: 'fullName',
+                value: 'id',
+                isLeaf: 'isLeaf'
+            },
+            list: [],
+            listLoading: true,
+            multipleSelection: [], total: 0,
+            queryData: {},
+            listQuery: {
+                superQueryJson: '',
+                currentPage: 1,
+                pageSize: 20,
+                sort: "desc",
+                sidx: "",
+            },
+            formVisible: false,
+            flowVisible: false,
+            flowListVisible: false,
+            flowList: [],
+            exportBoxVisible: false,
+            postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季夜班", "id": "2" }],
+            postProps: { "label": "fullName", "value": "id" },
+            statusOptions: [{ "fullName": "待确认", "id": "1" }, { "fullName": "已确认", "id": "2" }],
+            statusProps: { "label": "fullName", "value": "id" },
+            interfaceRes: {
+                deviceCode: [],
+                reportGroup: [],
+            },
+        }
+    },
+    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: '590872465740144517',
+                type: 1,
+            };
+            request({
+                url: `/api/example/yyspackagereport/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/yyspackagereport/${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/yyspackagereport")
+            })
+        },
+        handleSelectionChange(val) {
+            const res = val.map(item => item.id)
+            this.multipleSelection = res
+        },
+        handleBatchConfirmDel() {
+            if (!this.multipleSelection.length) {
+                this.$message({
+                    type: 'error',
+                    message: '请选择一条数据',
+                    duration: 1500,
+                })
+                return
+            }
+            const ids = this.multipleSelection
+            this.$confirm('您确定要确认这些数据吗, 是否继续？', '提示', {
+                type: 'warning'
+            }).then(() => {
+                request({
+                    url: `/api/example/yyspackagereport/batchConfirm`,
+                    data: ids,
+                    method: 'DELETE'
+                }).then(res => {
+                    this.$message({
+                        type: 'success',
+                        message: res.msg,
+                        onClose: () => {
+                            this.initData()
+                        }
+                    });
+                })
+            }).catch(() => {
+            })
+        },
+        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/yyspackagereport/Actions/Export`,
+                method: 'post',
+                data: query
+            }).then(res => {
+                if (!res.data.url) return
+                this.jnpf.downloadFile(res.data.url)
+                this.$refs.ExportBox.visible = false
+                this.exportBoxVisible = false
+            })
+        },
+        search() {
+            this.listQuery.currentPage = 1
+            this.listQuery.pageSize = 20
+            this.listQuery.sort = "desc"
+            this.listQuery.sidx = ""
+            this.initData()
+        },
+        refresh(isrRefresh) {
+            this.formVisible = false
+            if (isrRefresh) this.reset()
+        },
+        reset() {
+            this.query = JSON.parse(JSON.stringify(this.queryData))
+            this.search()
+        },
+        colseFlow(isrRefresh) {
+            this.flowVisible = false
+            if (isrRefresh) this.reset()
+        },
+    }
+}
+</script>