yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新对新增数据非空的判断

Browse Source
This commit is contained in:
panshuling321 2022-09-29 14:49:03 +08:00
parent e470ce2301
commit cb563320cf
2 changed files with 57 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkUserController.java
View File

@ -104,6 +104,7 @@ public class WorkUserController extends BaseController {
LoginUser loginUser = logUserUtils.getLogUser(request); LoginUser loginUser = logUserUtils.getLogUser(request);
domain.setUpdateBy(loginUser.getUserid().toString()); domain.setUpdateBy(loginUser.getUserid().toString());
domain.setTenantId(loginUser.getTenantId());
return R.ok(workUserService.updateDomain(domain)); return R.ok(workUserService.updateDomain(domain));
} }

106
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java
View File

@ -91,29 +91,33 @@ public class WorkOrderServiceImpl implements WorkOrderService {
orderMapper.insertSelective(domain); orderMapper.insertSelective(domain);
// 上传文件 // 上传文件
for(XhpcWorkOrderImageDomain imageDomain : domain.getQuestionImgList()){ if(!domain.getQuestionImgList().isEmpty()){
imageDomain.setOrderId(domain.getWorkOrderId()); for(XhpcWorkOrderImageDomain imageDomain : domain.getQuestionImgList()){
imageDomain.setType(Short.valueOf("1")); imageDomain.setOrderId(domain.getWorkOrderId());
imageDomain.setDelFlag(Short.valueOf("0")); imageDomain.setType(Short.valueOf("1"));
imageMapper.insertSelective(imageDomain); imageDomain.setDelFlag(Short.valueOf("0"));
imageMapper.insertSelective(imageDomain);
}
} }
// 绑定人员 // 绑定人员
List<XhpcWorkOrderUserDomain> orderUserDomainList = new ArrayList<>(); if(!domain.getUserList().isEmpty()){
StringBuilder userIdList = new StringBuilder(); List<XhpcWorkOrderUserDomain> orderUserDomainList = new ArrayList<>();
for (XhpcWorkUserDomain userDomain: domain.getUserList()){ StringBuilder userIdList = new StringBuilder();
XhpcWorkOrderUserDomain orderUserDomain = new XhpcWorkOrderUserDomain(); for (XhpcWorkUserDomain userDomain: domain.getUserList()){
orderUserDomain.setOrderId(domain.getWorkOrderId()); XhpcWorkOrderUserDomain orderUserDomain = new XhpcWorkOrderUserDomain();
orderUserDomain.setUserId(userDomain.getWorkUserId()); orderUserDomain.setOrderId(domain.getWorkOrderId());
orderUserDomainList.add(orderUserDomain); orderUserDomain.setUserId(userDomain.getWorkUserId());
userIdList.insert(0, userDomain.getWorkUserId() + ","); orderUserDomainList.add(orderUserDomain);
} userIdList.insert(0, userDomain.getWorkUserId() + ",");
}
if(orderUserDomainList.size() > 0){ if(orderUserDomainList.size() > 0){
orderMapper.insertOrderUser(orderUserDomainList); orderMapper.insertOrderUser(orderUserDomainList);
} }
if(StringUtils.isNotEmpty(userIdList.toString()) && domain.getStatus() != null && domain.getStatus()==1){ if(StringUtils.isNotEmpty(userIdList.toString()) && domain.getStatus() != null && domain.getStatus()==1){
sendSms(userIdList.toString(), domain.getWorkOrderId().toString()); sendSms(userIdList.toString(), domain.getWorkOrderId().toString());
}
} }
return true; return true;
} }
@ -123,41 +127,45 @@ public class WorkOrderServiceImpl implements WorkOrderService {
List<Long> imageIds = imageMapper.selectImageIdByOrderIdAndType(domain.getWorkOrderId(), 1); List<Long> imageIds = imageMapper.selectImageIdByOrderIdAndType(domain.getWorkOrderId(), 1);
for (XhpcWorkOrderImageDomain imageDomain: domain.getQuestionImgList()){ if(!domain.getQuestionImgList().isEmpty()){
if( imageDomain.getOrderImageId() == null || StringUtils.isEmpty(imageDomain.getOrderImageId().toString())){ for (XhpcWorkOrderImageDomain imageDomain: domain.getQuestionImgList()){
imageDomain.setOrderId(domain.getWorkOrderId()); if( imageDomain.getOrderImageId() == null || StringUtils.isEmpty(imageDomain.getOrderImageId().toString())){
imageDomain.setType(Short.valueOf("1")); imageDomain.setOrderId(domain.getWorkOrderId());
imageDomain.setDelFlag(Short.valueOf("0")); imageDomain.setType(Short.valueOf("1"));
imageMapper.insertSelective(imageDomain); imageDomain.setDelFlag(Short.valueOf("0"));
} else { imageMapper.insertSelective(imageDomain);
if(imageIds.contains(imageDomain.getOrderImageId())){ } else {
imageIds.remove(imageDomain.getOrderImageId()); if(imageIds.contains(imageDomain.getOrderImageId())){
imageIds.remove(imageDomain.getOrderImageId());
}
} }
} }
} if(imageIds.size() > 0){
if(imageIds.size() > 0){ imageMapper.deleteByImageIds(imageIds);
imageMapper.deleteByImageIds(imageIds); }
} }
// 更新处理人 if(!domain.getUserList().isEmpty()){
StringBuilder userIdList = new StringBuilder(); // 更新处理人
orderMapper.deleteOrderUserByOrderId(domain.getWorkOrderId()); StringBuilder userIdList = new StringBuilder();
List<XhpcWorkOrderUserDomain> orderUserDomainList = new ArrayList<>(); orderMapper.deleteOrderUserByOrderId(domain.getWorkOrderId());
for(XhpcWorkUserDomain userDomain: domain.getUserList()){ List<XhpcWorkOrderUserDomain> orderUserDomainList = new ArrayList<>();
XhpcWorkOrderUserDomain orderUserDomain = new XhpcWorkOrderUserDomain(); for(XhpcWorkUserDomain userDomain: domain.getUserList()){
orderUserDomain.setOrderId(domain.getWorkOrderId()); XhpcWorkOrderUserDomain orderUserDomain = new XhpcWorkOrderUserDomain();
orderUserDomain.setUserId(userDomain.getWorkUserId()); orderUserDomain.setOrderId(domain.getWorkOrderId());
orderUserDomainList.add(orderUserDomain); orderUserDomain.setUserId(userDomain.getWorkUserId());
orderUserDomainList.add(orderUserDomain);
userIdList.insert(0, userDomain.getWorkUserId() + ","); userIdList.insert(0, userDomain.getWorkUserId() + ",");
} }
if(orderUserDomainList.size() > 0){ if(orderUserDomainList.size() > 0){
orderMapper.insertOrderUser(orderUserDomainList); orderMapper.insertOrderUser(orderUserDomainList);
} }
if(StringUtils.isNotEmpty(userIdList.toString()) && domain.getStatus() != null && domain.getStatus()==1){ if(StringUtils.isNotEmpty(userIdList.toString()) && domain.getStatus() != null && domain.getStatus()==1){
sendSms(userIdList.toString(), domain.getWorkOrderId().toString()); sendSms(userIdList.toString(), domain.getWorkOrderId().toString());
}
} }
return true; return true;
} }
@ -267,9 +275,7 @@ public class WorkOrderServiceImpl implements WorkOrderService {
if(serialNumber!=null && !"".equals(serialNumber)){ if(serialNumber!=null && !"".equals(serialNumber)){
domain.setSerialNumber(serialNumber); domain.setSerialNumber(serialNumber);
} }
Short s =0; insertDomain(domain);
domain.setStatus(s);
orderMapper.insertSelective(domain);
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();