Merge remote-tracking branch 'origin/master'

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxApiDao.java

@@ -1,5 +1,7 @@
 package com.rongwei.bscommon.sys.dao;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.rongwei.bsentity.vo.ZhcxOutsideInspectionVo;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
@@ -65,7 +67,7 @@ public interface ZhcxApiDao {
             "<foreach collection=\"ids\" separator=\",\" open=\"(\" close=\")\" item=\"item\"> " +
             "   #{item}" +
             "</foreach>" +
-            " AND DELETED = '0' AND t.STATUS = '正常' "+
+            " AND DELETED = '0' AND t.STATUS = '正常' " +
             "</script>")
     List<Map<String, Object>> getSupervisionJJYBySupervisionId(@Param("ids") List<String> ids);
 
@@ -73,5 +75,16 @@ public interface ZhcxApiDao {
     int getIp(@Param("ip") String ip);
 
     @Insert("INSERT INTO ZHCX_IP (ID,IP) VALUES (#{id},#{ip})")
-    void saveIp(@Param("id")String id,@Param("ip")String ip);
+    void saveIp(@Param("id") String id, @Param("ip") String ip);
+
+    @Select("SELECT " +
+            " po.ID as prjId, " +
+            " po.STATION " +
+            "FROM " +
+            " ZHCX_PROJECT_MANAGE pm " +
+            "JOIN ZHCX_PROJECT_ORGANIZATION po ON " +
+            " pm.ID = po.PID " +
+            "WHERE " +
+            " po.USERID = #{userId}")
+    List<JSONObject> getProjectOrgByUserId(@Param("userId") String userId);
 }

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxCommissionCheckDao.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 试车检查表 Mapper 接口
+ * </p>
+ *
+ * @author xuan
+ * @since 2024-09-24
+ */
+public interface ZhcxCommissionCheckDao extends BaseMapper<ZhcxCommissionCheckDo> {
+
+}

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxCommissionCheckDetailDao.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckDetailDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 试车检查子表 Mapper 接口
+ * </p>
+ *
+ * @author xuan
+ * @since 2024-09-24
+ */
+public interface ZhcxCommissionCheckDetailDao extends BaseMapper<ZhcxCommissionCheckDetailDo> {
+
+}

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxCommissionCheckParameterSetDao.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckParameterSetDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 试车检查参数设置表 Mapper 接口
+ * </p>
+ *
+ * @author xuan
+ * @since 2024-09-24
+ */
+public interface ZhcxCommissionCheckParameterSetDao extends BaseMapper<ZhcxCommissionCheckParameterSetDo> {
+
+}

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxCommissionCheckParameterSetDetalDao.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckParameterSetDetalDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 试车检查参数设置子表 Mapper 接口
+ * </p>
+ *
+ * @author xuan
+ * @since 2024-09-24
+ */
+public interface ZhcxCommissionCheckParameterSetDetalDao extends BaseMapper<ZhcxCommissionCheckParameterSetDetalDo> {
+
+}

business-common/src/main/java/com/rongwei/bscommon/sys/service/LuckysheetService.java

@@ -1,5 +1,6 @@
 package com.rongwei.bscommon.sys.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.rongwei.bsentity.domain.LuckysheetDo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.dto.luckysheet.UpdateFilterSelectRequest;
@@ -28,7 +29,7 @@ public interface LuckysheetService extends IService<LuckysheetDo> {
      *
      * @param req
      */
-    void updateDataVerification(UpdateDataVerificationRequest req);
+    JSONObject updateDataVerification(UpdateDataVerificationRequest req);
 
     /**
      * 修改筛选

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxCommissionCheckDetailService.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckDetailDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 试车检查子表 服务类
+ * </p>
+ *
+ * @author xuan
+ * @since 2024-09-24
+ */
+public interface ZhcxCommissionCheckDetailService extends IService<ZhcxCommissionCheckDetailDo> {
+
+}

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxCommissionCheckParameterSetDetalService.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckParameterSetDetalDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 试车检查参数设置子表 服务类
+ * </p>
+ *
+ * @author xuan
+ * @since 2024-09-24
+ */
+public interface ZhcxCommissionCheckParameterSetDetalService extends IService<ZhcxCommissionCheckParameterSetDetalDo> {
+
+}

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxCommissionCheckParameterSetService.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckParameterSetDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 试车检查参数设置表 服务类
+ * </p>
+ *
+ * @author xuan
+ * @since 2024-09-24
+ */
+public interface ZhcxCommissionCheckParameterSetService extends IService<ZhcxCommissionCheckParameterSetDo> {
+
+}

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxCommissionCheckService.java

@@ -0,0 +1,24 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.dto.CommissionCheckDTO;
+import com.rongwei.rwcommon.base.R;
+
+/**
+ * <p>
+ * 试车检查表 服务类
+ * </p>
+ *
+ * @author xuan
+ * @since 2024-09-24
+ */
+public interface ZhcxCommissionCheckService extends IService<ZhcxCommissionCheckDo> {
+
+    /**
+     * 试车报告新增
+     * @param checkDTO 参数
+     * @return 响应状态
+     */
+    R commissionCheckAdd(CommissionCheckDTO checkDTO);
+}

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/LuckysheetServiceImpl.java

@@ -74,7 +74,7 @@ public class LuckysheetServiceImpl extends ServiceImpl<LuckysheetDao, Luckysheet
      * @param req
      */
     @Override
-    public void updateDataVerification(UpdateDataVerificationRequest req) {
+    public JSONObject updateDataVerification(UpdateDataVerificationRequest req) {
 
         //项目相关信息
         ZhcxProjectManageRectifyBatchDo batchDo = projectManageRectifyBatchService.getById(req.getBatchId());//项目信息
@@ -94,6 +94,8 @@ public class LuckysheetServiceImpl extends ServiceImpl<LuckysheetDao, Luckysheet
                 .andWhereObj(whereObj)
                 .build();
         luckySheetService.updateJsonData(updateReq);
+
+        return dropdownJson;
     }
 
     /**

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxApiServiceImpl.java

@@ -372,6 +372,29 @@ public class ZhcxApiServiceImpl implements ZhcxApiService {
             map.put("mySubcontractorZJY", list5);
         }
 
+        //用户在项目中岗位
+        final List<JSONObject> prjOrgList = zhcxApiDao.getProjectOrgByUserId(userId);
+        if(ObjectUtil.isNotEmpty(prjOrgList)) {
+            Map<String, Set<String>> prjOrg = new HashMap<>();
+
+            for(JSONObject row : prjOrgList) {
+                final String prjId = row.getString("prjId");
+                Set<String> orgs = prjOrg.get(prjId);
+
+                if(ObjectUtil.isNull(orgs)) {
+                    orgs = new HashSet<>();
+                }
+                orgs.add(row.getString("STATION"));
+
+                prjOrg.put(prjId, orgs);
+            }
+
+            map.put("prjOrg4User", prjOrg);
+
+        } else {
+            map.put("prjOrg4User", Collections.emptyMap());
+        }
+
 //        List<Map<String, Object>> list5 = zhcxApiDao.getAllOrg();
 //        map.put("allOrg", list5);
         return map;

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxCommissionCheckDetailServiceImpl.java

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckDetailDo;
+import com.rongwei.bscommon.sys.dao.ZhcxCommissionCheckDetailDao;
+import com.rongwei.bscommon.sys.service.ZhcxCommissionCheckDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 试车检查子表 服务实现类
+ * </p>
+ *
+ * @author xuan
+ * @since 2024-09-24
+ */
+@Service
+public class ZhcxCommissionCheckDetailServiceImpl extends ServiceImpl<ZhcxCommissionCheckDetailDao, ZhcxCommissionCheckDetailDo> implements ZhcxCommissionCheckDetailService {
+
+}

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxCommissionCheckParameterSetDetalServiceImpl.java

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckParameterSetDetalDo;
+import com.rongwei.bscommon.sys.dao.ZhcxCommissionCheckParameterSetDetalDao;
+import com.rongwei.bscommon.sys.service.ZhcxCommissionCheckParameterSetDetalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 试车检查参数设置子表 服务实现类
+ * </p>
+ *
+ * @author xuan
+ * @since 2024-09-24
+ */
+@Service
+public class ZhcxCommissionCheckParameterSetDetalServiceImpl extends ServiceImpl<ZhcxCommissionCheckParameterSetDetalDao, ZhcxCommissionCheckParameterSetDetalDo> implements ZhcxCommissionCheckParameterSetDetalService {
+
+}

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxCommissionCheckParameterSetServiceImpl.java

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckParameterSetDo;
+import com.rongwei.bscommon.sys.dao.ZhcxCommissionCheckParameterSetDao;
+import com.rongwei.bscommon.sys.service.ZhcxCommissionCheckParameterSetService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 试车检查参数设置表 服务实现类
+ * </p>
+ *
+ * @author xuan
+ * @since 2024-09-24
+ */
+@Service
+public class ZhcxCommissionCheckParameterSetServiceImpl extends ServiceImpl<ZhcxCommissionCheckParameterSetDao, ZhcxCommissionCheckParameterSetDo> implements ZhcxCommissionCheckParameterSetService {
+
+}

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxCommissionCheckServiceImpl.java

@@ -0,0 +1,180 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.rongwei.bscommon.sys.service.ZhcxCommissionCheckDetailService;
+import com.rongwei.bscommon.sys.service.ZhcxCommissionCheckParameterSetDetalService;
+import com.rongwei.bscommon.sys.service.ZhcxCommissionCheckParameterSetService;
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckDetailDo;
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckDo;
+import com.rongwei.bscommon.sys.dao.ZhcxCommissionCheckDao;
+import com.rongwei.bscommon.sys.service.ZhcxCommissionCheckService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckParameterSetDetalDo;
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckParameterSetDo;
+import com.rongwei.bsentity.dto.CommissionCheckDTO;
+import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.utils.SecurityUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ * 试车检查表 服务实现类
+ * </p>
+ *
+ * @author xuan
+ * @since 2024-09-24
+ */
+@Service
+public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCheckDao, ZhcxCommissionCheckDo> implements ZhcxCommissionCheckService {
+
+    @Autowired
+    private ZhcxCommissionCheckParameterSetService checkParameterSetService;
+
+    @Autowired
+    private ZhcxCommissionCheckDetailService commissionCheckDetailService;
+
+    @Autowired
+    private ZhcxCommissionCheckParameterSetDetalService commissionCheckParameterSetDetalService;
+
+
+    @Transactional(rollbackFor = {java. lang. Exception.class})
+    @Override
+    public R commissionCheckAdd(CommissionCheckDTO checkDTO) {
+        // 试车主表
+        ZhcxCommissionCheckDo check = checkDTO.getCheck();
+        List<ZhcxCommissionCheckParameterSetDetalDo> setDetails = checkDTO.getSetDetails();
+        if(Objects.isNull(check) || Objects.isNull(check.getProjectid()) || Objects.isNull(check.getProjectEname())){
+            return R.error("项目不能为空");
+        }
+        if(setDetails.isEmpty()){
+            return R.error("项目不能为空");
+        }
+        // 试车子表
+        List<ZhcxCommissionCheckDetailDo> checkDetails = checkDTO.getCheckDetails();
+        // 查询已保存过的子表数据(平台bug,已保存的数据只能去数据库中查)
+        List<ZhcxCommissionCheckDetailDo> savedcheckDetails = getSavedDataByPid(check.getId());
+        if(!savedcheckDetails.isEmpty()){
+            checkDetails.addAll(savedcheckDetails);
+        }
+        // 创建新增集合
+        // 试车主子表
+        List<ZhcxCommissionCheckDo> resultCheckDo = new ArrayList<>();
+        List<ZhcxCommissionCheckDetailDo>  resultCheckDetailDo = new ArrayList<>();
+        // 试车参数设置子表
+        List<ZhcxCommissionCheckParameterSetDetalDo> resultCheckParameterSetDetail = new ArrayList<>();
+
+        // 试车参数主表
+        ZhcxCommissionCheckParameterSetDo parameterSetDo = checkParameterSetData(check);
+        // 正片开始
+        for (ZhcxCommissionCheckParameterSetDetalDo setDetail : setDetails) {
+            // 试车检查主表机号判断 如果该机已存在就返回
+            LambdaQueryWrapper<ZhcxCommissionCheckDo> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(ZhcxCommissionCheckDo::getDeleted,"0")
+                    .eq(ZhcxCommissionCheckDo::getMachineid,setDetail.getMachineid());
+            List<ZhcxCommissionCheckDo> checkDos = this.list(queryWrapper);
+            if (!checkDos.isEmpty()){
+                continue;
+            }
+            // 防止机号重复
+            checkParameterSetDetalDo(setDetail.getMachineid());
+
+            ZhcxCommissionCheckDo zhcxCommissionCheckDo = new ZhcxCommissionCheckDo();
+            BeanUtil.copyProperties(check,zhcxCommissionCheckDo);
+            // 机号id
+            String machineid = setDetail.getMachineid();
+            // 机号
+            String machineno = setDetail.getMachineno();
+            // 新的试车检查主表id
+            String  newCheckId = zhcxCommissionCheckDo.getId()+machineno.replace("#","");
+            // 构件试车主表
+            zhcxCommissionCheckDo.setId(newCheckId).setMachineid(machineid).setMachineno(machineno);
+            resultCheckDo.add(zhcxCommissionCheckDo);
+            // 试车子表
+            if(!checkDetails.isEmpty()){
+                for (ZhcxCommissionCheckDetailDo checkDetail : checkDetails) {
+                    ZhcxCommissionCheckDetailDo detailDo = new ZhcxCommissionCheckDetailDo();
+                    BeanUtil.copyProperties(checkDetail,detailDo);
+                    detailDo.setId(SecurityUtil.getUUID());
+                    detailDo.setPid(zhcxCommissionCheckDo.getId());
+                    resultCheckDetailDo.add(detailDo);
+                }
+            }
+            //试车参数子表
+            setDetail.setPid(parameterSetDo.getId());
+            setDetail.setCheckid(newCheckId);
+            setDetail.setProjectid(check.getProjectid());
+            resultCheckParameterSetDetail.add(setDetail);
+        }
+
+        // 保存操作
+        if(!resultCheckDo.isEmpty()){
+            this.saveBatch(resultCheckDo);
+        }
+        if(!resultCheckDetailDo.isEmpty()){
+            commissionCheckDetailService.saveBatch(resultCheckDetailDo);
+        }
+        if(!resultCheckParameterSetDetail.isEmpty()){
+            commissionCheckParameterSetDetalService.saveBatch(resultCheckParameterSetDetail);
+        }
+        return R.ok("保存成功");
+    }
+
+    /**
+     * 构建/查找返回 试车参数主表
+     * @param check  伪试车主表
+     * @return
+     */
+    private ZhcxCommissionCheckParameterSetDo checkParameterSetData(ZhcxCommissionCheckDo check){
+        LambdaQueryWrapper<ZhcxCommissionCheckParameterSetDo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ZhcxCommissionCheckParameterSetDo::getDeleted,"0")
+                .eq(ZhcxCommissionCheckParameterSetDo::getProjectid,check.getProjectid());
+        List<ZhcxCommissionCheckParameterSetDo> list = checkParameterSetService.list(queryWrapper);
+        if (list.isEmpty()){
+            ZhcxCommissionCheckParameterSetDo parameterSetDo = new ZhcxCommissionCheckParameterSetDo();
+            parameterSetDo.setId(SecurityUtil.getUUID());
+            parameterSetDo.setProjectid(check.getProjectid());
+            parameterSetDo.setProjectcode(check.getProjectcode());
+            parameterSetDo.setProjectname(check.getProjectname());
+            checkParameterSetService.save(parameterSetDo);
+            return parameterSetDo;
+        }else {
+            return list.get(0);
+        }
+    }
+
+    /**
+     * 平台bug之一 返回已保存在试车子表
+     * @param pid 伪主表id
+     * @return
+     */
+    private List<ZhcxCommissionCheckDetailDo> getSavedDataByPid(String pid){
+        LambdaQueryWrapper<ZhcxCommissionCheckDetailDo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ZhcxCommissionCheckDetailDo::getDeleted,"0")
+                .eq(ZhcxCommissionCheckDetailDo::getPid,pid);
+        return commissionCheckDetailService.list(queryWrapper);
+    }
+
+    /**
+     * 参数数据子表伪删除
+     * @param machineid 机号id
+     */
+    private void checkParameterSetDetalDo(String machineid){
+        // 可能原因 没有把参数子表数据删了  重新建数据 id跟机号是相同的 可能导致机号数据doule
+        LambdaQueryWrapper<ZhcxCommissionCheckParameterSetDetalDo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ZhcxCommissionCheckParameterSetDetalDo::getDeleted,"0")
+                .eq(ZhcxCommissionCheckParameterSetDetalDo::getMachineid,machineid);
+        List<ZhcxCommissionCheckParameterSetDetalDo> list = commissionCheckParameterSetDetalService.list(queryWrapper);
+        if (!list.isEmpty()){
+            ZhcxCommissionCheckParameterSetDetalDo detalDo = list.get(0);
+            detalDo.setDeleted("1");
+            commissionCheckParameterSetDetalService.updateById(detalDo);
+        }
+    }
+}

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxCommissionCheckDetailDo.java

@@ -0,0 +1,235 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.rongwei.rwcommon.base.BaseDo;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 试车检查子表
+ * </p>
+ *
+ * @author xuan
+ * @since 2024-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("ZHCX_COMMISSION_CHECK_DETAIL")
+public class ZhcxCommissionCheckDetailDo extends BaseDo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @JsonProperty("ID")
+    @TableField("ID")
+    private String id;
+    /**
+     * 租户id
+     */
+    @JsonProperty("TENANTID")
+    @TableField("TENANTID")
+    private String tenantid;
+    /**
+     * 扩展json格式配置
+     */
+    @JsonProperty("ROPTION")
+    @TableField("ROPTION")
+    private String roption;
+    /**
+     * 调试确认结果
+     */
+    @JsonProperty("DEBUGGERRESULT")
+    @TableField("DEBUGGERRESULT")
+    private String debuggerresult;
+    /**
+     * 调试数据
+     */
+    @JsonProperty("DEBUGGERDATA")
+    @TableField("DEBUGGERDATA")
+    private String debuggerdata;
+    /**
+     * 自检员
+     */
+    @JsonProperty("SELFTESTER")
+    @TableField("SELFTESTER")
+    private String selftester;
+    /**
+     * 自检员id
+     */
+    @JsonProperty("SELFTESTERID")
+    @TableField("SELFTESTERID")
+    private String selftesterid;
+    /**
+     * 调试日期
+     */
+    @JsonProperty("DEBUGGERDATE")
+    @TableField("DEBUGGERDATE")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date debuggerdate;
+    /**
+     * 调试图片
+     */
+    @JsonProperty("DEBUGGERPIC")
+    @TableField("DEBUGGERPIC")
+    private String debuggerpic;
+    /**
+     * 调试备注
+     */
+    @JsonProperty("DEBUGGERNOTES")
+    @TableField("DEBUGGERNOTES")
+    private String debuggernotes;
+    /**
+     * 测试结果
+     */
+    @JsonProperty("TESTRESULT")
+    @TableField("TESTRESULT")
+    private String testresult;
+    /**
+     * 测试数据
+     */
+    @JsonProperty("TESTDATA")
+    @TableField("TESTDATA")
+    private String testdata;
+    /**
+     * qa
+     */
+    @JsonProperty("QA")
+    @TableField("QA")
+    private String qa;
+    /**
+     * qaId
+     */
+    @JsonProperty("QAID")
+    @TableField("QAID")
+    private String qaid;
+    /**
+     * 测试日期
+     */
+    @JsonProperty("TESTDATE")
+    @TableField("TESTDATE")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date testdate;
+    /**
+     * 测试图片
+     */
+    @JsonProperty("TESTPIC")
+    @TableField("TESTPIC")
+    private String testpic;
+    /**
+     * 测试备注
+     */
+    @JsonProperty("TESTNOTES")
+    @TableField("TESTNOTES")
+    private String testnotes;
+    /**
+     * 标准库子表id
+     */
+    @JsonProperty("BASEDETAILID")
+    @TableField("BASEDETAILID")
+    private String basedetailid;
+    /**
+     * 父id
+     */
+    @JsonProperty("PID")
+    @TableField("PID")
+    private String pid;
+    /**
+     * 章节号
+     */
+    @JsonProperty("CHAPTERNO")
+    @TableField("CHAPTERNO")
+    private String chapterno;
+    /**
+     * 分类
+     */
+    @JsonProperty("CLASSIFICATION")
+    @TableField("CLASSIFICATION")
+    private String classification;
+    /**
+     * 分类2
+     */
+    @JsonProperty("CLASSIFICATIONTWO")
+    @TableField("CLASSIFICATIONTWO")
+    private String classificationtwo;
+    /**
+     * 标题中文
+     */
+    @JsonProperty("CHTITLE")
+    @TableField("CHTITLE")
+    private String chtitle;
+    /**
+     * 标题英文
+     */
+    @JsonProperty("ENTITLE")
+    @TableField("ENTITLE")
+    private String entitle;
+    /**
+     * 测试内容中文
+     */
+    @JsonProperty("CHTESTCONTENT")
+    @TableField("CHTESTCONTENT")
+    private String chtestcontent;
+    /**
+     * 测试内容英文
+     */
+    @JsonProperty("ENTESTCONTENT")
+    @TableField("ENTESTCONTENT")
+    private String entestcontent;
+    /**
+     * 标准测试方法
+     */
+    @JsonProperty("TESTMETHOD")
+    @TableField("TESTMETHOD")
+    private String testmethod;
+    /**
+     * 标准测试时间
+     */
+    @JsonProperty("TESTTIME")
+    @TableField("TESTTIME")
+    private String testtime;
+    /**
+     * 状态
+     */
+    @JsonProperty("STATUS")
+    @TableField("STATUS")
+    private String status;
+
+    /**
+     * 一级分类
+     */
+    @JsonProperty("ONELEVELCLASSIFICATION")
+    @TableField("ONELEVELCLASSIFICATION")
+    private String onelevelclassification;
+
+    /**
+     * 二级分类
+     */
+    @JsonProperty("SECONDLEVELCLASSIFICATION")
+    @TableField("SECONDLEVELCLASSIFICATION")
+    private String secondlevelclassification;
+
+    /**
+     * 三级分类
+     */
+    @JsonProperty("THREELEVELCLASSIFICATION")
+    @TableField("THREELEVELCLASSIFICATION")
+    private String threelevelclassification;
+
+    /**
+     * 四级分类
+     */
+    @JsonProperty("FOURONELEVELCLASSIFICATION")
+    @TableField("FOURONELEVELCLASSIFICATION")
+    private String fouronelevelclassification;
+}

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxCommissionCheckDo.java

@@ -0,0 +1,150 @@
+package com.rongwei.bsentity.domain;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.rongwei.rwcommon.base.BaseDo;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 试车检查表
+ * </p>
+ *
+ * @author xuan
+ * @since 2024-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("ZHCX_COMMISSION_CHECK")
+public class ZhcxCommissionCheckDo extends BaseDo{
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableField("ID")
+    @JsonProperty("ID")
+    private String id;
+    /**
+     * 租户id
+     */
+    @TableField("TENANTID")
+    @JsonProperty("TENANTID")
+    private String tenantid;
+    /**
+     * 扩展json格式配置
+     */
+    @JsonProperty("ROPTION")
+    @TableField("ROPTION")
+    private String roption;
+    /**
+     * 项目id
+     */
+    @JsonProperty("PROJECTID")
+    @TableField("PROJECTID")
+    private String projectid;
+    /**
+     * 项目工号
+     */
+    @JsonProperty("PROJECTCODE")
+    @TableField("PROJECTCODE")
+    private String projectcode;
+    /**
+     * 项目名称
+     */
+    @JsonProperty("PROJECTNAME")
+    @TableField("PROJECTNAME")
+    private String projectname;
+    /**
+     * 机号id
+     */
+    @JsonProperty("MACHINEID")
+    @TableField("MACHINEID")
+    private String machineid;
+    /**
+     * 机号
+     */
+    @JsonProperty("MACHINENO")
+    @TableField("MACHINENO")
+    private String machineno;
+    /**
+     * 备注
+     */
+    @JsonProperty("NOTES")
+    @TableField("NOTES")
+    private String notes;
+    /**
+     * 分包商铭牌参数完成率
+     */
+    @TableField("SUBCONTRACTORNAMEPLATE")
+    private String subcontractornameplate;
+    /**
+     * 分包商主功能完成率
+     */
+    @TableField("SUBCONTRACTORMAIN")
+    private String subcontractormain;
+    /**
+     * 分包商辅助功能完成率
+     */
+    @TableField("SUBCONTRACTORAUXILIARY")
+    private String subcontractorauxiliary;
+    /**
+     * 分包商子系统完成率
+     */
+    @TableField("SUBCONTRACTORAUBSYSTEM")
+    private String subcontractoraubsystem;
+    /**
+     * QA铭牌参数完成率
+     */
+    @TableField("QANAMEPLATE")
+    private String qanameplate;
+    /**
+     * QA主功能完成率
+     */
+    @TableField("QAMAIN")
+    private String qamain;
+    /**
+     * QA辅助功能完成率
+     */
+    @TableField("QAAUXILIARY")
+    private String qaauxiliary;
+    /**
+     * QA子系统完成率
+     */
+    @TableField("QAAUBSYSTEM")
+    private String qaaubsystem;
+    /**
+     * 产品类型
+     */
+    @JsonProperty("PRODUCT_TYPE")
+    @TableField("PRODUCT_TYPE")
+    private String productType;
+    /**
+     * 项目简称
+     */
+    @JsonProperty("PROJECT_ENAME")
+    @TableField("PROJECT_ENAME")
+    private String projectEname;
+    /**
+     * 机号id(多选)
+     */
+    @JsonProperty("MACHINESID")
+    @TableField("MACHINESID")
+    private String machinesid;
+    /**
+     * 机号(多选)
+     */
+    @JsonProperty("MACHINESNO")
+    @TableField("MACHINESNO")
+    private String machinesno;
+
+
+}

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxCommissionCheckParameterSetDetalDo.java

@@ -0,0 +1,125 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.rongwei.rwcommon.base.BaseDo;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 试车检查参数设置子表
+ * </p>
+ *
+ * @author xuan
+ * @since 2024-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("ZHCX_COMMISSION_CHECK_PARAMETER_SET_DETAL")
+public class ZhcxCommissionCheckParameterSetDetalDo extends BaseDo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @JsonProperty("ID")
+    @TableField("ID")
+    private String id;
+    /**
+     * 父ID
+     */
+    @JsonProperty("PID")
+    @TableField("PID")
+    private String pid;
+    /**
+     * 项目ID
+     */
+    @JsonProperty("PROJECTID")
+    @TableField("PROJECTID")
+    private String projectid;
+    /**
+     * 租户id
+     */
+    @JsonProperty("TENANTID")
+    @TableField("TENANTID")
+    private String tenantid;
+    /**
+     * 扩展json格式配置
+     */
+    @JsonProperty("ROPTION")
+    @TableField("ROPTION")
+    private String roption;
+    /**
+     * 机号id
+     */
+    @JsonProperty("MACHINEID")
+    @TableField("MACHINEID")
+    private String machineid;
+    /**
+     * 机号
+     */
+    @JsonProperty("MACHINENO")
+    @TableField("MACHINENO")
+    private String machineno;
+    /**
+     * 每天试车时间
+     */
+    @JsonProperty("DAILYTIME")
+    @TableField("DAILYTIME")
+    private String dailytime;
+    /**
+     * 难度系数
+     */
+    @JsonProperty("DIFFICULTYFACTOR")
+    @TableField("DIFFICULTYFACTOR")
+    private String difficultyfactor;
+    /**
+     * 试车开始时间
+     */
+    @JsonProperty("BEGINDATE")
+    @TableField("BEGINDATE")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date begindate;
+    /**
+     * 预估剩余天数
+     */
+    @JsonProperty("ESTIMATEDDAYNUM")
+    @TableField("ESTIMATEDDAYNUM")
+    private String estimateddaynum;
+    /**
+     * 是否包含周六,周日,法定节假日
+     */
+    @JsonProperty("CONTAINDATE")
+    @TableField("CONTAINDATE")
+    private String containdate;
+    /**
+     * 选择日期
+     */
+    @JsonProperty("SELECTDATE")
+    @TableField("SELECTDATE")
+    private String selectdate;
+    /**
+     * 预估试车结束日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonProperty("ESTIMATEDENDDATE")
+    @TableField("ESTIMATEDENDDATE")
+    private Date estimatedenddate;
+    /**
+     * 试车主表id
+     */
+    @JsonProperty("CHECKID")
+    @TableField("CHECKID")
+    private String checkid;
+
+
+}

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxCommissionCheckParameterSetDo.java

@@ -0,0 +1,61 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 试车检查参数设置表
+ * </p>
+ *
+ * @author xuan
+ * @since 2024-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("ZHCX_COMMISSION_CHECK_PARAMETER_SET")
+public class ZhcxCommissionCheckParameterSetDo extends BaseDo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableField("ID")
+    private String id;
+    /**
+     * 项目ID
+     */
+    @TableField("PROJECTID")
+    private String projectid;
+    /**
+     * 项目工号
+     */
+    @TableField("PROJECTCODE")
+    private String projectcode;
+    /**
+     * 项目名称
+     */
+    @TableField("PROJECTNAME")
+    private String projectname;
+    /**
+     * 租户id
+     */
+    @TableField("TENANTID")
+    private String tenantid;
+    /**
+     * 扩展json格式配置
+     */
+    @TableField("ROPTION")
+    private String roption;
+
+
+}

business-entity/src/main/java/com/rongwei/bsentity/dto/CommissionCheckDTO.java

@@ -0,0 +1,34 @@
+package com.rongwei.bsentity.dto;
+
+
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckDetailDo;
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckDo;
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckParameterSetDetalDo;
+import io.swagger.annotations.ApiModel;
+import lombok.*;
+
+import java.util.List;
+
+@Setter
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel
+public class CommissionCheckDTO {
+
+    /**
+     *  试车检查主表
+     */
+    private ZhcxCommissionCheckDo check;
+
+    /**
+     *  检查内容(子表)
+     */
+    private List<ZhcxCommissionCheckDetailDo> checkDetails;
+
+    /**
+     * 试车参数表的子表
+     */
+    private List<ZhcxCommissionCheckParameterSetDetalDo> setDetails;
+}

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxCommissionCheckController.java

@@ -0,0 +1,45 @@
+package com.rongwei.bsserver.controller;
+
+
+import com.rongwei.bscommon.sys.service.ZhcxCommissionCheckService;
+import com.rongwei.bsentity.dto.CommissionCheckDTO;
+import com.rongwei.rwcommon.base.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 试车检查表 前端控制器
+ * </p>
+ *
+ * @author xuan
+ * @since 2024-09-24
+ */
+@Slf4j
+@RestController
+@RequestMapping("/zhcxCommissionCheck")
+public class ZhcxCommissionCheckController {
+
+    @Autowired
+    private ZhcxCommissionCheckService commissionCheckService;
+
+    /**
+     * 试车报告新增
+     * @param checkDTO 参数
+     * @return 响应状态
+     */
+    @PostMapping("/commissionCheckAdd")
+    public R forgetPwdSendSmsCode(@RequestBody CommissionCheckDTO checkDTO){
+        try {
+            log.info("进入接口：/zhcxCommissionCheck/commissionCheckAdd,入参:{}", checkDTO);
+            return commissionCheckService.commissionCheckAdd(checkDTO);
+        } catch (Exception e) {
+            log.info(String.valueOf(e));
+            return R.error("试车报告新增异常");
+        }
+    }
+}
+

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxProjectManageController.java

@@ -1,6 +1,7 @@
 package com.rongwei.bsserver.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.rongwei.bscommon.sys.service.LuckysheetService;
 import com.rongwei.bscommon.sys.service.ZhcxProjectManageRectifyBatchService;
 import com.rongwei.bscommon.sys.service.ZhcxProjectManageService;
@@ -106,8 +107,8 @@ public class ZhcxProjectManageController {
     @PostMapping("/updateDataVerification")
     @ApiOperation("更新excel下拉框")
     public R updateDataVerification(@RequestBody UpdateDataVerificationRequest req) {
-        luckysheetService.updateDataVerification(req);
-        return R.ok();
+        final JSONObject verifyData = luckysheetService.updateDataVerification(req);
+        return R.ok(verifyData);
     }
 
     /**

business-server/src/main/resources/logback-spring.xml

@@ -18,6 +18,8 @@
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
+            <maxHistory>10</maxHistory>
+            <cleanHistoryOnStart>true</cleanHistoryOnStart>
         </rollingPolicy>
         <!-- 追加方式记录日志 -->
         <append>true</append>