diff --git a/admin-hanhai-vue/.env.development b/admin-hanhai-vue/.env.development index e3b5199..d076d46 100644 --- a/admin-hanhai-vue/.env.development +++ b/admin-hanhai-vue/.env.development @@ -1,6 +1,6 @@ NODE_ENV=development -//VUE_APP_API_BASE_URL=https://workorderadmin.augcl.com/workorder-admin/ -VUE_APP_API_BASE_URL=http://localhost:8002/workorder-admin/ +//VUE_APP_API_BASE_URL=https://admin.meizhizhongshi.com/workorder-admin/ +VUE_APP_API_BASE_URL=http://localhost:8001/workorder-admin/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/admin-hanhai-vue/.env.production b/admin-hanhai-vue/.env.production index 5aa753e..cadab66 100644 --- a/admin-hanhai-vue/.env.production +++ b/admin-hanhai-vue/.env.production @@ -1,5 +1,5 @@ NODE_ENV=production -//VUE_APP_API_BASE_URL=https://workorderadmin.augcl.com/workorder-admin/ -VUE_APP_API_BASE_URL=http://localhost:8002/workorder-admin/ +//VUE_APP_API_BASE_URL=https://admin.meizhizhongshi.com/workorder-admin/ +VUE_APP_API_BASE_URL=http://localhost:8001/workorder-admin/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/admin-hanhai-vue/dist.zip b/admin-hanhai-vue/dist.zip new file mode 100644 index 0000000..33758f4 Binary files /dev/null and b/admin-hanhai-vue/dist.zip differ diff --git a/admin-hanhai-vue/src/views/workorderTemplate/WorkorderTemplateList.vue b/admin-hanhai-vue/src/views/workorderTemplate/WorkorderTemplateList.vue index 5652057..e106514 100644 --- a/admin-hanhai-vue/src/views/workorderTemplate/WorkorderTemplateList.vue +++ b/admin-hanhai-vue/src/views/workorderTemplate/WorkorderTemplateList.vue @@ -32,7 +32,7 @@ 删除 - + 批量操作 diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/controller/WorkorderTemplateController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/controller/WorkorderTemplateController.java index 1633bfd..d0553f6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/controller/WorkorderTemplateController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/controller/WorkorderTemplateController.java @@ -126,7 +126,10 @@ public class WorkorderTemplateController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.workorderTemplateService.removeByIds(Arrays.asList(ids.split(","))); + + List templateIds = Arrays.asList(ids.split(",")); + + myTemplateService.deleteTemplateBatch(templateIds); return Result.OK("批量删除成功!"); } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/entity/ImportBean.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/entity/ImportBean.java index cba59bd..0e9f920 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/entity/ImportBean.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/entity/ImportBean.java @@ -18,4 +18,7 @@ public class ImportBean { @ExcelImport("数量") private int number; + @ExcelImport("是否紧急") + private String isEmergency; + } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/MyTemplateService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/MyTemplateService.java index fa36c4d..d8248e4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/MyTemplateService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/MyTemplateService.java @@ -2,6 +2,8 @@ package org.jeecg.modules.workorderTemplate.service; import org.jeecg.common.api.vo.Result; +import java.util.List; + public interface MyTemplateService { /** @@ -11,4 +13,11 @@ public interface MyTemplateService { */ public Result deleteTemplate(String templateId); + /** + * 工单信息-批量删除工单 + * @param templateIds + * @return + */ + public Result deleteTemplateBatch(List templateIds); + } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/impl/MyTemplateServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/impl/MyTemplateServiceImpl.java index 359a959..58dfcd1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/impl/MyTemplateServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/impl/MyTemplateServiceImpl.java @@ -87,6 +87,35 @@ public class MyTemplateServiceImpl implements MyTemplateService { } } + //工单信息-批量删除工单 + @Override + public Result deleteTemplateBatch(List templateIds){ + + //收藏表信息删除成功与否标识 + boolean collectionFlage = deleteCollection(templateIds); + + //删除工单参数 + boolean workorderGeneralSteponeFlag = deleteGeneralStepOne(templateIds);//常规参数-工序卡1 + boolean workorderGeneralSteptwoFlag = deleteGeneralStepTwo(templateIds);//常规参数-工序卡2 + boolean workorderGeneralStepthreeFlag = deleteGeneralStepThree(templateIds);//常规参数-工序卡3 + boolean workorderGeneralStepfourFlag = deleteGeneralStepFour(templateIds);//常规参数-工序卡4 + + //检查项目参数 + boolean workorderParamSteponeFlag = deleteParamStepOne(templateIds);//检查项目参数-工序卡1 + boolean workorderParamSteptwoFlag = deleteParamStepTwo(templateIds);//检查项目参数-工序卡2 + boolean workorderParamStepthreeFlag = deleteParamStepThree(templateIds);//检查项目参数-工序卡3 + boolean workorderParamStepfourFlag = deleteParamStepFour(templateIds);//检查项目参数-工序卡4 + + //删除工单信息 + boolean templateFlag = workorderTemplateService.removeBatchByIds(templateIds); + + if(templateFlag){ + return Result.OK("工单批量删除成功！"); + }else { + return Result.error("工单批量删除失败！"); + } + } + /******************************************工单删除*****************************************************************/ //删除工单收藏信息 public boolean deleteCollection(String templateId){ @@ -308,4 +337,227 @@ public class MyTemplateServiceImpl implements MyTemplateService { return flag; } + + /**************************************批量删除工单*****************************************************************/ + //删除工单收藏信息 + public boolean deleteCollection(List templateIds){ + //执行结果 + boolean flag = false; + //收藏工单获取 + List collectionIds = new ArrayList<>(); + List collectionList = workorderCollectionService + .lambdaQuery() + .in(WorkorderCollection::getTemplateId, templateIds) + .list(); + //判断该工单是否被收藏，有则删除，无则默认删除成功 + if(0 == collectionList.size()){ + flag = true; + }else { + //收藏工单id获取 + for (WorkorderCollection collection : collectionList) { + collectionIds.add(collection.getId()); + } + + //删除工单收藏 + flag = workorderCollectionService.removeByIds(collectionIds); + } + + return flag; + } + + //删除关联工单常规参数-工序卡1 + public boolean deleteGeneralStepOne(List templateIds){ + //执行结果 + boolean flag = false; + //常规参数-工序卡1 + List workorderGeneralSteponeIds = new ArrayList<>(); + List workorderGeneralSteponeList = workorderGeneralSteponeService + .lambdaQuery() + .in(WorkorderGeneralStepone::getTemplateId, templateIds) + .list(); + //判断该工单有无常规参数，有则删除，无则默认删除成功 + if(0 == workorderGeneralSteponeList.size()){ + flag = true; + }else { + //参数id获取 + for (WorkorderGeneralStepone generalStepone : workorderGeneralSteponeList) { + workorderGeneralSteponeIds.add(generalStepone.getId()); + } + + flag = workorderGeneralSteponeService.removeByIds(workorderGeneralSteponeIds); + } + + return flag; + } + + //删除关联工单常规参数-工序卡2 + public boolean deleteGeneralStepTwo(List templateIds){ + //执行结果 + boolean flag = false; + //常规参数-工序卡2 + List workorderGeneralSteptwoIds = new ArrayList<>(); + List workorderGeneralSteptwoList = workorderGeneralSteptwoService + .lambdaQuery() + .in(WorkorderGeneralSteptwo::getTemplateId, templateIds) + .list(); + //判断该工单有无常规参数，有则删除，无则默认删除成功 + if(0 == workorderGeneralSteptwoList.size()){ + flag = true; + }else { + //参数id获取 + for (WorkorderGeneralSteptwo generalSteptwo : workorderGeneralSteptwoList) { + workorderGeneralSteptwoIds.add(generalSteptwo.getId()); + } + + flag = workorderGeneralSteptwoService.removeByIds(workorderGeneralSteptwoIds); + } + + return flag; + } + + //删除关联工单常规参数-工序卡3 + public boolean deleteGeneralStepThree(List templateIds){ + //执行结果 + boolean flag = false; + //常规参数-工序卡3 + List workorderGeneralStepthreeIds = new ArrayList<>(); + List workorderGeneralStepthreeList = workorderGeneralStepthreeService + .lambdaQuery() + .in(WorkorderGeneralStepthree::getTemplateId, templateIds) + .list(); + //判断该工单有无常规参数，有则删除，无则默认删除成功 + if(0 == workorderGeneralStepthreeList.size()){ + flag = true; + }else { + //参数id获取 + for (WorkorderGeneralStepthree generalStepthree : workorderGeneralStepthreeList) { + workorderGeneralStepthreeIds.add(generalStepthree.getId()); + } + + flag = workorderGeneralStepthreeService.removeByIds(workorderGeneralStepthreeIds); + } + + return flag; + } + + //删除关联工单常规参数-工序卡4 + public boolean deleteGeneralStepFour(List templateIds){ + //执行结果 + boolean flag = false; + //常规参数-工序卡4 + List workorderGeneralStepfourIds = new ArrayList<>(); + List workorderGeneralStepfourList = workorderGeneralStepfourService + .lambdaQuery() + .in(WorkorderGeneralStepfour::getTemplateId, templateIds) + .list(); + //判断该工单有无常规参数，有则删除，无则默认删除成功 + if(0 == workorderGeneralStepfourList.size()){ + flag = true; + }else { + //参数id获取 + for (WorkorderGeneralStepfour generalStepfour : workorderGeneralStepfourList) { + workorderGeneralStepfourIds.add(generalStepfour.getId()); + } + + flag = workorderGeneralStepfourService.removeByIds(workorderGeneralStepfourIds); + } + + return flag; + } + + + //删除关联工单检查项目参数-工序卡1 + public boolean deleteParamStepOne(List templateIds){ + //执行结果 + boolean flag = false; + //检查项目参数-工序卡1 + List workorderParamSteponeIds = new ArrayList<>(); + List workorderParamSteponeList = workorderParamSteponeService + .lambdaQuery() + .in(WorkorderParamStepone::getTemplateId, templateIds) + .list(); + //判断该工单有无检查参数，有则删除，无则默认删除成功 + if(0 == workorderParamSteponeList.size()){ + flag = true; + }else { + for (WorkorderParamStepone paramStepone : workorderParamSteponeList) { + workorderParamSteponeIds.add(paramStepone.getId()); + } + + flag = workorderParamSteponeService.removeByIds(workorderParamSteponeIds); + } + + return flag; + } + + //删除关联工单检查项目参数-工序卡2 + public boolean deleteParamStepTwo(List templateIds){ + //执行结果 + boolean flag = false; + //检查项目参数-工序卡2 + List workorderParamSteptwoIds = new ArrayList<>(); + List workorderParamSteptwoList = workorderParamSteptwoService + .lambdaQuery() + .in(WorkorderParamSteptwo::getTemplateId, templateIds) + .list(); + if(0 == workorderParamSteptwoList.size()){ + flag = true; + }else { + for (WorkorderParamSteptwo paramSteptwo : workorderParamSteptwoList) { + workorderParamSteptwoIds.add(paramSteptwo.getId()); + } + + flag = workorderParamSteptwoService.removeByIds(workorderParamSteptwoIds); + } + + return flag; + } + + //删除关联工单检查项目参数-工序卡3 + public boolean deleteParamStepThree(List templateIds){ + //执行结果 + boolean flag = false; + //检查项目参数-工序卡3 + List workorderParamStepThreeIds = new ArrayList<>(); + List workorderParamStepthreeList = workorderParamStepthreeService + .lambdaQuery() + .in(WorkorderParamStepthree::getTemplateId, templateIds) + .list(); + if(0 == workorderParamStepthreeList.size()){ + flag = true; + }else { + for (WorkorderParamStepthree paramStepthree : workorderParamStepthreeList) { + workorderParamStepThreeIds.add(paramStepthree.getId()); + } + + flag = workorderParamStepthreeService.removeByIds(workorderParamStepThreeIds); + } + + return flag; + } + + //删除关联工单检查项目参数-工序卡4 + public boolean deleteParamStepFour(List templateIds){ + //执行结果 + boolean flag = false; + //检查项目参数-工序卡4 + List workorderParamStepfourIds = new ArrayList<>(); + List workorderParamStepfourList = workorderParamStepfourService + .lambdaQuery() + .in(WorkorderParamStepfour::getTemplateId, templateIds) + .list(); + if(0 == workorderParamStepfourList.size()){ + flag = true; + }else { + for (WorkorderParamStepfour paramStepfour : workorderParamStepfourList) { + workorderParamStepfourIds.add(paramStepfour.getId()); + } + + flag = workorderParamStepfourService.removeByIds(workorderParamStepfourIds); + + } + + return flag; + } + } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/impl/WorkorderExcelServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/impl/WorkorderExcelServiceImpl.java index f4ce1ba..0b60afc 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/impl/WorkorderExcelServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/impl/WorkorderExcelServiceImpl.java @@ -92,6 +92,11 @@ public class WorkorderExcelServiceImpl implements WorkorderExcelService { workorderTemplate.setResponsibler(importBean.getResponsibler()); workorderTemplate.setModel(importBean.getModel()); workorderTemplate.setNumber(importBean.getNumber()); + String isEmergency = "0"; + if("是".equals(importBean.getIsEmergency())){ + isEmergency = "1"; + } + workorderTemplate.setIsEmergency(isEmergency); templateList.add(workorderTemplate); }