试车word导入

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

@@ -139,7 +139,7 @@ public interface ZhcxCommissionCheckDetailDao extends BaseMapper<ZhcxCommissionC
             "FROM " +
             " ZHCX_COMMISSION_CHECK_DETAIL d " +
             "WHERE " +
-            " (PID = #{pid} or EXISTS ( " +
+            " EXISTS ( " +
             " SELECT " +
             "  * " +
             " FROM " +
@@ -149,7 +149,6 @@ public interface ZhcxCommissionCheckDetailDao extends BaseMapper<ZhcxCommissionC
             " WHERE " +
             "  zcc.ID = d.PID " +
             "  AND zcc.PROJECTID = #{projectId} " +
-            "  AND (dn.STATUS <> '发运' " +
-            "   OR dn.STATUS IS NULL or dn.STATUS = '')))")
-    void delByPrjId(@Param("projectId") String projectId, @Param("pid") String pid);
+            "  AND (dn.STATUS IS NULL OR dn.STATUS = '' OR dn.STATUS = '在制' OR dn.STATUS = '已交机'))")
+    void delByPrjId(@Param("projectId") String projectId);
 }

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

@@ -27,7 +27,7 @@ public interface ZhcxCommissionCheckDetailTreeDao extends BaseMapper<ZhcxCommiss
             "FROM " +
             " ZHCX_COMMISSION_CHECK_DETAIL_TREE d " +
             "WHERE " +
-            " (BASEINFOID = #{pid} or EXISTS ( " +
+            " EXISTS ( " +
             " SELECT " +
             "  * " +
             " FROM " +
@@ -35,8 +35,8 @@ public interface ZhcxCommissionCheckDetailTreeDao extends BaseMapper<ZhcxCommiss
             "  JOIN ZHCX_PROJECT_DEVICE_NUMBER dn ON dn.ID = zcc.MACHINEID " +
             " WHERE " +
             "  zcc.ID = d.BASEINFOID " +
-            "  AND zcc.PROJECTID = #{projectId} AND (dn.STATUS <> '发运' or dn.STATUS is null or dn.STATUS = '')))")
-    void delByPrjId(@Param("projectId") String projectId,@Param("pid") String pid);
+            "  AND zcc.PROJECTID = #{projectId} AND (dn.STATUS IS NULL OR dn.STATUS = '' OR dn.STATUS = '在制' OR dn.STATUS = '已交机'))")
+    void delByPrjId(@Param("projectId") String projectId);
     
     @Insert("INSERT " +
             " INTO " +

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

@@ -32,5 +32,5 @@ public interface ZhcxCommissionCheckDetailService extends IService<ZhcxCommissio
      *
      * @param prjId
      */
-    void delByPrjId(String prjId, String pid);
+    void delByPrjId(String prjId);
 }

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

@@ -24,8 +24,7 @@ public interface ZhcxCommissionCheckDetailTreeService extends IService<ZhcxCommi
      *
      * @param projectId
      */
-    void delByPrjId(String projectId, String pid);
-
+    void delByPrjId(String projectId);
 
     /**
      * 拷贝详情

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

@@ -71,6 +71,14 @@ public interface ZhcxCommissionCheckService extends IService<ZhcxCommissionCheck
      */
     void saveImportCheckDetail(ImportProjectCheckDto importDto, MultipartFile file);
 
+    /**
+     * 通过项目id导入
+     *
+     * @param importDto
+     * @param file
+     */
+    void saveImport4PrjId(ImportProjectCheckDto importDto, MultipartFile file);
+
     /**
      * 标准库导入
      * @param file

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

@@ -48,7 +48,7 @@ public class ZhcxCommissionCheckDetailServiceImpl extends ServiceImpl<ZhcxCommis
      * @param prjId
      */
     @Override
-    public void delByPrjId(String prjId, String pid) {
-        dao.delByPrjId(prjId, pid);
+    public void delByPrjId(String prjId) {
+        dao.delByPrjId(prjId);
     }
 }

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

@@ -34,8 +34,8 @@ public class ZhcxCommissionCheckDetailTreeServiceImpl extends ServiceImpl<ZhcxCo
      * @param projectId
      */
     @Override
-    public void delByPrjId(String projectId, String pid) {
-        dao.delByPrjId(projectId, pid);
+    public void delByPrjId(String projectId) {
+        dao.delByPrjId(projectId);
     }
 
     /**

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

@@ -1634,10 +1634,10 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
         deviceNumberList.stream().forEach(item -> deviceMap.put(item.getId(), item));
 
         //删除树
-        zhcxCommissionCheckDetailTreeService.delByPrjId(commissionCheckDo.getProjectid(), importDto.getId());
+        zhcxCommissionCheckDetailTreeService.delByPrjId(commissionCheckDo.getProjectid());
 
         //删除明细
-        zhcxCommissionCheckDetailService.delByPrjId(commissionCheckDo.getProjectid(), importDto.getId());
+        zhcxCommissionCheckDetailService.delByPrjId(commissionCheckDo.getProjectid());
 
         //导出明细
         final ImportProjectCheckBO importCheckDetail = importCheckDetail(importDto, file);
@@ -1673,6 +1673,59 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
         }
     }
 
+    /**
+     * 通过项目id导入
+     *
+     * @param importDto
+     * @param file
+     */
+    @Override
+    public void saveImport4PrjId(ImportProjectCheckDto importDto, MultipartFile file) {
+        //不同机台试车
+        final LambdaQueryWrapper<ZhcxCommissionCheckDo> queryCheckWrapper = Wrappers.lambdaQuery();
+        queryCheckWrapper.apply(
+                " EXISTS ( " +
+                " SELECT " +
+                "  * " +
+                " FROM " +
+                "  ZHCX_PROJECT_DEVICE_NUMBER zpdn " +
+                " WHERE " +
+                "  (zpdn.STATUS IS NULL OR zpdn.STATUS = '' OR zpdn.STATUS = '在制' OR zpdn.STATUS = '已交机')  " +
+                "  AND ZHCX_COMMISSION_CHECK.MACHINEID = zpdn.ID " +
+                "  AND zpdn.PID = {0})", importDto.getProjectId());
+        final List<ZhcxCommissionCheckDo> commissionCheckDos = list(queryCheckWrapper);
+
+        if(ObjectUtil.isEmpty(commissionCheckDos)) {
+            return ;
+        }
+
+        zhcxCommissionCheckDetailTreeService.delByPrjId(importDto.getProjectId());//删除树
+        zhcxCommissionCheckDetailService.delByPrjId(importDto.getProjectId());//删除明细
+
+        for(int m = 0, n = commissionCheckDos.size(); m < n; m++) {
+            ZhcxCommissionCheckDo check = commissionCheckDos.get(m);
+            if(m == 0) {
+                //导出明细
+                importDto.setId(check.getId());
+                final ImportProjectCheckBO importCheckDetail = importCheckDetail(importDto, file);
+                if(ObjectUtil.isNotEmpty(importCheckDetail.getTreeList())) {
+                    zhcxCommissionCheckDetailTreeService.saveBatch(importCheckDetail.getTreeList());
+                }
+                if(ObjectUtil.isNotEmpty(importCheckDetail.getDetailList())) {
+                    zhcxCommissionCheckDetailService.saveBatch(importCheckDetail.getDetailList());
+                }
+            } else {
+                final CopyDetailDto copyDto = CopyDetailDto.builder()
+                        .sourcePid(importDto.getId())
+                        .targetPid(check.getId())
+                        .index(String.valueOf(m))
+                        .build();
+                zhcxCommissionCheckDetailTreeService.copyByPid(copyDto);//树
+                zhcxCommissionCheckDetailService.copyByPid(copyDto);//详情
+            }
+        }
+    }
+
     /**
      * 上传文件转换成
      *

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

@@ -98,6 +98,13 @@ public class ZhcxCommissionCheckController {
         return R.ok();
     }
 
+    @PostMapping("wordImport4Prj")
+    @ApiOperation("试车word导入")
+    public R wordImport4Prj(ImportProjectCheckDto importDto, MultipartFile file) {
+        commissionCheckService.saveImport4PrjId(importDto, file);
+        return R.ok();
+    }
+
     @RequestMapping("importStandard")
     @ResponseBody
     public R importStandard(@RequestParam MultipartFile file,String mainId) {