车辆中心

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/DriverMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="jnpf.mapper.DriverMapper">
+
+
+
+</mapper>

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/DriverVehicleMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="jnpf.mapper.DriverVehicleMapper">
+
+
+
+</mapper>

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VehicleDriverMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="jnpf.mapper.VehicleDriverMapper">
+
+
+
+</mapper>

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VehicleMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="jnpf.mapper.VehicleMapper">
+
+
+
+</mapper>

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/DriverMapper.java

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

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/DriverVehicleMapper.java

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

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VehicleDriverMapper.java

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

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VehicleMapper.java

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

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/DriverService.java

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

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/DriverVehicleService.java

@@ -0,0 +1,18 @@
+package jnpf.service;
+
+import jnpf.model.driver.*;
+import jnpf.entity.*;
+import java.util.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * driver
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-02-25
+ */
+public interface DriverVehicleService extends IService<DriverVehicleEntity> {
+    QueryWrapper<DriverVehicleEntity> getChild(DriverPagination pagination,QueryWrapper<DriverVehicleEntity> driverVehicleQueryWrapper);
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VehicleDriverService.java

@@ -0,0 +1,18 @@
+package jnpf.service;
+
+import jnpf.model.vehicle.*;
+import jnpf.entity.*;
+import java.util.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * vehicle
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-02-25
+ */
+public interface VehicleDriverService extends IService<VehicleDriverEntity> {
+    QueryWrapper<VehicleDriverEntity> getChild(VehiclePagination pagination,QueryWrapper<VehicleDriverEntity> vehicleDriverQueryWrapper);
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VehicleService.java

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

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/DriverServiceImpl.java

@@ -0,0 +1,414 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.DriverMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.driver.*;
+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;
+/**
+ *
+ * driver
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-02-25
+ */
+@Service
+public class DriverServiceImpl extends ServiceImpl<DriverMapper, DriverEntity> implements DriverService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private DriverVehicleService driverVehicleService;
+    @Override
+    public List<DriverEntity> getList(DriverPagination driverPagination){
+        return getTypeList(driverPagination,driverPagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<DriverEntity> getTypeList(DriverPagination driverPagination,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 ? DriverConstant.getAppColumnData() : DriverConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int driverNum =0;
+        QueryWrapper<DriverEntity> driverQueryWrapper=new QueryWrapper<>();
+        int driverVehicleNum =0;
+        QueryWrapper<DriverVehicleEntity> driverVehicleQueryWrapper=new QueryWrapper<>();
+        long driverVehiclecount = driverVehicleService.count();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(driverPagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = driverPagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<DriverEntity> driverSuperWrapper = new QueryWrapper<>();
+            driverSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(driverSuperWrapper,DriverEntity.class,queryJson,"0"));
+            int driverNum1 = driverSuperWrapper.getExpression().getNormal().size();
+            if (driverNum1>0){
+                List<String> driverList =this.list(driverSuperWrapper).stream().map(DriverEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(driverList);
+                intersectionSuperList.add(driverList);
+                superNum++;
+            }
+            String driverVehicleTable = "jg_driver_vehicle";
+            boolean driverVehicleHasSql = queryJson.contains(driverVehicleTable);
+            List<String> driverVehicleList = generaterSwapUtil.selectIdsByChildCondition(DriverConstant.getTableList(), driverVehicleTable , queryJson, null);
+            if (driverVehicleHasSql){
+                allSuperList.addAll(driverVehicleList);
+                intersectionSuperList.add(driverVehicleList);
+                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<DriverEntity> driverSuperWrapper = new QueryWrapper<>();
+            driverSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(driverSuperWrapper,DriverEntity.class,ruleJson,"0"));
+            int driverNum1 = driverSuperWrapper.getExpression().getNormal().size();
+            if (driverNum1>0){
+                List<String> driverList =this.list(driverSuperWrapper).stream().map(DriverEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(driverList);
+                intersectionRuleList.add(driverList);
+                ruleNum++;
+            }
+            String driverVehicleTable = "jg_driver_vehicle";
+            boolean driverVehicleHasSql = ruleJson.contains(driverVehicleTable);
+            List<String> driverVehicleList = generaterSwapUtil.selectIdsByChildCondition(DriverConstant.getTableList(), driverVehicleTable , ruleJson, null);
+            if (driverVehicleHasSql){
+                allRuleList.addAll(driverVehicleList);
+                intersectionRuleList.add(driverVehicleList);
+                ruleNum++;
+            }
+            ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
+            //and or
+            if(ruleOp.equalsIgnoreCase("and")){
+                allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
+            }else{
+                allRuleIDlist = allRuleList;
+            }
+        }
+    boolean pcPermission = true;
+    boolean appPermission = false;
+    if(isPc && pcPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object driverObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(driverQueryWrapper,DriverEntity.class,driverPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(driverObj)){
+        return new ArrayList<>();
+        } else {
+        driverQueryWrapper = (QueryWrapper<DriverEntity>)driverObj;
+        if( driverQueryWrapper.getExpression().getNormal().size()>0){
+        driverNum++;
+        }
+        }
+        Object driverVehicleObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(driverVehicleQueryWrapper,DriverVehicleEntity.class,driverPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(driverVehicleObj)){
+        return new ArrayList<>();
+        } else {
+        driverVehicleQueryWrapper = (QueryWrapper<DriverVehicleEntity>)driverVehicleObj;
+        if( driverVehicleQueryWrapper.getExpression().getNormal().size()>0){
+        driverVehicleNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object driverObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(driverQueryWrapper,DriverEntity.class,driverPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(driverObj)){
+        return new ArrayList<>();
+        } else {
+        driverQueryWrapper = (QueryWrapper<DriverEntity>)driverObj;
+        if( driverQueryWrapper.getExpression().getNormal().size()>0){
+        driverNum++;
+        }
+        }
+
+
+        Object driverVehicleObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(driverVehicleQueryWrapper,DriverVehicleEntity.class,driverPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(driverVehicleObj)){
+        return new ArrayList<>();
+        } else {
+        driverVehicleQueryWrapper = (QueryWrapper<DriverVehicleEntity>)driverVehicleObj;
+        if( driverVehicleQueryWrapper.getExpression().getNormal().size()>0){
+        driverVehicleNum++;
+        }
+        }
+
+
+    }
+    }
+        if(isPc){
+            if(ObjectUtil.isNotEmpty(driverPagination.getName())){
+            driverNum++;
+
+                String value = driverPagination.getName() instanceof List ?
+                    JsonUtil.getObjectToString(driverPagination.getName()) :
+                    String.valueOf(driverPagination.getName());
+                driverQueryWrapper.lambda().like(DriverEntity::getName,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(driverPagination.getMobile())){
+            driverNum++;
+
+                String value = driverPagination.getMobile() instanceof List ?
+                    JsonUtil.getObjectToString(driverPagination.getMobile()) :
+                    String.valueOf(driverPagination.getMobile());
+                driverQueryWrapper.lambda().like(DriverEntity::getMobile,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(driverPagination.getWechat())){
+            driverNum++;
+
+                String value = driverPagination.getWechat() instanceof List ?
+                    JsonUtil.getObjectToString(driverPagination.getWechat()) :
+                    String.valueOf(driverPagination.getWechat());
+                driverQueryWrapper.lambda().like(DriverEntity::getWechat,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(driverPagination.getBrithdayTime())){
+            driverNum++;
+
+                List BrithdayTimeList =  JsonUtil.getJsonToList(driverPagination.getBrithdayTime(),String.class);
+                    Long fir = Long.valueOf(String.valueOf(BrithdayTimeList.get(0)));
+                    Long sec = Long.valueOf(String.valueOf(BrithdayTimeList.get(1)));
+
+                    driverQueryWrapper.lambda().ge(DriverEntity::getBrithdayTime, new Date(fir))
+                    .le(DriverEntity::getBrithdayTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
+
+
+            }
+
+            if(ObjectUtil.isNotEmpty(driverPagination.getSex())){
+            driverNum++;
+
+        driverQueryWrapper.lambda().eq(DriverEntity::getSex,driverPagination.getSex());
+
+            }
+
+        }
+            if(driverVehicleNum>0){
+            List<String> driverVehicleIdList = driverVehicleService.list(driverVehicleQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getDriverId())).map(t->t.getDriverId()).collect(Collectors.toList());
+            long count = driverVehicleService.count();
+            if (count>0){
+            intersectionList.add(driverVehicleIdList);
+            }
+            AllIdList.addAll(driverVehicleIdList);
+            }
+            total+=driverVehicleNum;
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            driverQueryWrapper.lambda().in(DriverEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            driverQueryWrapper.lambda().and(t->t.in(DriverEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            driverQueryWrapper.lambda().and(t->t.in(DriverEntity::getId, finalAllRuleIDlist));
+        }
+        //假删除标志
+        driverQueryWrapper.lambda().isNull(DriverEntity::getDeleteMark);
+
+        //排序
+        if(StringUtil.isEmpty(driverPagination.getSidx())){
+            driverQueryWrapper.lambda().orderByDesc(DriverEntity::getId);
+        }else{
+            try {
+                String sidx = driverPagination.getSidx();
+                String[] strs= sidx.split("_name");
+                DriverEntity driverEntity = new DriverEntity();
+                Field declaredField = driverEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                driverQueryWrapper="asc".equals(driverPagination.getSort().toLowerCase())?driverQueryWrapper.orderByAsc(value):driverQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<DriverEntity> page=new Page<>(driverPagination.getCurrentPage(), driverPagination.getPageSize());
+                IPage<DriverEntity> userIPage=this.page(page, driverQueryWrapper);
+                return driverPagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<DriverEntity> list = new ArrayList();
+                return driverPagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(driverQueryWrapper);
+        }
+    }
+    @Override
+    public DriverEntity getInfo(String id){
+        QueryWrapper<DriverEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(DriverEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(DriverEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, DriverEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(DriverEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** DriverVehicle子表方法 */
+    @Override
+    public List<DriverVehicleEntity> getDriverVehicleList(String id,DriverPagination driverPagination){
+        Map<String, Object> newtabMap=DriverConstant.TABLEFIELDKEY.entrySet()
+        .stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
+        String tableName="driverVehicle";
+        tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
+        QueryWrapper<DriverVehicleEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper = driverVehicleService.getChild(driverPagination,queryWrapper);
+        queryWrapper.lambda().eq(DriverVehicleEntity::getDriverId, id);
+        generaterSwapUtil.wrapperHandle(DriverConstant.getColumnData(), DriverConstant.getAppColumnData(), queryWrapper,DriverVehicleEntity.class,"sub",tableName);
+        return driverVehicleService.list(queryWrapper);
+    }
+
+    /** DriverVehicle子表方法 */
+    @Override
+    public List<DriverVehicleEntity> getDriverVehicleList(String id){
+        QueryWrapper<DriverVehicleEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(DriverVehicleEntity::getDriverId, id);
+        return driverVehicleService.list(queryWrapper);
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(DriverForm 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.getMobile())){
+                    return "手机号码不能为空";
+                }
+        //子表字段验证
+            if (form.getDriverVehicleList()!=null){
+            }
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param driverForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(DriverForm driverForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        driverForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(DriverConstant.getFormData(),driverForm),DriverForm.class);
+        DriverEntity entity = JsonUtil.getJsonToBean(driverForm, DriverEntity.class);
+
+        if(isSave){
+            String mainId = id ;
+        entity.setCreatorTime(DateUtil.getNowDate());
+        entity.setCreatorUserId(userInfo.getUserId());
+        entity.setLastModifyTime(null);
+        entity.setLastModifyUserId(null);
+            entity.setId(mainId);
+            entity.setFlowId(driverForm.getFlowId());
+            entity.setVersion(0);
+        }else{
+        entity.setCreatorTime(DateUtil.getNowDate());
+        entity.setCreatorUserId(userInfo.getUserId());
+        entity.setLastModifyTime(null);
+        entity.setLastModifyUserId(null);
+            entity.setFlowId(driverForm.getFlowId());
+        }
+        this.saveOrUpdate(entity);
+
+        //DriverVehicle子表数据新增修改
+        if(!isSave){
+            QueryWrapper<DriverVehicleEntity> DriverVehiclequeryWrapper = new QueryWrapper<>();
+            DriverVehiclequeryWrapper.lambda().eq(DriverVehicleEntity::getDriverId, entity.getId());
+            driverVehicleService.remove(DriverVehiclequeryWrapper);
+        }
+        if (driverForm.getDriverVehicleList()!=null){
+            List<DriverVehicleEntity> tableField108 = JsonUtil.getJsonToList(driverForm.getDriverVehicleList(),DriverVehicleEntity.class);
+            for(DriverVehicleEntity entitys : tableField108){
+                entitys.setId(RandomUtil.uuId());
+                entitys.setDriverId(entity.getId());
+                if(isSave){
+                }else{
+                }
+                driverVehicleService.saveOrUpdate(entitys);
+            }
+        }
+    }
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/DriverVehicleServiceImpl.java

@@ -0,0 +1,59 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.DriverVehicleMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.driver.*;
+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 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;
+/**
+ *
+ * driver
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-02-25
+ */
+@Service
+public class DriverVehicleServiceImpl extends ServiceImpl<DriverVehicleMapper, DriverVehicleEntity> implements DriverVehicleService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    //子表过滤方法
+    @Override
+    public QueryWrapper<DriverVehicleEntity> getChild(DriverPagination pagination, QueryWrapper<DriverVehicleEntity> driverVehicleQueryWrapper){
+    boolean pcPermission = true;
+    boolean appPermission = false;
+    boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+    String ruleQueryJson = isPc?DriverConstant.getColumnData():DriverConstant.getAppColumnData();
+    ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson,ColumnDataModel.class);
+    String ruleJson = isPc?JsonUtil.getObjectToString(dataModel.getRuleList()):JsonUtil.getObjectToString(dataModel.getRuleListApp());
+        if(isPc){
+        }
+        return driverVehicleQueryWrapper;
+    }
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VehicleDriverServiceImpl.java

@@ -0,0 +1,59 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.VehicleDriverMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.vehicle.*;
+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 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;
+/**
+ *
+ * vehicle
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-02-25
+ */
+@Service
+public class VehicleDriverServiceImpl extends ServiceImpl<VehicleDriverMapper, VehicleDriverEntity> implements VehicleDriverService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    //子表过滤方法
+    @Override
+    public QueryWrapper<VehicleDriverEntity> getChild(VehiclePagination pagination, QueryWrapper<VehicleDriverEntity> vehicleDriverQueryWrapper){
+    boolean pcPermission = true;
+    boolean appPermission = false;
+    boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+    String ruleQueryJson = isPc?VehicleConstant.getColumnData():VehicleConstant.getAppColumnData();
+    ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson,ColumnDataModel.class);
+    String ruleJson = isPc?JsonUtil.getObjectToString(dataModel.getRuleList()):JsonUtil.getObjectToString(dataModel.getRuleListApp());
+        if(isPc){
+        }
+        return vehicleDriverQueryWrapper;
+    }
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VehicleServiceImpl.java

@@ -0,0 +1,444 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.VehicleMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.vehicle.*;
+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;
+/**
+ *
+ * vehicle
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-02-25
+ */
+@Service
+public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity> implements VehicleService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private VehicleDriverService vehicleDriverService;
+    @Override
+    public List<VehicleEntity> getList(VehiclePagination vehiclePagination){
+        return getTypeList(vehiclePagination,vehiclePagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<VehicleEntity> getTypeList(VehiclePagination vehiclePagination,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 ? VehicleConstant.getAppColumnData() : VehicleConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int vehicleNum =0;
+        QueryWrapper<VehicleEntity> vehicleQueryWrapper=new QueryWrapper<>();
+        int vehicleDriverNum =0;
+        QueryWrapper<VehicleDriverEntity> vehicleDriverQueryWrapper=new QueryWrapper<>();
+        long vehicleDrivercount = vehicleDriverService.count();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(vehiclePagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = vehiclePagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<VehicleEntity> vehicleSuperWrapper = new QueryWrapper<>();
+            vehicleSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(vehicleSuperWrapper,VehicleEntity.class,queryJson,"0"));
+            int vehicleNum1 = vehicleSuperWrapper.getExpression().getNormal().size();
+            if (vehicleNum1>0){
+                List<String> vehicleList =this.list(vehicleSuperWrapper).stream().map(VehicleEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(vehicleList);
+                intersectionSuperList.add(vehicleList);
+                superNum++;
+            }
+            String vehicleDriverTable = "jg_vehicle_driver";
+            boolean vehicleDriverHasSql = queryJson.contains(vehicleDriverTable);
+            List<String> vehicleDriverList = generaterSwapUtil.selectIdsByChildCondition(VehicleConstant.getTableList(), vehicleDriverTable , queryJson, null);
+            if (vehicleDriverHasSql){
+                allSuperList.addAll(vehicleDriverList);
+                intersectionSuperList.add(vehicleDriverList);
+                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<VehicleEntity> vehicleSuperWrapper = new QueryWrapper<>();
+            vehicleSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(vehicleSuperWrapper,VehicleEntity.class,ruleJson,"0"));
+            int vehicleNum1 = vehicleSuperWrapper.getExpression().getNormal().size();
+            if (vehicleNum1>0){
+                List<String> vehicleList =this.list(vehicleSuperWrapper).stream().map(VehicleEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(vehicleList);
+                intersectionRuleList.add(vehicleList);
+                ruleNum++;
+            }
+            String vehicleDriverTable = "jg_vehicle_driver";
+            boolean vehicleDriverHasSql = ruleJson.contains(vehicleDriverTable);
+            List<String> vehicleDriverList = generaterSwapUtil.selectIdsByChildCondition(VehicleConstant.getTableList(), vehicleDriverTable , ruleJson, null);
+            if (vehicleDriverHasSql){
+                allRuleList.addAll(vehicleDriverList);
+                intersectionRuleList.add(vehicleDriverList);
+                ruleNum++;
+            }
+            ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
+            //and or
+            if(ruleOp.equalsIgnoreCase("and")){
+                allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
+            }else{
+                allRuleIDlist = allRuleList;
+            }
+        }
+    boolean pcPermission = true;
+    boolean appPermission = false;
+    if(isPc && pcPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object vehicleObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(vehicleQueryWrapper,VehicleEntity.class,vehiclePagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(vehicleObj)){
+        return new ArrayList<>();
+        } else {
+        vehicleQueryWrapper = (QueryWrapper<VehicleEntity>)vehicleObj;
+        if( vehicleQueryWrapper.getExpression().getNormal().size()>0){
+        vehicleNum++;
+        }
+        }
+        Object vehicleDriverObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(vehicleDriverQueryWrapper,VehicleDriverEntity.class,vehiclePagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(vehicleDriverObj)){
+        return new ArrayList<>();
+        } else {
+        vehicleDriverQueryWrapper = (QueryWrapper<VehicleDriverEntity>)vehicleDriverObj;
+        if( vehicleDriverQueryWrapper.getExpression().getNormal().size()>0){
+        vehicleDriverNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object vehicleObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(vehicleQueryWrapper,VehicleEntity.class,vehiclePagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(vehicleObj)){
+        return new ArrayList<>();
+        } else {
+        vehicleQueryWrapper = (QueryWrapper<VehicleEntity>)vehicleObj;
+        if( vehicleQueryWrapper.getExpression().getNormal().size()>0){
+        vehicleNum++;
+        }
+        }
+
+
+        Object vehicleDriverObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(vehicleDriverQueryWrapper,VehicleDriverEntity.class,vehiclePagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(vehicleDriverObj)){
+        return new ArrayList<>();
+        } else {
+        vehicleDriverQueryWrapper = (QueryWrapper<VehicleDriverEntity>)vehicleDriverObj;
+        if( vehicleDriverQueryWrapper.getExpression().getNormal().size()>0){
+        vehicleDriverNum++;
+        }
+        }
+
+
+    }
+    }
+        if(isPc){
+            if(ObjectUtil.isNotEmpty(vehiclePagination.getVehicleCode())){
+            vehicleNum++;
+
+                String value = vehiclePagination.getVehicleCode() instanceof List ?
+                    JsonUtil.getObjectToString(vehiclePagination.getVehicleCode()) :
+                    String.valueOf(vehiclePagination.getVehicleCode());
+                vehicleQueryWrapper.lambda().like(VehicleEntity::getVehicleCode,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(vehiclePagination.getType())){
+            vehicleNum++;
+
+        List<String> idList = new ArrayList<>();
+        try {
+        String[][] type = JsonUtil.getJsonToBean(vehiclePagination.getType(),String[][].class);
+        for(int i=0;i<type.length;i++){
+        if(type[i].length>0){
+        idList.add(JsonUtil.getObjectToString(Arrays.asList(type[i])));
+        }
+        }
+        }catch (Exception e1){
+        try {
+        List<String> type = JsonUtil.getJsonToList(vehiclePagination.getType(),String.class);
+        if(type.size()>0){
+            idList.addAll(type);
+        }
+        }catch (Exception e2){
+        idList.add(String.valueOf(vehiclePagination.getType()));
+        }
+        }
+        vehicleQueryWrapper.lambda().and(t->{
+        idList.forEach(tt->{
+        t.like(VehicleEntity::getType, tt).or();
+        });
+        });
+
+            }
+
+            if(ObjectUtil.isNotEmpty(vehiclePagination.getVehicleNumber())){
+            vehicleNum++;
+
+                String value = vehiclePagination.getVehicleNumber() instanceof List ?
+                    JsonUtil.getObjectToString(vehiclePagination.getVehicleNumber()) :
+                    String.valueOf(vehiclePagination.getVehicleNumber());
+                vehicleQueryWrapper.lambda().like(VehicleEntity::getVehicleNumber,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(vehiclePagination.getCarrier())){
+            vehicleNum++;
+
+        List<String> idList = new ArrayList<>();
+        try {
+        String[][] carrier = JsonUtil.getJsonToBean(vehiclePagination.getCarrier(),String[][].class);
+        for(int i=0;i<carrier.length;i++){
+        if(carrier[i].length>0){
+        idList.add(JsonUtil.getObjectToString(Arrays.asList(carrier[i])));
+        }
+        }
+        }catch (Exception e1){
+        try {
+        List<String> carrier = JsonUtil.getJsonToList(vehiclePagination.getCarrier(),String.class);
+        if(carrier.size()>0){
+            idList.addAll(carrier);
+        }
+        }catch (Exception e2){
+        idList.add(String.valueOf(vehiclePagination.getCarrier()));
+        }
+        }
+        vehicleQueryWrapper.lambda().and(t->{
+        idList.forEach(tt->{
+        t.like(VehicleEntity::getCarrier, tt).or();
+        });
+        });
+
+            }
+
+        }
+            if(vehicleDriverNum>0){
+            List<String> vehicleDriverIdList = vehicleDriverService.list(vehicleDriverQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getVehicleId())).map(t->t.getVehicleId()).collect(Collectors.toList());
+            long count = vehicleDriverService.count();
+            if (count>0){
+            intersectionList.add(vehicleDriverIdList);
+            }
+            AllIdList.addAll(vehicleDriverIdList);
+            }
+            total+=vehicleDriverNum;
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            vehicleQueryWrapper.lambda().in(VehicleEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            vehicleQueryWrapper.lambda().and(t->t.in(VehicleEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            vehicleQueryWrapper.lambda().and(t->t.in(VehicleEntity::getId, finalAllRuleIDlist));
+        }
+        //假删除标志
+        vehicleQueryWrapper.lambda().isNull(VehicleEntity::getDeleteMark);
+
+        //排序
+        if(StringUtil.isEmpty(vehiclePagination.getSidx())){
+            vehicleQueryWrapper.lambda().orderByDesc(VehicleEntity::getId);
+        }else{
+            try {
+                String sidx = vehiclePagination.getSidx();
+                String[] strs= sidx.split("_name");
+                VehicleEntity vehicleEntity = new VehicleEntity();
+                Field declaredField = vehicleEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                vehicleQueryWrapper="asc".equals(vehiclePagination.getSort().toLowerCase())?vehicleQueryWrapper.orderByAsc(value):vehicleQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<VehicleEntity> page=new Page<>(vehiclePagination.getCurrentPage(), vehiclePagination.getPageSize());
+                IPage<VehicleEntity> userIPage=this.page(page, vehicleQueryWrapper);
+                return vehiclePagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<VehicleEntity> list = new ArrayList();
+                return vehiclePagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(vehicleQueryWrapper);
+        }
+    }
+    @Override
+    public VehicleEntity getInfo(String id){
+        QueryWrapper<VehicleEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(VehicleEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(VehicleEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, VehicleEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(VehicleEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** VehicleDriver子表方法 */
+    @Override
+    public List<VehicleDriverEntity> getVehicleDriverList(String id,VehiclePagination vehiclePagination){
+        Map<String, Object> newtabMap=VehicleConstant.TABLEFIELDKEY.entrySet()
+        .stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
+        String tableName="vehicleDriver";
+        tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
+        QueryWrapper<VehicleDriverEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper = vehicleDriverService.getChild(vehiclePagination,queryWrapper);
+        queryWrapper.lambda().eq(VehicleDriverEntity::getVehicleId, id);
+        generaterSwapUtil.wrapperHandle(VehicleConstant.getColumnData(), VehicleConstant.getAppColumnData(), queryWrapper,VehicleDriverEntity.class,"sub",tableName);
+        return vehicleDriverService.list(queryWrapper);
+    }
+
+    /** VehicleDriver子表方法 */
+    @Override
+    public List<VehicleDriverEntity> getVehicleDriverList(String id){
+        QueryWrapper<VehicleDriverEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(VehicleDriverEntity::getVehicleId, id);
+        return vehicleDriverService.list(queryWrapper);
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(VehicleForm 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.getVehicleNumber())){
+                    return "车牌号不能为空";
+                }
+        //子表字段验证
+            if (form.getVehicleDriverList()!=null){
+            }
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param vehicleForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(VehicleForm vehicleForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        vehicleForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(VehicleConstant.getFormData(),vehicleForm),VehicleForm.class);
+        VehicleEntity entity = JsonUtil.getJsonToBean(vehicleForm, VehicleEntity.class);
+
+        if(isSave){
+            String mainId = id ;
+        entity.setVehicleCode(generaterSwapUtil.getBillNumber("vehicleCode", false));
+        entity.setCreatorTime(DateUtil.getNowDate());
+        entity.setCreatorUserId(userInfo.getUserId());
+        entity.setLastModifyTime(null);
+        entity.setLastModifyUserId(null);
+            entity.setId(mainId);
+            entity.setFlowId(vehicleForm.getFlowId());
+            entity.setVersion(0);
+        }else{
+        entity.setVehicleCode(generaterSwapUtil.getBillNumber("vehicleCode", false));
+        entity.setCreatorTime(DateUtil.getNowDate());
+        entity.setCreatorUserId(userInfo.getUserId());
+        entity.setLastModifyTime(null);
+        entity.setLastModifyUserId(null);
+            entity.setFlowId(vehicleForm.getFlowId());
+        }
+        this.saveOrUpdate(entity);
+
+        //VehicleDriver子表数据新增修改
+        if(!isSave){
+            QueryWrapper<VehicleDriverEntity> VehicleDriverqueryWrapper = new QueryWrapper<>();
+            VehicleDriverqueryWrapper.lambda().eq(VehicleDriverEntity::getVehicleId, entity.getId());
+            vehicleDriverService.remove(VehicleDriverqueryWrapper);
+        }
+        if (vehicleForm.getVehicleDriverList()!=null){
+            List<VehicleDriverEntity> tableField110 = JsonUtil.getJsonToList(vehicleForm.getVehicleDriverList(),VehicleDriverEntity.class);
+            for(VehicleDriverEntity entitys : tableField110){
+                entitys.setId(RandomUtil.uuId());
+                entitys.setVehicleId(entity.getId());
+                if(isSave){
+                }else{
+                }
+                vehicleDriverService.saveOrUpdate(entitys);
+            }
+        }
+    }
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/DriverController.java

@@ -0,0 +1,428 @@
+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.driver.*;
+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;
+
+/**
+ * driver
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-02-25
+ */
+@Slf4j
+@RestController
+@Tag(name = "driver" , description = "scm")
+@RequestMapping("/api/scm/Driver")
+public class DriverController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private DriverService driverService;
+
+    @Autowired
+    private DriverVehicleService driverVehicleService;
+
+
+    @Autowired
+    private ConfigValueUtil configValueUtil;
+
+    /**
+    * 列表
+    *
+    * @param driverPagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody DriverPagination driverPagination)throws IOException{
+        List<DriverEntity> list= driverService.getList(driverPagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (DriverEntity entity : list) {
+        Map<String, Object> driverMap=JsonUtil.entityToMap(entity);
+        driverMap.put("id", driverMap.get("id"));
+        //副表数据
+        //子表数据
+        List<DriverVehicleEntity> driverVehicleList = driverService.getDriverVehicleList(entity.getId(),driverPagination);
+        driverMap.put("tableField108",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(driverVehicleList)));
+            realList.add(driverMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, DriverConstant.getFormData(), DriverConstant.getColumnData(), driverPagination.getModuleId(),false);
+
+        //流程状态添加
+        for(Map<String, Object> vo:realList){
+            FlowTaskEntity flowTaskEntity = generaterSwapUtil.getInfoSubmit(String.valueOf(vo.get("id")), FlowTaskEntity::getStatus);
+            if (flowTaskEntity!=null){
+                vo.put("flowState",flowTaskEntity.getStatus());
+            }else{
+                vo.put("flowState",null);
+            }
+            //添加流程id
+            String flowId="";
+            if(vo.get("flowid")!=null){
+                flowId = String.valueOf(vo.get("flowid"));
+            }
+            if(vo.get("flowid".toUpperCase())!=null){
+                flowId = String.valueOf(vo.get("flowid".toUpperCase()));
+            }
+            if(StringUtil.isNotEmpty(flowId)){
+                vo.put("flowId" ,flowId);
+            }
+        }
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(driverPagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 创建
+    *
+    * @param driverForm
+    * @return
+    */
+    @PostMapping("/{id}")
+    @Operation(summary = "创建")
+    public ActionResult create(@PathVariable("id") String id, @RequestBody @Valid DriverForm driverForm) {
+        String b = driverService.checkForm(driverForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            driverService.saveOrUpdate(driverForm, id ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 导出Excel
+    *
+    * @return
+    */
+    @Operation(summary = "导出Excel")
+    @PostMapping("/Actions/Export")
+    public ActionResult Export(@RequestBody DriverPagination driverPagination) throws IOException {
+        if (StringUtil.isEmpty(driverPagination.getSelectKey())){
+            return ActionResult.fail("请选择导出字段");
+        }
+        List<DriverEntity> list= driverService.getList(driverPagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (DriverEntity entity : list) {
+        Map<String, Object> driverMap=JsonUtil.entityToMap(entity);
+        driverMap.put("id", driverMap.get("id"));
+        //副表数据
+        //子表数据
+        List<DriverVehicleEntity> driverVehicleList = driverService.getDriverVehicleList(entity.getId(),driverPagination);
+        driverMap.put("tableField108",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(driverVehicleList)));
+            realList.add(driverMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, DriverConstant.getFormData(), DriverConstant.getColumnData(), driverPagination.getModuleId(),false);
+        String[]keys=!StringUtil.isEmpty(driverPagination.getSelectKey())?driverPagination.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){
+            ExcelExportEntity tableField108ExcelEntity = new ExcelExportEntity("","tableField108");
+            List<ExcelExportEntity> tableField108List = new ArrayList<>();
+            for(String key:keys){
+                switch(key){
+                    case "name" :
+                    entitys.add(new ExcelExportEntity("登录账号" ,"name"));
+                    break;
+                    case "mobile" :
+                    entitys.add(new ExcelExportEntity("手机号码" ,"mobile"));
+                    break;
+                    case "wechat" :
+                    entitys.add(new ExcelExportEntity("微信账号" ,"wechat"));
+                    break;
+                    case "brithdayTime" :
+                    entitys.add(new ExcelExportEntity("出生日期" ,"brithdayTime"));
+                    break;
+                    case "sex" :
+                    entitys.add(new ExcelExportEntity("性别" ,"sex"));
+                    break;
+                    case "creatorTime" :
+                    entitys.add(new ExcelExportEntity("创建时间" ,"creatorTime"));
+                    break;
+                    case "creatorUserId" :
+                    entitys.add(new ExcelExportEntity("创建用户" ,"creatorUserId"));
+                    break;
+                    case "lastModifyTime" :
+                    entitys.add(new ExcelExportEntity("修改时间" ,"lastModifyTime"));
+                    break;
+                    case "lastModifyUserId" :
+                    entitys.add(new ExcelExportEntity("修改用户" ,"lastModifyUserId"));
+                    break;
+                    case "tableField108-vehicleId":
+                    tableField108List.add(new ExcelExportEntity("车牌号" ,"vehicleId"));
+                    break;
+                    default:
+                    break;
+                }
+            }
+            if(tableField108List.size() > 0){
+                tableField108ExcelEntity.setList(tableField108List);
+                entitys.add(tableField108ExcelEntity);
+            }
+        }
+
+        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(DriverConstant.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);
+    List<String> columnIdList = new ArrayList<>(20);
+    int i =0;
+    String errInfo = "";
+    for (String allId : idList){
+        FlowTaskEntity taskEntity = generaterSwapUtil.getInfoSubmit(allId, FlowTaskEntity::getId, FlowTaskEntity::getStatus);
+        if (taskEntity==null){
+            columnIdList.add(allId);
+            this.delete(allId);
+        }else if (taskEntity.getStatus().equals(0) || taskEntity.getStatus().equals(4)){
+            try {
+                generaterSwapUtil.deleteFlowTask(taskEntity);
+                columnIdList.add(allId);
+                this.delete(allId);
+                i++;
+            } catch (WorkFlowException e) {
+                errInfo = e.getMessage();
+                e.printStackTrace();
+            }
+        }
+    }
+    if (i == 0 && columnIdList.size()==0){
+        return ActionResult.fail("流程已发起，无法删除");
+    }
+    if (StringUtil.isNotEmpty(errInfo)){
+        return ActionResult.fail(errInfo);
+    }
+    return ActionResult.success("删除成功");
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param driverForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid DriverForm driverForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        driverForm.setId(id);
+        if (!isImport) {
+            String b =  driverService.checkForm(driverForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        DriverEntity entity= driverService.getInfo(id);
+        if(entity!=null){
+            try{
+                driverService.saveOrUpdate(driverForm,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){
+        DriverEntity entity= driverService.getInfo(id);
+        if(entity!=null){
+            FlowTaskEntity taskEntity = generaterSwapUtil.getInfoSubmit(id, FlowTaskEntity::getId, FlowTaskEntity::getStatus);
+            if (taskEntity != null) {
+                try {
+                    generaterSwapUtil.deleteFlowTask(taskEntity);
+                } catch (WorkFlowException e) {
+                    e.printStackTrace();
+                }
+            }
+            //假删除
+            entity.setDeleteMark(1);
+            driverService.update(id,entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        DriverEntity entity= driverService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> driverMap=JsonUtil.entityToMap(entity);
+        driverMap.put("id", driverMap.get("id"));
+        //副表数据
+        //子表数据
+        List<DriverVehicleEntity> driverVehicleList = driverService.getDriverVehicleList(entity.getId());
+        driverMap.put("tableField108",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(driverVehicleList)));
+        driverMap = generaterSwapUtil.swapDataDetail(driverMap,DriverConstant.getFormData(),"531486086153657669",false);
+        return ActionResult.success(driverMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        DriverEntity entity= driverService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> driverMap=JsonUtil.entityToMap(entity);
+        driverMap.put("id", driverMap.get("id"));
+        //副表数据
+        //子表数据
+        List<DriverVehicleEntity> driverVehicleList = driverService.getDriverVehicleList(entity.getId());
+        driverMap.put("driverVehicleList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(driverVehicleList)));
+        driverMap = generaterSwapUtil.swapDataForm(driverMap,DriverConstant.getFormData(),DriverConstant.TABLEFIELDKEY,DriverConstant.TABLERENAMES);
+        return ActionResult.success(driverMap);
+    }
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VehicleController.java

@@ -0,0 +1,431 @@
+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.vehicle.*;
+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;
+
+/**
+ * vehicle
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-02-25
+ */
+@Slf4j
+@RestController
+@Tag(name = "vehicle" , description = "scm")
+@RequestMapping("/api/scm/Vehicle")
+public class VehicleController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private VehicleService vehicleService;
+
+    @Autowired
+    private VehicleDriverService vehicleDriverService;
+
+
+    @Autowired
+    private ConfigValueUtil configValueUtil;
+
+    /**
+    * 列表
+    *
+    * @param vehiclePagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody VehiclePagination vehiclePagination)throws IOException{
+        List<VehicleEntity> list= vehicleService.getList(vehiclePagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (VehicleEntity entity : list) {
+        Map<String, Object> vehicleMap=JsonUtil.entityToMap(entity);
+        vehicleMap.put("id", vehicleMap.get("id"));
+        //副表数据
+        //子表数据
+        List<VehicleDriverEntity> vehicleDriverList = vehicleService.getVehicleDriverList(entity.getId(),vehiclePagination);
+        vehicleMap.put("tableField110",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(vehicleDriverList)));
+            realList.add(vehicleMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, VehicleConstant.getFormData(), VehicleConstant.getColumnData(), vehiclePagination.getModuleId(),false);
+
+        //流程状态添加
+        for(Map<String, Object> vo:realList){
+            FlowTaskEntity flowTaskEntity = generaterSwapUtil.getInfoSubmit(String.valueOf(vo.get("id")), FlowTaskEntity::getStatus);
+            if (flowTaskEntity!=null){
+                vo.put("flowState",flowTaskEntity.getStatus());
+            }else{
+                vo.put("flowState",null);
+            }
+            //添加流程id
+            String flowId="";
+            if(vo.get("flowid")!=null){
+                flowId = String.valueOf(vo.get("flowid"));
+            }
+            if(vo.get("flowid".toUpperCase())!=null){
+                flowId = String.valueOf(vo.get("flowid".toUpperCase()));
+            }
+            if(StringUtil.isNotEmpty(flowId)){
+                vo.put("flowId" ,flowId);
+            }
+        }
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(vehiclePagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 创建
+    *
+    * @param vehicleForm
+    * @return
+    */
+    @PostMapping("/{id}")
+    @Operation(summary = "创建")
+    public ActionResult create(@PathVariable("id") String id, @RequestBody @Valid VehicleForm vehicleForm) {
+        String b = vehicleService.checkForm(vehicleForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            vehicleService.saveOrUpdate(vehicleForm, id ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 导出Excel
+    *
+    * @return
+    */
+    @Operation(summary = "导出Excel")
+    @PostMapping("/Actions/Export")
+    public ActionResult Export(@RequestBody VehiclePagination vehiclePagination) throws IOException {
+        if (StringUtil.isEmpty(vehiclePagination.getSelectKey())){
+            return ActionResult.fail("请选择导出字段");
+        }
+        List<VehicleEntity> list= vehicleService.getList(vehiclePagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (VehicleEntity entity : list) {
+        Map<String, Object> vehicleMap=JsonUtil.entityToMap(entity);
+        vehicleMap.put("id", vehicleMap.get("id"));
+        //副表数据
+        //子表数据
+        List<VehicleDriverEntity> vehicleDriverList = vehicleService.getVehicleDriverList(entity.getId(),vehiclePagination);
+        vehicleMap.put("tableField110",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(vehicleDriverList)));
+            realList.add(vehicleMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, VehicleConstant.getFormData(), VehicleConstant.getColumnData(), vehiclePagination.getModuleId(),false);
+        String[]keys=!StringUtil.isEmpty(vehiclePagination.getSelectKey())?vehiclePagination.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){
+            ExcelExportEntity tableField110ExcelEntity = new ExcelExportEntity("","tableField110");
+            List<ExcelExportEntity> tableField110List = new ArrayList<>();
+            for(String key:keys){
+                switch(key){
+                    case "vehicleCode" :
+                    entitys.add(new ExcelExportEntity("车辆编号" ,"vehicleCode"));
+                    break;
+                    case "type" :
+                    entitys.add(new ExcelExportEntity("车辆类型" ,"type"));
+                    break;
+                    case "photo" :
+                    entitys.add(new ExcelExportEntity("车辆图片" ,"photo"));
+                    break;
+                    case "vehicleNumber" :
+                    entitys.add(new ExcelExportEntity("车牌号" ,"vehicleNumber"));
+                    break;
+                    case "carrier" :
+                    entitys.add(new ExcelExportEntity("承运商" ,"carrier"));
+                    break;
+                    case "creatorTime" :
+                    entitys.add(new ExcelExportEntity("创建时间" ,"creatorTime"));
+                    break;
+                    case "creatorUserId" :
+                    entitys.add(new ExcelExportEntity("创建用户" ,"creatorUserId"));
+                    break;
+                    case "lastModifyTime" :
+                    entitys.add(new ExcelExportEntity("修改时间" ,"lastModifyTime"));
+                    break;
+                    case "lastModifyUserId" :
+                    entitys.add(new ExcelExportEntity("修改用户" ,"lastModifyUserId"));
+                    break;
+                    case "photoOne" :
+                    entitys.add(new ExcelExportEntity("车辆信息" ,"photoOne"));
+                    break;
+                    case "tableField110-driverId":
+                    tableField110List.add(new ExcelExportEntity("司机" ,"driverId"));
+                    break;
+                    default:
+                    break;
+                }
+            }
+            if(tableField110List.size() > 0){
+                tableField110ExcelEntity.setList(tableField110List);
+                entitys.add(tableField110ExcelEntity);
+            }
+        }
+
+        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(VehicleConstant.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);
+    List<String> columnIdList = new ArrayList<>(20);
+    int i =0;
+    String errInfo = "";
+    for (String allId : idList){
+        FlowTaskEntity taskEntity = generaterSwapUtil.getInfoSubmit(allId, FlowTaskEntity::getId, FlowTaskEntity::getStatus);
+        if (taskEntity==null){
+            columnIdList.add(allId);
+            this.delete(allId);
+        }else if (taskEntity.getStatus().equals(0) || taskEntity.getStatus().equals(4)){
+            try {
+                generaterSwapUtil.deleteFlowTask(taskEntity);
+                columnIdList.add(allId);
+                this.delete(allId);
+                i++;
+            } catch (WorkFlowException e) {
+                errInfo = e.getMessage();
+                e.printStackTrace();
+            }
+        }
+    }
+    if (i == 0 && columnIdList.size()==0){
+        return ActionResult.fail("流程已发起，无法删除");
+    }
+    if (StringUtil.isNotEmpty(errInfo)){
+        return ActionResult.fail(errInfo);
+    }
+    return ActionResult.success("删除成功");
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param vehicleForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid VehicleForm vehicleForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        vehicleForm.setId(id);
+        if (!isImport) {
+            String b =  vehicleService.checkForm(vehicleForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        VehicleEntity entity= vehicleService.getInfo(id);
+        if(entity!=null){
+            try{
+                vehicleService.saveOrUpdate(vehicleForm,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){
+        VehicleEntity entity= vehicleService.getInfo(id);
+        if(entity!=null){
+            FlowTaskEntity taskEntity = generaterSwapUtil.getInfoSubmit(id, FlowTaskEntity::getId, FlowTaskEntity::getStatus);
+            if (taskEntity != null) {
+                try {
+                    generaterSwapUtil.deleteFlowTask(taskEntity);
+                } catch (WorkFlowException e) {
+                    e.printStackTrace();
+                }
+            }
+            //假删除
+            entity.setDeleteMark(1);
+            vehicleService.update(id,entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        VehicleEntity entity= vehicleService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> vehicleMap=JsonUtil.entityToMap(entity);
+        vehicleMap.put("id", vehicleMap.get("id"));
+        //副表数据
+        //子表数据
+        List<VehicleDriverEntity> vehicleDriverList = vehicleService.getVehicleDriverList(entity.getId());
+        vehicleMap.put("tableField110",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(vehicleDriverList)));
+        vehicleMap = generaterSwapUtil.swapDataDetail(vehicleMap,VehicleConstant.getFormData(),"531489911639924037",false);
+        return ActionResult.success(vehicleMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        VehicleEntity entity= vehicleService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> vehicleMap=JsonUtil.entityToMap(entity);
+        vehicleMap.put("id", vehicleMap.get("id"));
+        //副表数据
+        //子表数据
+        List<VehicleDriverEntity> vehicleDriverList = vehicleService.getVehicleDriverList(entity.getId());
+        vehicleMap.put("vehicleDriverList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(vehicleDriverList)));
+        vehicleMap = generaterSwapUtil.swapDataForm(vehicleMap,VehicleConstant.getFormData(),VehicleConstant.TABLEFIELDKEY,VehicleConstant.TABLERENAMES);
+        return ActionResult.success(vehicleMap);
+    }
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DriverEntity.java

@@ -0,0 +1,55 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+/**
+ * 司机表
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-02-25
+ */
+@Data
+@TableName("jg_driver")
+public class DriverEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField(value = "NAME" , updateStrategy = FieldStrategy.IGNORED)
+    private String name;
+    @TableField("CODE")
+    private String code;
+    @TableField(value = "MOBILE" , updateStrategy = FieldStrategy.IGNORED)
+    private String mobile;
+    @TableField(value = "WECHAT" , updateStrategy = FieldStrategy.IGNORED)
+    private String wechat;
+    @TableField(value = "SEX" , updateStrategy = FieldStrategy.IGNORED)
+    private String sex;
+    @TableField(value = "BRITHDAY_TIME" , updateStrategy = FieldStrategy.IGNORED)
+    private Date brithdayTime;
+    @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("F_FLOW_ID")
+    private String flowId;
+    @TableField("F_VERSION")
+    private Integer version;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DriverVehicleEntity.java

@@ -0,0 +1,43 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+/**
+ * 司机管理车辆表
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-02-25
+ */
+@Data
+@TableName("jg_driver_vehicle")
+public class DriverVehicleEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField("DRIVER_ID")
+    private String driverId;
+    @TableField(value = "VEHICLE_ID" , updateStrategy = FieldStrategy.IGNORED)
+    private String vehicleId;
+    @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;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VehicleDriverEntity.java

@@ -0,0 +1,47 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+/**
+ * 车辆管理司机表
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-02-25
+ */
+@Data
+@TableName("jg_vehicle_driver")
+public class VehicleDriverEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField("VEHICLE_ID")
+    private String vehicleId;
+    @TableField(value = "DRIVER_ID" , updateStrategy = FieldStrategy.IGNORED)
+    private String driverId;
+    @TableField("NAME")
+    private String name;
+    @TableField("MOBILE")
+    private String mobile;
+    @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;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VehicleEntity.java

@@ -0,0 +1,65 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+/**
+ * 车辆管理表
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-02-25
+ */
+@Data
+@TableName("jg_vehicle")
+public class VehicleEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField(value = "VEHICLE_CODE" , updateStrategy = FieldStrategy.IGNORED)
+    private String vehicleCode;
+    @TableField(value = "TYPE" , updateStrategy = FieldStrategy.IGNORED)
+    private String type;
+    @TableField(value = "VEHICLE_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
+    private String vehicleNumber;
+    @TableField(value = "PHOTO" , updateStrategy = FieldStrategy.IGNORED)
+    private String photo;
+    @TableField(value = "CARRIER" , updateStrategy = FieldStrategy.IGNORED)
+    private String carrier;
+    @TableField("STATUS")
+    private String status;
+    @TableField("NAME")
+    private String name;
+    @TableField("MOBILE")
+    private String mobile;
+    @TableField(value = "PHOTO_ONE" , updateStrategy = FieldStrategy.IGNORED)
+    private String photoOne;
+    @TableField("PHOTO_TWO")
+    private String photoTwo;
+    @TableField("PHOTO_THERE")
+    private String photoThere;
+    @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("F_VERSION")
+    private Integer version;
+    @TableField("F_FLOW_ID")
+    private String flowId;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/driver/DriverForm.java

@@ -0,0 +1,56 @@
+package jnpf.model.driver;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * driver
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-02-25
+ */
+@Data
+public class DriverForm  {
+    /** 主键 */
+    private String id;
+    /** 子表数据 **/
+    @JsonProperty("driverVehicleList")
+    private List<DriverVehicleModel> driverVehicleList;
+    /** 乐观锁 **/
+    @JsonProperty("version")
+    private Integer version;
+    /** 流程id **/
+    @JsonProperty("flowId")
+    private String flowId;
+
+    /** 登录账号 **/
+    @JsonProperty("name")
+    private String name;
+    /** 手机号码 **/
+    @JsonProperty("mobile")
+    private String mobile;
+    /** 微信账号 **/
+    @JsonProperty("wechat")
+    private String wechat;
+    /** 出生日期 **/
+    @JsonProperty("brithdayTime")
+    private String brithdayTime;
+    /** 性别 **/
+    @JsonProperty("sex")
+    private String sex;
+    /** 创建时间 **/
+    @JsonProperty("creatorTime")
+    private String creatorTime;
+    /** 创建用户 **/
+    @JsonProperty("creatorUserId")
+    private String creatorUserId;
+    /** 修改时间 **/
+    @JsonProperty("lastModifyTime")
+    private String lastModifyTime;
+    /** 修改用户 **/
+    @JsonProperty("lastModifyUserId")
+    private String lastModifyUserId;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/driver/DriverPagination.java

@@ -0,0 +1,45 @@
+package jnpf.model.driver;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * driver
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-02-25
+ */
+@Data
+public class DriverPagination 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("name")
+    private Object name;
+    /** 手机号码 */
+    @JsonProperty("mobile")
+    private Object mobile;
+    /** 微信账号 */
+    @JsonProperty("wechat")
+    private Object wechat;
+    /** 出生日期 */
+    @JsonProperty("brithdayTime")
+    private Object brithdayTime;
+    /** 性别 */
+    @JsonProperty("sex")
+    private Object sex;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/driver/DriverVehicleModel.java

@@ -0,0 +1,24 @@
+package jnpf.model.driver;
+
+import lombok.Data;
+import java.util.List;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.alibaba.fastjson.annotation.JSONField;
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ *
+ * driver
+ * 版本： V3.5
+ * 版权: 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-02-25
+ */
+@Data
+public class DriverVehicleModel  {
+    /** 车牌号 **/
+    @JSONField(name = "vehicleId")
+    private String vehicleId;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/vehicle/VehicleDriverModel.java

@@ -0,0 +1,24 @@
+package jnpf.model.vehicle;
+
+import lombok.Data;
+import java.util.List;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.alibaba.fastjson.annotation.JSONField;
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ *
+ * vehicle
+ * 版本： V3.5
+ * 版权: 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-02-25
+ */
+@Data
+public class VehicleDriverModel  {
+    /** 司机 **/
+    @JSONField(name = "driverId")
+    private String driverId;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/vehicle/VehicleForm.java

@@ -0,0 +1,59 @@
+package jnpf.model.vehicle;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * vehicle
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-02-25
+ */
+@Data
+public class VehicleForm  {
+    /** 主键 */
+    private String id;
+    /** 子表数据 **/
+    @JsonProperty("vehicleDriverList")
+    private List<VehicleDriverModel> vehicleDriverList;
+    /** 乐观锁 **/
+    @JsonProperty("version")
+    private Integer version;
+    /** 流程id **/
+    @JsonProperty("flowId")
+    private String flowId;
+
+    /** 车辆编号 **/
+    @JsonProperty("vehicleCode")
+    private String vehicleCode;
+    /** 车辆类型 **/
+    @JsonProperty("type")
+    private Object type;
+    /** 车辆图片 **/
+    @JsonProperty("photo")
+    private Object photo;
+    /** 车牌号 **/
+    @JsonProperty("vehicleNumber")
+    private String vehicleNumber;
+    /** 承运商 **/
+    @JsonProperty("carrier")
+    private Object carrier;
+    /** 创建时间 **/
+    @JsonProperty("creatorTime")
+    private String creatorTime;
+    /** 创建用户 **/
+    @JsonProperty("creatorUserId")
+    private String creatorUserId;
+    /** 修改时间 **/
+    @JsonProperty("lastModifyTime")
+    private String lastModifyTime;
+    /** 修改用户 **/
+    @JsonProperty("lastModifyUserId")
+    private String lastModifyUserId;
+    /** 车辆信息 **/
+    @JsonProperty("photoOne")
+    private Object photoOne;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/vehicle/VehiclePagination.java

@@ -0,0 +1,42 @@
+package jnpf.model.vehicle;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * vehicle
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-02-25
+ */
+@Data
+public class VehiclePagination 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("vehicleCode")
+    private Object vehicleCode;
+    /** 车辆类型 */
+    @JsonProperty("type")
+    private Object type;
+    /** 车牌号 */
+    @JsonProperty("vehicleNumber")
+    private Object vehicleNumber;
+    /** 承运商 */
+    @JsonProperty("carrier")
+    private Object carrier;
+}

jnpf-java-boot/jnpf-web/src/views/scm/driver/form.vue

@@ -0,0 +1,442 @@
+
+
+
+
+    <template>
+    <div :style="{margin: '0 auto',width:'100%'}">
+    <el-row :gutter="15" class="">
+    <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"  :disabled="setting.readonly" >
+    <template v-if="!loading && formOperates">
+        <!-- 具体表单 -->
+            <el-col :span="24" >
+                <jnpf-form-tip-item>
+                    <JnpfGroupTitle 
+ content="基本信息"  contentPosition="left" >
+                </JnpfGroupTitle>
+                </jnpf-form-tip-item>
+            </el-col>
+        <el-col :span="24"  v-if="judgeShow('name')" >
+        <jnpf-form-tip-item
+ label="登录账号"  v-if="judgeShow('name')"   prop="name" >
+        <JnpfInput   v-model="dataForm.name" @change="changeData('name',-1)" 
+ placeholder="请输入"  :disabled="judgeWrite('name')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="24"  v-if="judgeShow('mobile')" >
+        <jnpf-form-tip-item
+ label="手机号码"  v-if="judgeShow('mobile')"   prop="mobile" >
+        <JnpfInput   v-model="dataForm.mobile" @change="changeData('mobile',-1)" 
+ placeholder="请输入"  :disabled="judgeWrite('mobile')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="24"  v-if="judgeShow('wechat')" >
+        <jnpf-form-tip-item
+ label="微信账号"  v-if="judgeShow('wechat')"   prop="wechat" >
+        <JnpfInput   v-model="dataForm.wechat" @change="changeData('wechat',-1)" 
+ placeholder="请输入"  :disabled="judgeWrite('wechat')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+
+        <el-col :span="24"  v-if="judgeShow('brithdayTime')" >
+        <jnpf-form-tip-item
+ label="出生日期"  v-if="judgeShow('brithdayTime')"   prop="brithdayTime" >
+        <JnpfDatePicker   v-model="dataForm.brithdayTime" @change="changeData('brithdayTime',-1)" 
+ :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  :disabled="judgeWrite('brithdayTime')"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd" >
+    </JnpfDatePicker>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="24"  v-if="judgeShow('sex')" >
+        <jnpf-form-tip-item
+ label="性别"  v-if="judgeShow('sex')"   prop="sex" >
+        <JnpfRadio   v-model="dataForm.sex" @change="changeData('sex',-1)" 
+ :disabled="judgeWrite('sex')"  optionType="default"  direction="horizontal"  size="small"  :options="sexOptions" :props="sexProps" >
+    </JnpfRadio>
+    </jnpf-form-tip-item>
+        </el-col>
+            <el-col :span="24" >
+                <jnpf-form-tip-item>
+                    <JnpfGroupTitle 
+ content="车辆信息"  contentPosition="left" >
+                </JnpfGroupTitle>
+                </jnpf-form-tip-item>
+            </el-col>
+        <el-col :span="24"   v-if="judgeShow('-${html.relationField}')" >
+            <jnpf-form-tip-item label-width="0">
+                    <div class="JNPF-common-title">
+                        <h2></h2>
+                    </div>
+                <el-table :data="dataForm.drivervehicleList" size='mini' >
+                    <el-table-column type="index" width="50" label="序号" align="center" />
+        <el-table-column
+ label="车牌号"  v-if="judgeShow('drivervehicle-vehicleId')"   prop="vehicleId" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('drivervehicleList-vehicleId')" >*</span>车牌号
+                </template>
+        <template slot-scope="scope">
+        <JnpfPopupSelect   v-model="scope.row.vehicleId" @change="changeData('drivervehicle-vehicleId',scope.$index)" 
+ :rowIndex="scope.$index"  :formData="dataForm"  :templateJson="interfaceRes.drivervehiclevehicleId"  placeholder="请选择"  :disabled="judgeWrite('drivervehicleList')||judgeWrite('drivervehicleList-vehicleId')"  hasPage  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='vehicle_number'  :field="'vehicleId'+scope.$index"  interfaceId="531489245886438725"  :pageSize="20"  :columnOptions="drivervehiclevehicleIdcolumnOptions"  clearable  :style='{"width":"100%"}'>
+    </JnpfPopupSelect>
+            </template>
+    </el-table-column>
+                        <el-table-column label="操作" width="50"   v-if="!judgeWrite('drivervehicleList')">
+                            <template slot-scope="scope">
+                                <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="deldrivervehicleList(scope.$index)">删除</el-button>
+                            </template>
+                        </el-table-column>
+                </el-table>
+                    <div class="table-actions" @click="adddrivervehicleList()"  v-if="!judgeWrite('drivervehicleList')">
+                        <el-button type="text" icon="el-icon-plus">添加</el-button>
+                    </div>
+            </jnpf-form-tip-item>
+        </el-col>
+        <!-- 表单结束 -->
+    </template>
+    <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+                  ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
+    </el-form>
+    </el-row>
+    <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
+    </div>
+    </template>
+
+<script>
+    import request from '@/utils/request'
+    import {mapGetters} from "vuex";
+    import {getFormById} from '@/api/workFlow/FormDesign'
+    import comMixin from '@/views/workFlow/workFlowForm/mixin';
+    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 {
+        mixins: [comMixin],
+        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:{
+                            drivervehicleList :{"popupType":"dialog","hasPage":true,"popupTitle":"选择数据","pageSize":20,"columnOptions":[],"interfaceId":"","interfaceName":"","relationOptions":[],"templateJson":[],"popupWidth":"800px"},
+            },
+            //可选范围默认值
+            ableAll:{
+            },
+        tableRows:{
+                    drivervehicleList:{
+                            vehicleId : '',
+                                vehicleIdOptions:[],
+                    enabledmark:undefined
+            },
+        },
+            Vmodel:"",
+            currVmodel:"",
+            dataForm: {
+                                name : undefined,
+                                mobile : undefined,
+                                wechat : undefined,
+                                brithdayTime : undefined,
+                                sex : undefined,
+                                    creatorTime : undefined,
+                                    creatorUserId : undefined,
+                                    lastModifyTime : undefined,
+                                    lastModifyUserId : undefined,
+                        drivervehicleList:[],
+                    version: 0,
+            },
+            tableRequiredData: {},
+            dataRule:
+            {
+                            mobile: [
+                                {
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
+                                },
+                        ],
+            },
+                            sexOptions:[{"fullName":"男","id":"1"},{"fullName":"女","id":"2"},{"fullName":"保密","id":"3"}],
+                            sexProps:{"label":"fullName","value":"id"  },
+                        drivervehiclevehicleIdcolumnOptions:[ {"label":"车牌号","value":"vehicle_number"}, {"label":"车牌图片","value":"photo"},],
+            childIndex:-1,
+                    isEdit:false,
+                    interfaceRes: {
+                        name:[] ,
+                        mobile:[] ,
+                        wechat:[] ,
+                        brithdayTime:[] ,
+                        sex:[] ,
+                        creatorTime:[] ,
+                        creatorUserId:[] ,
+                        lastModifyTime:[] ,
+                        lastModifyUserId:[] ,
+                            drivervehiclevehicleId: [] ,
+            },
+        }
+        },
+        computed: {
+            formOperates() {
+                return this.setting.formOperates
+            }
+        },
+        watch: {},
+        created() {
+            this.getFormById()
+            if(this.dataForm.id == null || this.dataForm.id == '' && this.dataForm.id == undefined || this.dataForm.id == 0) {
+                this.initDefaultData()
+            }
+            this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+        },
+        mounted() {},
+        methods: {
+            changeData(model, index) {
+                this.isEdit = false
+                this.childIndex = index
+                let modelAll = model.split("-");
+                let faceMode = "";
+                for (let i = 0; i < modelAll.length; i++) {
+                    faceMode += modelAll[i];
+                }
+                for (let key in this.interfaceRes) {
+                    if (key != faceMode) {
+                        let faceReList = this.interfaceRes[key]
+                        for (let i = 0; i < faceReList.length; i++) {
+                            if (faceReList[i].relationField == model) {
+                                let options = 'get' + key + 'Options';
+                                if(this[options]){
+                                    this[options]()
+                                }
+                                this.changeData(key, index)
+                            }
+                        }
+                    }
+                }
+            },
+            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(){
+            },
+            selfGetInfo(dataForm) {
+                this.dataInfo(dataForm)
+            },
+            beforeSubmit(){
+                const _data =this.dataList()
+                return _data
+            },
+            selfInit() {
+                this.dataAll()
+            },
+            getFormById() {
+                getFormById("531486086153657669").then(res => {
+                    this.dataForm.flowId = res.data&&res.data.flowId
+                    // this.encode = res.data&&res.data.encode
+                })
+            },
+            exist() {
+                let isOk = true
+                for (let key in this.tableRequiredData) {
+                    if (this.dataForm[key] && Array.isArray(this.dataForm[key])) {
+                        for (let i = 0; i < this.dataForm[key].length; i++) {
+                            let item = this.dataForm[key][i]
+                            inner: for (let id in item) {
+                                let arr = this.tableRequiredData[key].filter(o => o.id === id) || []
+                                if (!arr.length) continue inner
+                                if (arr[0].required) {
+                                    let msg = `${arr[0].name}不能为空`
+                                    let boo = true
+                                    if (arr[0].dataType === 'array') {
+                                        boo = !this.jnpf.isEmptyArray(item[id])
+                                    } else {
+                                        boo = !this.jnpf.isEmpty(item[id])
+                                    }
+                                    if (!boo) {
+                                        this.$message({
+                                            message: msg,
+                                            type: 'error',
+                                            duration: 1000
+                                        })
+                                        isOk = false
+                                        break
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                    if (!this.drivervehicleExist()) return
+                    return isOk
+                },
+                drivervehicleExist() {
+                let isOk = true;
+            for(let i=0;i<this.dataForm.drivervehicleList.length;i++){
+                const e = this.dataForm.drivervehicleList[i];
+                        if (!e.vehicleId) {
+                        this.$message({
+                            message: '车牌号不能为空',
+                            type: 'error',
+                            duration: 1000
+                        });
+                        isOk = false
+                        break
+                        }
+            }
+                return isOk;
+            },
+            clearData(){
+                this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+            },
+            //初始化默认数据
+            initDefaultData() {
+
+            },
+                adddrivervehicleList(){
+                let item = {
+                            vehicleId:'',
+            }
+                this.getdrivervehicleList(item)
+            },
+                deldrivervehicleList(index) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    this.dataForm.drivervehicleList.splice(index, 1);
+                }).catch(() => {
+                });
+            },
+                getdrivervehicleList(value){
+                let item={...this.tableRows.drivervehicleList,...value}
+                this.dataForm.drivervehicleList.push(item)
+                this.childIndex=this.dataForm.drivervehicleList.length-1
+                this.isEdit = true
+                this.isEdit = false
+                this.childIndex = -1
+            },
+            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()
+                    for(let i=0;i<_dataAll.drivervehicleList.length;i++){
+                        this.childIndex = i
+                    }
+                this.childIndex=-1
+            },
+        },
+    }
+
+</script>

jnpf-java-boot/jnpf-web/src/views/scm/driver/index.vue

@@ -0,0 +1,616 @@
+
+
+
+
+
+
+
+<template>
+    <div class="JNPF-common-layout">
+        <div class="JNPF-common-layout-center">
+            <el-row class="JNPF-common-search-box" :gutter="16">
+                <el-form @submit.native.prevent>
+                            <el-col :span="6">
+                                <el-form-item label="登录账号">
+                                        <el-input v-model="query.name" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="手机号码">
+                                        <el-input v-model="query.mobile" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="微信账号">
+                                        <el-input v-model="query.wechat" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                        <template v-if="showAll">
+                                    <el-col :span="6">
+                                        <el-form-item label="出生日期">
+                                                <JnpfDateRangePicker v-model="query.brithdayTime"
+                                                                     format="yyyy-MM-dd" startPlaceholder="开始日期"
+                                                                     endPlaceholder="结束日期" >
+                                                </JnpfDateRangePicker>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <el-form-item label="性别">
+                                                <JnpfSelect v-model="query.sex" placeholder="请选择" clearable
+                                                            :options="sexOptions"
+                                                            :props="sexProps" >
+                                                </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="primary" icon="icon-ym icon-ym-btn-add"  v-has="'btn_add'"  @click="addOrUpdateHandle()">新增
+                                    </el-button>
+                                    <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"  v-has="'btn_download'" >导出
+                                    </el-button>
+                                    <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"  v-has="'btn_batchRemove'" >批量删除
+                                    </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"  
+
+>
+                                                <el-table-column
+                                                            prop="name"
+ label="登录账号"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="mobile"
+ label="手机号码"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="wechat"
+ label="微信账号"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="brithdayTime"
+ label="出生日期"  align="left"
+ >
+                                                </el-table-column>
+                                        <el-table-column label="性别"  prop="sex" algin="left"
+ >
+                                            <template slot-scope="scope">
+                                                {{ scope.row.sex}}
+                                            </template>
+                                        </el-table-column>
+                        <el-table-column prop="flowState" label="状态" width="100" >
+                            <template slot-scope="scope"  v-if="!scope.row.top">
+                                <el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
+                                <el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
+                                <el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
+                                <el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
+                                <el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
+                                <el-tag type="warning" v-else>等待提交</el-tag>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="操作"
+ fixed="right" width="150" >
+                            <template slot-scope="scope"  >
+                                            <el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
+                                                       @click="updateHandle(scope.row)"  v-has="'btn_edit'" >编辑
+                                            </el-button>
+                                            <el-button type="text" class="JNPF-table-delBtn" :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1"  v-has="'btn_remove'"  @click="handleDel(scope.row.id)">删除
+                                            </el-button>
+                                        <el-button size="mini" type="text" :disabled="!scope.row.flowState"
+                                                   @click="updateHandle(scope.row,scope.row.flowState)"
+                                        >详情</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"/>
+
+
+
+        <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
+        <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
+                   :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
+                   lock-scroll width="400px">
+            <el-scrollbar class="template-list">
+                <div class="template-item" v-for="item in flowList" :key="item.id"
+                     @click="selectFlow(item)">{{item.fullName}}
+                </div>
+            </el-scrollbar>
+        </el-dialog>
+
+        <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 { getFormById } from '@/api/workFlow/FormDesign'
+    import { getFlowList } from '@/api/workFlow/FlowEngine'
+    import FlowBox from '@/views/workFlow/components/FlowBox'
+    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: {
+                FlowBox,
+ 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: {
+                        name:undefined,
+                        mobile:undefined,
+                        wechat:undefined,
+                        brithdayTime:undefined,
+                        sex: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,
+                                                                                                                                                                sexOptions:[{"fullName":"男","id":"1"},{"fullName":"女","id":"2"},{"fullName":"保密","id":"3"}],
+                        sexProps:{"label":"fullName","value":"id"  },
+                        tableField108_vehicleIdcolumnOptions:[ {"label":"车牌号","value":"vehicle_number"}, {"label":"车牌图片","value":"photo"},],
+            interfaceRes: {
+                                    tableField108_vehicleId: [] ,
+                },
+            }
+        },
+        computed: {
+            ...mapGetters(['userInfo']),
+            menuId() {
+                return this.$route.meta.modelId || ''
+            }
+        },
+        created() {
+            getFormById("531486086153657669").then(res1 => {
+                let flowId = res1.data&&res1.data.id
+                getFlowList(flowId,'1').then(res2 => {
+                    this.flowList = res2.data
+                        this.getColumnList(),
+                this.initSearchDataAndListData()
+            this.queryData = JSON.parse(JSON.stringify(this.query))
+            }).catch((e) => {
+                this.$message({ type: 'error', message: e.message });
+                this.$router.push('/404');
+            })
+            })
+        },
+        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:'531486086153657669',
+                    type:1,
+                };
+                request({
+                    url: `/api/scm/Driver/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/scm/Driver/${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("","scm/Driver")
+                })
+            },
+                handleSelectionChange(val) {
+                    const res = val.map(item => item.id)
+                    this.multipleSelection = res
+                },
+                handleBatchRemoveDel() {
+                    if (!this.multipleSelection.length) {
+                        this.$message({
+                            type: 'error',
+                            message: '请选择一条数据',
+                            duration: 1500,
+                        })
+                        return
+                    }
+                    const ids = this.multipleSelection
+                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+                        type: 'warning'
+                    }).then(() => {
+                        request({
+                            url: `/api/scm/Driver/batchRemove`,
+                            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,flowState) {
+                if(!row){
+                    this.addHandle();
+                }else {
+                    this.updateHandle(row,flowState)
+                }
+            },
+            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/scm/Driver/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()
+            },
+            //流程改造后相关调用方法
+            updateHandle(row,flowState) {
+                let data = {
+                    id: row.id,
+                    flowId: row.flowId || this.flowList[0].id,
+                    opType: flowState ? 0 : '-1',
+                    status: flowState
+                }
+                this.flowVisible = true
+                this.$nextTick(() => {
+                    this.$refs.FlowBox.init(data)
+                })
+            },
+            toApprovalDetail(row) {
+                let data = {
+                    id: row.id,
+                    flowId: row.flowId,
+                    opType: 0,
+                    status: row.currentState
+                }
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.FlowBox.init(data)
+                })
+            },
+            addHandle() {
+                if (!this.flowList.length) {
+                    this.$message({ type: 'error', message: '流程不存在' });
+                } else if (this.flowList.length === 1) {
+                    this.selectFlow(this.flowList[0])
+                } else {
+                    this.flowListVisible = true
+                }
+            },
+            //选择流程发起
+            selectFlow(item) {
+                let data = {
+                    id: '',
+                    formType: 1,
+                    flowId: item.id,
+                    opType: '-1'
+                }
+                this.flowListVisible = false
+                this.flowVisible = true
+                this.$nextTick(() => {
+                    this.$refs.FlowBox.init(data)
+                })
+            },
+            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>

jnpf-java-boot/jnpf-web/src/views/scm/vehicle/columnList.js

@@ -0,0 +1,2 @@
+const columnList = [{"jnpfKey":"billRule","fullName":"车辆编号","label":"车辆编号","sortable":false,"align":"left","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"billRule","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"rule":"vehicleCode","className":[],"label":"车辆编号","trigger":"change","showLabel":true,"required":false,"tableName":"jg_vehicle","renderKey":1708853488106,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"车辆编号","tag":"JnpfInput","span":10},"readonly":true,"prop":"vehicleCode","width":0,"__vModel__":"vehicleCode","fixed":"none","style":{"width":"100%"},"id":"vehicleCode","placeholder":"系统自动生成"},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"车辆类型","label":"车辆类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"车辆类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_vehicle","renderKey":1708853541696,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":10},"prop":"type","width":0,"options":[{"fullName":"重型半挂牵引车","id":"1"},{"fullName":"重型牵引车","id":"2"},{"fullName":"其他","id":"3"}],"__vModel__":"type","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"type","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"车牌号","label":"车牌号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":106,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"车牌号","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_vehicle","renderKey":1708853613503,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"vehicleNumber","showWordLimit":false,"width":0,"__vModel__":"vehicleNumber","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"vehicleNumber","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"承运商","label":"承运商","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":107,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"承运商","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_vehicle","renderKey":1708853621697,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"carrier","width":0,"options":[{"fullName":"顺丰","id":"1"},{"fullName":"圆通","id":"2"},{"fullName":"中通","id":"3"}],"__vModel__":"carrier","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"carrier","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}}]
+export default columnList

jnpf-java-boot/jnpf-web/src/views/scm/vehicle/form.vue

@@ -0,0 +1,520 @@
+
+
+
+
+    <template>
+    <div :style="{margin: '0 auto',width:'100%'}">
+    <el-row :gutter="15" class="">
+    <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"  :disabled="setting.readonly" >
+    <template v-if="!loading && formOperates">
+        <!-- 具体表单 -->
+            <el-col :span="24" >
+                <jnpf-form-tip-item>
+                    <JnpfGroupTitle 
+ content="基础信息"  contentPosition="left" >
+                </JnpfGroupTitle>
+                </jnpf-form-tip-item>
+            </el-col>
+        <el-col :span="10"  v-if="judgeShow('vehicleCode')" >
+        <jnpf-form-tip-item
+ label="车辆编号"  v-if="judgeShow('vehicleCode')"   prop="vehicleCode" >
+        <JnpfInput   v-model="dataForm.vehicleCode" @change="changeData('vehicleCode',-1)" 
+ placeholder="系统自动生成"  :disabled="judgeWrite('vehicleCode')"  readonly  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="10"  v-if="judgeShow('type')" >
+        <jnpf-form-tip-item
+ label="车辆类型"  v-if="judgeShow('type')"   prop="type" >
+        <JnpfSelect   v-model="dataForm.type" @change="changeData('type',-1)" 
+ placeholder="请选择"  :disabled="judgeWrite('type')"  clearable  :style='{"width":"100%"}' :options="typeOptions" :props="typeProps" >
+    </JnpfSelect>
+    </jnpf-form-tip-item>
+        </el-col>
+            <el-col :span="24" >
+                <jnpf-form-tip-item>
+                    <JnpfGroupTitle 
+ content="车辆信息"  contentPosition="left" >
+                </JnpfGroupTitle>
+                </jnpf-form-tip-item>
+            </el-col>
+        <el-col :span="8"  v-if="judgeShow('photo')" >
+        <jnpf-form-tip-item
+ label="车辆图片"  v-if="judgeShow('photo')"   prop="photo" >
+        <JnpfUploadImg   v-model="dataForm.photo" @change="changeData('photo',-1)" 
+ :disabled="judgeWrite('photo')"  :fileSize="10" sizeUnit="MB"  :limit="1"  pathType="defaultPath"  :isAccount="0" >
+    </JnpfUploadImg>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8"  v-if="judgeShow('vehicleNumber')" >
+        <jnpf-form-tip-item
+ label="车牌号"  v-if="judgeShow('vehicleNumber')"   prop="vehicleNumber" >
+        <JnpfInput   v-model="dataForm.vehicleNumber" @change="changeData('vehicleNumber',-1)" 
+ placeholder="请输入"  :disabled="judgeWrite('vehicleNumber')"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8"  v-if="judgeShow('carrier')" >
+        <jnpf-form-tip-item
+ label="承运商"  v-if="judgeShow('carrier')"   prop="carrier" >
+        <JnpfSelect   v-model="dataForm.carrier" @change="changeData('carrier',-1)" 
+ placeholder="请选择"  :disabled="judgeWrite('carrier')"  clearable  :style='{"width":"100%"}' :options="carrierOptions" :props="carrierProps" >
+    </JnpfSelect>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="24"  v-if="judgeShow('creatorTime')" >
+        <jnpf-form-tip-item
+ label="创建时间"  v-if="judgeShow('creatorTime')"   prop="creatorTime" >
+        <JnpfOpenData   v-model="dataForm.creatorTime" @change="changeData('creatorTime',-1)" 
+ placeholder="系统自动生成"  :disabled="judgeWrite('creatorTime')"  readonly  :style='{"width":"100%"}' type="currTime" >
+    </JnpfOpenData>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="24"  v-if="judgeShow('creatorUserId')" >
+        <jnpf-form-tip-item
+ label="创建用户"  v-if="judgeShow('creatorUserId')"   prop="creatorUserId" >
+        <JnpfOpenData   v-model="dataForm.creatorUserId" @change="changeData('creatorUserId',-1)" 
+ placeholder="系统自动生成"  :disabled="judgeWrite('creatorUserId')"  readonly  :style='{"width":"100%"}' type="currUser" >
+    </JnpfOpenData>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="24"  v-if="judgeShow('lastModifyTime')" >
+        <jnpf-form-tip-item
+ label="修改时间"  v-if="judgeShow('lastModifyTime')"   prop="lastModifyTime" >
+        <JnpfInput   v-model="dataForm.lastModifyTime" @change="changeData('lastModifyTime',-1)" 
+ placeholder="系统自动生成"  :disabled="judgeWrite('lastModifyTime')"  readonly  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="24"  v-if="judgeShow('lastModifyUserId')" >
+        <jnpf-form-tip-item
+ label="修改用户"  v-if="judgeShow('lastModifyUserId')"   prop="lastModifyUserId" >
+        <JnpfInput   v-model="dataForm.lastModifyUserId" @change="changeData('lastModifyUserId',-1)" 
+ placeholder="系统自动生成"  :disabled="judgeWrite('lastModifyUserId')"  readonly  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+            <el-col :span="24" >
+                <jnpf-form-tip-item>
+                    <JnpfGroupTitle 
+ content="运输信息"  contentPosition="left" >
+                </JnpfGroupTitle>
+                </jnpf-form-tip-item>
+            </el-col>
+        <el-col :span="24"  v-if="judgeShow('photoOne')" >
+        <jnpf-form-tip-item
+ label="车辆信息"  v-if="judgeShow('photoOne')"   prop="photoOne" >
+        <JnpfUploadImg   v-model="dataForm.photoOne" @change="changeData('photoOne',-1)" 
+ :disabled="judgeWrite('photoOne')"  :fileSize="10" sizeUnit="MB"  :limit="9"  pathType="defaultPath"  :isAccount="0" >
+    </JnpfUploadImg>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="24"   v-if="judgeShow('-${html.relationField}')" >
+            <jnpf-form-tip-item label-width="0">
+                    <div class="JNPF-common-title">
+                        <h2></h2>
+                    </div>
+                <el-table :data="dataForm.vehicledriverList" size='mini' >
+                    <el-table-column type="index" width="50" label="序号" align="center" />
+        <el-table-column
+ label="司机"  v-if="judgeShow('vehicledriver-driverId')"   prop="driverId" >
+                <template slot="header" >
+                    <span class="required-sign"   v-if="judgeRequired('vehicledriverList-driverId')" >*</span>司机
+                </template>
+        <template slot-scope="scope">
+        <JnpfPopupSelect   v-model="scope.row.driverId" @change="changeData('vehicledriver-driverId',scope.$index)" 
+ :rowIndex="scope.$index"  :formData="dataForm"  :templateJson="interfaceRes.vehicledriverdriverId"  placeholder="请选择"  :disabled="judgeWrite('vehicledriverList')||judgeWrite('vehicledriverList-driverId')"  hasPage  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='name'  :field="'driverId'+scope.$index"  interfaceId="531491203053542725"  :pageSize="20"  :columnOptions="vehicledriverdriverIdcolumnOptions"  clearable  :style='{"width":"100%"}'>
+    </JnpfPopupSelect>
+            </template>
+    </el-table-column>
+                        <el-table-column label="操作" width="50"   v-if="!judgeWrite('vehicledriverList')">
+                            <template slot-scope="scope">
+                                <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delvehicledriverList(scope.$index)">删除</el-button>
+                            </template>
+                        </el-table-column>
+                </el-table>
+                    <div class="table-actions" @click="addvehicledriverList()"  v-if="!judgeWrite('vehicledriverList')">
+                        <el-button type="text" icon="el-icon-plus">添加</el-button>
+                    </div>
+            </jnpf-form-tip-item>
+        </el-col>
+        <!-- 表单结束 -->
+    </template>
+    <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+                  ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
+    </el-form>
+    </el-row>
+    <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
+    </div>
+    </template>
+
+<script>
+    import request from '@/utils/request'
+    import {mapGetters} from "vuex";
+    import {getFormById} from '@/api/workFlow/FormDesign'
+    import comMixin from '@/views/workFlow/workFlowForm/mixin';
+    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 {
+        mixins: [comMixin],
+        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:{
+                            vehicledriverList :{"popupType":"dialog","hasPage":true,"popupTitle":"选择数据","pageSize":20,"columnOptions":[],"interfaceId":"","interfaceName":"","relationOptions":[],"templateJson":[],"popupWidth":"800px"},
+            },
+            //可选范围默认值
+            ableAll:{
+            },
+        tableRows:{
+                    vehicledriverList:{
+                            driverId : '',
+                                driverIdOptions:[],
+                    enabledmark:undefined
+            },
+        },
+            Vmodel:"",
+            currVmodel:"",
+            dataForm: {
+                                vehicleCode : undefined,
+                                    type : undefined,
+                                    photo : [],
+                                vehicleNumber : undefined,
+                                    carrier : undefined,
+                                    creatorTime : undefined,
+                                    creatorUserId : undefined,
+                                    lastModifyTime : undefined,
+                                    lastModifyUserId : undefined,
+                                    photoOne : [],
+                        vehicledriverList:[],
+                    version: 0,
+            },
+            tableRequiredData: {},
+            dataRule:
+            {
+                            type: [
+                                {
+                                    required: true,
+                                    message: '请选择',
+                                    trigger: 'change'
+                                },
+                        ],
+                            photo: [
+                                {
+                                    required: true,
+                                    message: '请至少选择一个',
+                                    trigger: 'change'
+                                },
+                        ],
+                            vehicleNumber: [
+                                {
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
+                                },
+                        ],
+                            carrier: [
+                                {
+                                    required: true,
+                                    message: '请选择',
+                                    trigger: 'change'
+                                },
+                        ],
+                            photoOne: [
+                                {
+                                    required: true,
+                                    message: '请至少选择一个',
+                                    trigger: 'change'
+                                },
+                        ],
+            },
+                            typeOptions:[{"fullName":"重型半挂牵引车","id":"1"},{"fullName":"重型牵引车","id":"2"},{"fullName":"其他","id":"3"}],
+                            typeProps:{"label":"fullName","value":"id"  },
+                            carrierOptions:[{"fullName":"顺丰","id":"1"},{"fullName":"圆通","id":"2"},{"fullName":"中通","id":"3"}],
+                            carrierProps:{"label":"fullName","value":"id"  },
+                        vehicledriverdriverIdcolumnOptions:[ {"label":"name","value":"名称"}, {"label":"mobile","value":"驾驶员电话"}, {"label":"wechat","value":"微信账号"},],
+            childIndex:-1,
+                    isEdit:false,
+                    interfaceRes: {
+                        vehicleCode:[] ,
+                        type:[] ,
+                        photo:[] ,
+                        vehicleNumber:[] ,
+                        carrier:[] ,
+                        creatorTime:[] ,
+                        creatorUserId:[] ,
+                        lastModifyTime:[] ,
+                        lastModifyUserId:[] ,
+                        photoOne:[] ,
+                            vehicledriverdriverId: [] ,
+            },
+        }
+        },
+        computed: {
+            formOperates() {
+                return this.setting.formOperates
+            }
+        },
+        watch: {},
+        created() {
+            this.getFormById()
+            if(this.dataForm.id == null || this.dataForm.id == '' && this.dataForm.id == undefined || this.dataForm.id == 0) {
+                this.initDefaultData()
+            }
+            this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+        },
+        mounted() {},
+        methods: {
+            changeData(model, index) {
+                this.isEdit = false
+                this.childIndex = index
+                let modelAll = model.split("-");
+                let faceMode = "";
+                for (let i = 0; i < modelAll.length; i++) {
+                    faceMode += modelAll[i];
+                }
+                for (let key in this.interfaceRes) {
+                    if (key != faceMode) {
+                        let faceReList = this.interfaceRes[key]
+                        for (let i = 0; i < faceReList.length; i++) {
+                            if (faceReList[i].relationField == model) {
+                                let options = 'get' + key + 'Options';
+                                if(this[options]){
+                                    this[options]()
+                                }
+                                this.changeData(key, index)
+                            }
+                        }
+                    }
+                }
+            },
+            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(){
+            },
+            selfGetInfo(dataForm) {
+                this.dataInfo(dataForm)
+            },
+            beforeSubmit(){
+                const _data =this.dataList()
+                return _data
+            },
+            selfInit() {
+                this.dataAll()
+            },
+            getFormById() {
+                getFormById("531489911639924037").then(res => {
+                    this.dataForm.flowId = res.data&&res.data.flowId
+                    // this.encode = res.data&&res.data.encode
+                })
+            },
+            exist() {
+                let isOk = true
+                for (let key in this.tableRequiredData) {
+                    if (this.dataForm[key] && Array.isArray(this.dataForm[key])) {
+                        for (let i = 0; i < this.dataForm[key].length; i++) {
+                            let item = this.dataForm[key][i]
+                            inner: for (let id in item) {
+                                let arr = this.tableRequiredData[key].filter(o => o.id === id) || []
+                                if (!arr.length) continue inner
+                                if (arr[0].required) {
+                                    let msg = `${arr[0].name}不能为空`
+                                    let boo = true
+                                    if (arr[0].dataType === 'array') {
+                                        boo = !this.jnpf.isEmptyArray(item[id])
+                                    } else {
+                                        boo = !this.jnpf.isEmpty(item[id])
+                                    }
+                                    if (!boo) {
+                                        this.$message({
+                                            message: msg,
+                                            type: 'error',
+                                            duration: 1000
+                                        })
+                                        isOk = false
+                                        break
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                    if (!this.vehicledriverExist()) return
+                    return isOk
+                },
+                vehicledriverExist() {
+                let isOk = true;
+            for(let i=0;i<this.dataForm.vehicledriverList.length;i++){
+                const e = this.dataForm.vehicledriverList[i];
+                        if (!e.driverId) {
+                        this.$message({
+                            message: '司机不能为空',
+                            type: 'error',
+                            duration: 1000
+                        });
+                        isOk = false
+                        break
+                        }
+            }
+                return isOk;
+            },
+            clearData(){
+                this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+            },
+            //初始化默认数据
+            initDefaultData() {
+
+            },
+                addvehicledriverList(){
+                let item = {
+                            driverId:'',
+            }
+                this.getvehicledriverList(item)
+            },
+                delvehicledriverList(index) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    this.dataForm.vehicledriverList.splice(index, 1);
+                }).catch(() => {
+                });
+            },
+                getvehicledriverList(value){
+                let item={...this.tableRows.vehicledriverList,...value}
+                this.dataForm.vehicledriverList.push(item)
+                this.childIndex=this.dataForm.vehicledriverList.length-1
+                this.isEdit = true
+                this.isEdit = false
+                this.childIndex = -1
+            },
+            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()
+                    for(let i=0;i<_dataAll.vehicledriverList.length;i++){
+                        this.childIndex = i
+                    }
+                this.childIndex=-1
+            },
+        },
+    }
+
+</script>

jnpf-java-boot/jnpf-web/src/views/scm/vehicle/index.vue

@@ -0,0 +1,608 @@
+
+
+
+
+
+
+
+<template>
+    <div class="JNPF-common-layout">
+        <div class="JNPF-common-layout-center">
+            <el-row class="JNPF-common-search-box" :gutter="16">
+                <el-form @submit.native.prevent>
+                            <el-col :span="6">
+                                <el-form-item label="车辆编号">
+                                        <el-input v-model="query.vehicleCode" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="车辆类型">
+                                        <JnpfSelect v-model="query.type" placeholder="请选择" clearable
+                                                    :options="typeOptions"
+                                                    :props="typeProps"  multiple >
+                                        </JnpfSelect>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="车牌号">
+                                        <el-input v-model="query.vehicleNumber" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                        <template v-if="showAll">
+                                    <el-col :span="6">
+                                        <el-form-item label="承运商">
+                                                <JnpfSelect v-model="query.carrier" placeholder="请选择" clearable
+                                                            :options="carrierOptions"
+                                                            :props="carrierProps"  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="primary" icon="icon-ym icon-ym-btn-add"  v-has="'btn_add'"  @click="addOrUpdateHandle()">新增
+                                    </el-button>
+                                    <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"  v-has="'btn_download'" >导出
+                                    </el-button>
+                                    <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"  v-has="'btn_batchRemove'" >批量删除
+                                    </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"  
+
+>
+                                                <el-table-column
+                                                            prop="vehicleCode"
+ label="车辆编号"  align="left"
+ >
+                                                </el-table-column>
+                                        <el-table-column label="车辆类型"  prop="type" algin="left"
+ >
+                                            <template slot-scope="scope">
+                                                {{ scope.row.type}}
+                                            </template>
+                                        </el-table-column>
+                                                <el-table-column
+                                                            prop="vehicleNumber"
+ label="车牌号"  align="left"
+ >
+                                                </el-table-column>
+                                        <el-table-column label="承运商"  prop="carrier" algin="left"
+ >
+                                            <template slot-scope="scope">
+                                                {{ scope.row.carrier}}
+                                            </template>
+                                        </el-table-column>
+                        <el-table-column prop="flowState" label="状态" width="100" >
+                            <template slot-scope="scope"  v-if="!scope.row.top">
+                                <el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
+                                <el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
+                                <el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
+                                <el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
+                                <el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
+                                <el-tag type="warning" v-else>等待提交</el-tag>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="操作"
+ fixed="right" width="150" >
+                            <template slot-scope="scope"  >
+                                            <el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
+                                                       @click="updateHandle(scope.row)"  v-has="'btn_edit'" >编辑
+                                            </el-button>
+                                            <el-button type="text" class="JNPF-table-delBtn" :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1"  v-has="'btn_remove'"  @click="handleDel(scope.row.id)">删除
+                                            </el-button>
+                                        <el-button size="mini" type="text" :disabled="!scope.row.flowState"
+                                                   @click="updateHandle(scope.row,scope.row.flowState)"
+                                        >详情</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"/>
+
+
+
+        <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
+        <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
+                   :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
+                   lock-scroll width="400px">
+            <el-scrollbar class="template-list">
+                <div class="template-item" v-for="item in flowList" :key="item.id"
+                     @click="selectFlow(item)">{{item.fullName}}
+                </div>
+            </el-scrollbar>
+        </el-dialog>
+
+        <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 { getFormById } from '@/api/workFlow/FormDesign'
+    import { getFlowList } from '@/api/workFlow/FlowEngine'
+    import FlowBox from '@/views/workFlow/components/FlowBox'
+    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: {
+                FlowBox,
+ 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: {
+                        vehicleCode:undefined,
+                        type:undefined,
+                        vehicleNumber:undefined,
+                        carrier: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,
+                                                                                                                                                                typeOptions:[{"fullName":"重型半挂牵引车","id":"1"},{"fullName":"重型牵引车","id":"2"},{"fullName":"其他","id":"3"}],
+                        typeProps:{"label":"fullName","value":"id"  },
+                            carrierOptions:[{"fullName":"顺丰","id":"1"},{"fullName":"圆通","id":"2"},{"fullName":"中通","id":"3"}],
+                        carrierProps:{"label":"fullName","value":"id"  },
+                        tableField110_driverIdcolumnOptions:[ {"label":"name","value":"名称"}, {"label":"mobile","value":"驾驶员电话"}, {"label":"wechat","value":"微信账号"},],
+            interfaceRes: {
+                                    tableField110_driverId: [] ,
+                },
+            }
+        },
+        computed: {
+            ...mapGetters(['userInfo']),
+            menuId() {
+                return this.$route.meta.modelId || ''
+            }
+        },
+        created() {
+            getFormById("531489911639924037").then(res1 => {
+                let flowId = res1.data&&res1.data.id
+                getFlowList(flowId,'1').then(res2 => {
+                    this.flowList = res2.data
+                        this.getColumnList(),
+                this.initSearchDataAndListData()
+            this.queryData = JSON.parse(JSON.stringify(this.query))
+            }).catch((e) => {
+                this.$message({ type: 'error', message: e.message });
+                this.$router.push('/404');
+            })
+            })
+        },
+        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:'531489911639924037',
+                    type:1,
+                };
+                request({
+                    url: `/api/scm/Vehicle/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/scm/Vehicle/${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("","scm/Vehicle")
+                })
+            },
+                handleSelectionChange(val) {
+                    const res = val.map(item => item.id)
+                    this.multipleSelection = res
+                },
+                handleBatchRemoveDel() {
+                    if (!this.multipleSelection.length) {
+                        this.$message({
+                            type: 'error',
+                            message: '请选择一条数据',
+                            duration: 1500,
+                        })
+                        return
+                    }
+                    const ids = this.multipleSelection
+                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+                        type: 'warning'
+                    }).then(() => {
+                        request({
+                            url: `/api/scm/Vehicle/batchRemove`,
+                            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,flowState) {
+                if(!row){
+                    this.addHandle();
+                }else {
+                    this.updateHandle(row,flowState)
+                }
+            },
+            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/scm/Vehicle/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()
+            },
+            //流程改造后相关调用方法
+            updateHandle(row,flowState) {
+                let data = {
+                    id: row.id,
+                    flowId: row.flowId || this.flowList[0].id,
+                    opType: flowState ? 0 : '-1',
+                    status: flowState
+                }
+                this.flowVisible = true
+                this.$nextTick(() => {
+                    this.$refs.FlowBox.init(data)
+                })
+            },
+            toApprovalDetail(row) {
+                let data = {
+                    id: row.id,
+                    flowId: row.flowId,
+                    opType: 0,
+                    status: row.currentState
+                }
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.FlowBox.init(data)
+                })
+            },
+            addHandle() {
+                if (!this.flowList.length) {
+                    this.$message({ type: 'error', message: '流程不存在' });
+                } else if (this.flowList.length === 1) {
+                    this.selectFlow(this.flowList[0])
+                } else {
+                    this.flowListVisible = true
+                }
+            },
+            //选择流程发起
+            selectFlow(item) {
+                let data = {
+                    id: '',
+                    formType: 1,
+                    flowId: item.id,
+                    opType: '-1'
+                }
+                this.flowListVisible = false
+                this.flowVisible = true
+                this.$nextTick(() => {
+                    this.$refs.FlowBox.init(data)
+                })
+            },
+            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>

jnpf-java-boot/jnpf-web/src/views/scm/vehicle/superQueryJson.js

@@ -0,0 +1,2 @@
+const superQueryJson = [{"__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"billRule","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"rule":"vehicleCode","className":[],"label":"车辆编号","trigger":"change","showLabel":true,"required":false,"tableName":"jg_vehicle","renderKey":1708853488106,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"车辆编号","tag":"JnpfInput","span":10},"readonly":true,"__vModel__":"vehicleCode","fullName":"车辆编号","style":{"width":"100%"},"id":"vehicleCode","placeholder":"系统自动生成"},{"filterable":false,"clearable":true,"multiple":false,"fullName":"车辆类型","props":{"label":"fullName","value":"id"},"__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"车辆类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_vehicle","renderKey":1708853541696,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":10},"options":[{"fullName":"重型半挂牵引车","id":"1"},{"fullName":"重型牵引车","id":"2"},{"fullName":"其他","id":"3"}],"__vModel__":"type","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"type","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"车牌号","addonAfter":"","__config__":{"formId":106,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"车牌号","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_vehicle","renderKey":1708853613503,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"showWordLimit":false,"__vModel__":"vehicleNumber","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"vehicleNumber","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"filterable":false,"clearable":true,"multiple":false,"fullName":"承运商","props":{"label":"fullName","value":"id"},"__config__":{"formId":107,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"承运商","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_vehicle","renderKey":1708853621697,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"options":[{"fullName":"顺丰","id":"1"},{"fullName":"圆通","id":"2"},{"fullName":"中通","id":"3"}],"__vModel__":"carrier","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"carrier","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"popupType":"dialog","hasPage":true,"clearable":true,"fullName":"-司机","pageSize":20,"columnOptions":[{"label":"name","value":"名称"},{"label":"mobile","value":"驾驶员电话"},{"label":"wechat","value":"微信账号"}],"templateJson":[],"relationField":"name","__config__":{"formId":111,"relationTable":"jg_vehicle_driver","visibility":["pc","app"],"jnpfKey":"popupSelect","defaultValue":"","noShow":false,"parentVModel":"tableField110","tipLabel":"","dragDisabled":false,"className":[],"label":"司机","trigger":"change","showLabel":true,"required":true,"tableName":"jg_vehicle","renderKey":1708853709270,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup","isSubTable":true,"tag":"JnpfPopupSelect","regList":[],"span":24},"popupTitle":"选择数据","__vModel__":"driverId","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"tableField110-driverId","placeholder":"请选择","interfaceId":"531491203053542725","interfaceName":"车辆管理-查询司机","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"propsValue":"id"}]
+export default superQueryJson