From cb563320cfa690c41d321fa98e5969cc0686a928 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Thu, 29 Sep 2022 14:49:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=B9=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9D=9E=E7=A9=BA=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkUserController.java | 1 + .../service/impl/WorkOrderServiceImpl.java | 106 +++++++++--------- 2 files changed, 57 insertions(+), 50 deletions(-) diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkUserController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkUserController.java index de3e8ce9..5176bcc3 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkUserController.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkUserController.java @@ -104,6 +104,7 @@ public class WorkUserController extends BaseController { LoginUser loginUser = logUserUtils.getLogUser(request); domain.setUpdateBy(loginUser.getUserid().toString()); + domain.setTenantId(loginUser.getTenantId()); return R.ok(workUserService.updateDomain(domain)); } diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java index 79dcf0f4..25342e6c 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java @@ -91,29 +91,33 @@ public class WorkOrderServiceImpl implements WorkOrderService { orderMapper.insertSelective(domain); // 上传文件 - for(XhpcWorkOrderImageDomain imageDomain : domain.getQuestionImgList()){ - imageDomain.setOrderId(domain.getWorkOrderId()); - imageDomain.setType(Short.valueOf("1")); - imageDomain.setDelFlag(Short.valueOf("0")); - imageMapper.insertSelective(imageDomain); + if(!domain.getQuestionImgList().isEmpty()){ + for(XhpcWorkOrderImageDomain imageDomain : domain.getQuestionImgList()){ + imageDomain.setOrderId(domain.getWorkOrderId()); + imageDomain.setType(Short.valueOf("1")); + imageDomain.setDelFlag(Short.valueOf("0")); + imageMapper.insertSelective(imageDomain); + } } // 绑定人员 - List orderUserDomainList = new ArrayList<>(); - StringBuilder userIdList = new StringBuilder(); - for (XhpcWorkUserDomain userDomain: domain.getUserList()){ - XhpcWorkOrderUserDomain orderUserDomain = new XhpcWorkOrderUserDomain(); - orderUserDomain.setOrderId(domain.getWorkOrderId()); - orderUserDomain.setUserId(userDomain.getWorkUserId()); - orderUserDomainList.add(orderUserDomain); - userIdList.insert(0, userDomain.getWorkUserId() + ","); - } + if(!domain.getUserList().isEmpty()){ + List orderUserDomainList = new ArrayList<>(); + StringBuilder userIdList = new StringBuilder(); + for (XhpcWorkUserDomain userDomain: domain.getUserList()){ + XhpcWorkOrderUserDomain orderUserDomain = new XhpcWorkOrderUserDomain(); + orderUserDomain.setOrderId(domain.getWorkOrderId()); + orderUserDomain.setUserId(userDomain.getWorkUserId()); + orderUserDomainList.add(orderUserDomain); + userIdList.insert(0, userDomain.getWorkUserId() + ","); + } - if(orderUserDomainList.size() > 0){ - orderMapper.insertOrderUser(orderUserDomainList); - } - if(StringUtils.isNotEmpty(userIdList.toString()) && domain.getStatus() != null && domain.getStatus()==1){ - sendSms(userIdList.toString(), domain.getWorkOrderId().toString()); + if(orderUserDomainList.size() > 0){ + orderMapper.insertOrderUser(orderUserDomainList); + } + if(StringUtils.isNotEmpty(userIdList.toString()) && domain.getStatus() != null && domain.getStatus()==1){ + sendSms(userIdList.toString(), domain.getWorkOrderId().toString()); + } } return true; } @@ -123,41 +127,45 @@ public class WorkOrderServiceImpl implements WorkOrderService { List imageIds = imageMapper.selectImageIdByOrderIdAndType(domain.getWorkOrderId(), 1); - for (XhpcWorkOrderImageDomain imageDomain: domain.getQuestionImgList()){ - if( imageDomain.getOrderImageId() == null || StringUtils.isEmpty(imageDomain.getOrderImageId().toString())){ - imageDomain.setOrderId(domain.getWorkOrderId()); - imageDomain.setType(Short.valueOf("1")); - imageDomain.setDelFlag(Short.valueOf("0")); - imageMapper.insertSelective(imageDomain); - } else { - if(imageIds.contains(imageDomain.getOrderImageId())){ - imageIds.remove(imageDomain.getOrderImageId()); + if(!domain.getQuestionImgList().isEmpty()){ + for (XhpcWorkOrderImageDomain imageDomain: domain.getQuestionImgList()){ + if( imageDomain.getOrderImageId() == null || StringUtils.isEmpty(imageDomain.getOrderImageId().toString())){ + imageDomain.setOrderId(domain.getWorkOrderId()); + imageDomain.setType(Short.valueOf("1")); + imageDomain.setDelFlag(Short.valueOf("0")); + imageMapper.insertSelective(imageDomain); + } else { + if(imageIds.contains(imageDomain.getOrderImageId())){ + imageIds.remove(imageDomain.getOrderImageId()); + } } } - } - if(imageIds.size() > 0){ - imageMapper.deleteByImageIds(imageIds); + if(imageIds.size() > 0){ + imageMapper.deleteByImageIds(imageIds); + } } - // 更新处理人 - StringBuilder userIdList = new StringBuilder(); - orderMapper.deleteOrderUserByOrderId(domain.getWorkOrderId()); - List orderUserDomainList = new ArrayList<>(); - for(XhpcWorkUserDomain userDomain: domain.getUserList()){ - XhpcWorkOrderUserDomain orderUserDomain = new XhpcWorkOrderUserDomain(); - orderUserDomain.setOrderId(domain.getWorkOrderId()); - orderUserDomain.setUserId(userDomain.getWorkUserId()); - orderUserDomainList.add(orderUserDomain); + if(!domain.getUserList().isEmpty()){ + // 更新处理人 + StringBuilder userIdList = new StringBuilder(); + orderMapper.deleteOrderUserByOrderId(domain.getWorkOrderId()); + List orderUserDomainList = new ArrayList<>(); + for(XhpcWorkUserDomain userDomain: domain.getUserList()){ + XhpcWorkOrderUserDomain orderUserDomain = new XhpcWorkOrderUserDomain(); + orderUserDomain.setOrderId(domain.getWorkOrderId()); + orderUserDomain.setUserId(userDomain.getWorkUserId()); + orderUserDomainList.add(orderUserDomain); - userIdList.insert(0, userDomain.getWorkUserId() + ","); - } + userIdList.insert(0, userDomain.getWorkUserId() + ","); + } - if(orderUserDomainList.size() > 0){ - orderMapper.insertOrderUser(orderUserDomainList); - } + if(orderUserDomainList.size() > 0){ + orderMapper.insertOrderUser(orderUserDomainList); + } - if(StringUtils.isNotEmpty(userIdList.toString()) && domain.getStatus() != null && domain.getStatus()==1){ - sendSms(userIdList.toString(), domain.getWorkOrderId().toString()); + if(StringUtils.isNotEmpty(userIdList.toString()) && domain.getStatus() != null && domain.getStatus()==1){ + sendSms(userIdList.toString(), domain.getWorkOrderId().toString()); + } } return true; } @@ -267,9 +275,7 @@ public class WorkOrderServiceImpl implements WorkOrderService { if(serialNumber!=null && !"".equals(serialNumber)){ domain.setSerialNumber(serialNumber); } - Short s =0; - domain.setStatus(s); - orderMapper.insertSelective(domain); + insertDomain(domain); }catch (Exception e){ e.printStackTrace();