试车world导出调整7

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

@@ -94,7 +94,7 @@ public interface ZhcxCommissionCheckDetailDao extends BaseMapper<ZhcxCommissionC
             " SECONDLEVELCLASSIFICATION, " +
             " THREELEVELCLASSIFICATION, " +
             " FOURONELEVELCLASSIFICATION, " +
-            " TREEFULLID, TREEID,TESTTIME,ACCEPTANCECRITERIA) " +
+            " TREEFULLID, TREEID,TESTTIME,ACCEPTANCECRITERIA,CREATEDATE) " +
             "SELECT " +
             " guid(), " +
             " '0', " +
@@ -110,7 +110,7 @@ public interface ZhcxCommissionCheckDetailDao extends BaseMapper<ZhcxCommissionC
             " SECONDLEVELCLASSIFICATION, " +
             " THREELEVELCLASSIFICATION, " +
             " FOURONELEVELCLASSIFICATION, " +
-            " REPLACE(TREEFULLID, ',', concat(',', #{index}, '#')), concat(#{index}, '#', TREEID),TESTTIME,ACCEPTANCECRITERIA " +
+            " REPLACE(TREEFULLID, ',', concat(',', #{index}, '#')), concat(#{index}, '#', TREEID),TESTTIME,ACCEPTANCECRITERIA,NOW() " +
             "FROM " +
             " ZHCX_COMMISSION_CHECK_DETAIL " +
             "WHERE " +

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

@@ -247,6 +247,8 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                     BeanUtil.copyProperties(checkDetail, detailDo);
                     detailDo.setId(SecurityUtil.getUUID());
                     detailDo.setPid(zhcxCommissionCheckDo.getId());
+                    // 排序置空
+                    detailDo.setSort("");
                     // 测试地点给一个默认值
                     if (StringUtils.isEmpty(detailDo.getTestaddress())) {
                         detailDo.setTestaddress("10");
@@ -1884,8 +1886,21 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                         .targetPid(check.getId())
                         .index(String.valueOf(m))
                         .build();
+                // 改用MP的插入
+                LambdaQueryWrapper<ZhcxCommissionCheckDetailDo> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(ZhcxCommissionCheckDetailDo::getPid,importDto.getId())
+                        .eq(ZhcxCommissionCheckDetailDo::getDeleted,"0");
+                List<ZhcxCommissionCheckDetailDo> detailDos = zhcxCommissionCheckDetailService.list(queryWrapper);
+                int finalM = m;
+                detailDos.forEach(item -> {
+                    item.setId(SecurityUtil.getUUID())
+                            .setPid(check.getId());
+                    item.setTreefullid(item.getTreefullid().replaceAll(",",","+finalM+"#") );
+                    item.setTreeid(finalM+"#"+item.getTreeid());
+                });
+                zhcxCommissionCheckDetailService.saveBatch(detailDos);
+                //zhcxCommissionCheckDetailService.copyByPid(copyDto);//详情
                 zhcxCommissionCheckDetailTreeService.copyByPid(copyDto);//树
-                zhcxCommissionCheckDetailService.copyByPid(copyDto);//详情
             }
         }
     }