1、添加批量删除工单功能

2、工单导入添加"是否紧急"字段

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
 

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

admin-hanhai-vue/src/views/workorderTemplate/WorkorderTemplateList.vue

@@ -32,7 +32,7 @@
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
-        <!-- <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+          <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
       </a-dropdown>
     </div>
 

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<WorkorderTempla
 	@ApiOperation(value="工单信息表-批量删除", notes="工单信息表-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.workorderTemplateService.removeByIds(Arrays.asList(ids.split(",")));
+
+		List<String> templateIds = Arrays.asList(ids.split(","));
+
+		myTemplateService.deleteTemplateBatch(templateIds);
 		return Result.OK("批量删除成功!");
 	}
 	

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;
+
 }

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<String> templateIds);
+
 }

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<String> 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<String> templateIds){
+        //执行结果
+        boolean flag = false;
+        //收藏工单获取
+        List<String> collectionIds = new ArrayList<>();
+        List<WorkorderCollection> 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<String> templateIds){
+        //执行结果
+        boolean flag = false;
+        //常规参数-工序卡1
+        List<String> workorderGeneralSteponeIds = new ArrayList<>();
+        List<WorkorderGeneralStepone> 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<String> templateIds){
+        //执行结果
+        boolean flag = false;
+        //常规参数-工序卡2
+        List<String> workorderGeneralSteptwoIds = new ArrayList<>();
+        List<WorkorderGeneralSteptwo> 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<String> templateIds){
+        //执行结果
+        boolean flag = false;
+        //常规参数-工序卡3
+        List<String> workorderGeneralStepthreeIds = new ArrayList<>();
+        List<WorkorderGeneralStepthree> 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<String> templateIds){
+        //执行结果
+        boolean flag = false;
+        //常规参数-工序卡4
+        List<String> workorderGeneralStepfourIds = new ArrayList<>();
+        List<WorkorderGeneralStepfour> 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<String> templateIds){
+        //执行结果
+        boolean flag = false;
+        //检查项目参数-工序卡1
+        List<String> workorderParamSteponeIds = new ArrayList<>();
+        List<WorkorderParamStepone> 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<String> templateIds){
+        //执行结果
+        boolean flag = false;
+        //检查项目参数-工序卡2
+        List<String> workorderParamSteptwoIds = new ArrayList<>();
+        List<WorkorderParamSteptwo> 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<String> templateIds){
+        //执行结果
+        boolean flag = false;
+        //检查项目参数-工序卡3
+        List<String> workorderParamStepThreeIds = new ArrayList<>();
+        List<WorkorderParamStepthree> 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<String> templateIds){
+        //执行结果
+        boolean flag = false;
+        //检查项目参数-工序卡4
+        List<String> workorderParamStepfourIds = new ArrayList<>();
+        List<WorkorderParamStepfour> 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;
+    }
+
 }

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);
             }