diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 70ce007..a872bf2 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -23,7 +23,7 @@ msa.process_result, msa.remark FROM - equipment_equipment_apply msa + equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit LEFT JOIN equipment_apply_equipment meae on msa.id = meae.apply_id diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 70ce007..a872bf2 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -23,7 +23,7 @@ msa.process_result, msa.remark FROM - equipment_equipment_apply msa + equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit LEFT JOIN equipment_apply_equipment meae on msa.id = meae.apply_id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 9364286..7fa819a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -125,12 +125,16 @@ @Override public Object acceptanceCheckInfo(IdDTO idDTO) throws Exception { + // 通过id查询出检修保养基本信息 AcceptanceCheck acceptanceCheckInfo = acceptanceCheckMapper.acceptanceCheckInfo(idDTO.getId()); + // 通过检修申请id查询出对应的检修设备列表 List checkList = equipmentApplyEquipmentMapper.queryCheckList(acceptanceCheckInfo.getAcceptanceCheckId()); for (EquipmentApplyEquipment applyEquipment : checkList) { + // 替换字典值 DictCodeUtils.convertDictCodeToName(applyEquipment); } acceptanceCheckInfo.setCheckList(checkList); + // 通过申请id获取对应附件列表 QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id",idDTO.getId()); List equipmentApplyFiles = equipmentApplyFileMapper.selectList(wrapper); @@ -140,10 +144,12 @@ @Override public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) { + // 新增基本信息 if(equipmentApplyMapper.insert(equipmentApply)>0){ + // 新增附件列表 equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId())); - boolean flg = equipmentApplyFileService.saveBatch(equipmentApply.getFileList()); - if(flg){ + boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList()); + if(flag){ return ReturnUtil.success(); }else{ return ReturnUtil.failed("新增失败"); @@ -154,7 +160,9 @@ @Override public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) { + // 编辑验收报验单基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); + // 编辑检修设备列表 boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); if(updateFlg>0 && saveOrUpdateBatch){ return ReturnUtil.success(); @@ -166,6 +174,7 @@ public void exportList(AcceptanceCheckRequest request, HttpServletResponse response) { try { List resultList; + // 判断是否为通过ids导出 if(!CollectionUtils.isEmpty(request.getIds())){ AcceptanceCheckRequest checkRequest = new AcceptanceCheckRequest(); checkRequest.setIds(request.getIds()); diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 70ce007..a872bf2 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -23,7 +23,7 @@ msa.process_result, msa.remark FROM - equipment_equipment_apply msa + equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit LEFT JOIN equipment_apply_equipment meae on msa.id = meae.apply_id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 9364286..7fa819a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -125,12 +125,16 @@ @Override public Object acceptanceCheckInfo(IdDTO idDTO) throws Exception { + // 通过id查询出检修保养基本信息 AcceptanceCheck acceptanceCheckInfo = acceptanceCheckMapper.acceptanceCheckInfo(idDTO.getId()); + // 通过检修申请id查询出对应的检修设备列表 List checkList = equipmentApplyEquipmentMapper.queryCheckList(acceptanceCheckInfo.getAcceptanceCheckId()); for (EquipmentApplyEquipment applyEquipment : checkList) { + // 替换字典值 DictCodeUtils.convertDictCodeToName(applyEquipment); } acceptanceCheckInfo.setCheckList(checkList); + // 通过申请id获取对应附件列表 QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id",idDTO.getId()); List equipmentApplyFiles = equipmentApplyFileMapper.selectList(wrapper); @@ -140,10 +144,12 @@ @Override public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) { + // 新增基本信息 if(equipmentApplyMapper.insert(equipmentApply)>0){ + // 新增附件列表 equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId())); - boolean flg = equipmentApplyFileService.saveBatch(equipmentApply.getFileList()); - if(flg){ + boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList()); + if(flag){ return ReturnUtil.success(); }else{ return ReturnUtil.failed("新增失败"); @@ -154,7 +160,9 @@ @Override public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) { + // 编辑验收报验单基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); + // 编辑检修设备列表 boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); if(updateFlg>0 && saveOrUpdateBatch){ return ReturnUtil.success(); @@ -166,6 +174,7 @@ public void exportList(AcceptanceCheckRequest request, HttpServletResponse response) { try { List resultList; + // 判断是否为通过ids导出 if(!CollectionUtils.isEmpty(request.getIds())){ AcceptanceCheckRequest checkRequest = new AcceptanceCheckRequest(); checkRequest.setIds(request.getIds()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index 36ea717..40fd4d9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -122,8 +122,11 @@ @Override public Object equipmentApplyInfo(IdDTO idDTO) throws Exception{ + // 通过id查询申请基本信息 EquipmentApply equipmentApply = equipmentApplyMapper.equipmentApplyInfo(idDTO.getId()); + // 替换字典值 DictCodeUtils.convertDictCodeToName(equipmentApply); + // 查询设备详细信息 List fixedAssetsList = equipmentMapper.queryEquipmentList(idDTO.getId()); equipmentApply.setEquipmentInfoList(fixedAssetsList); return equipmentApply; @@ -132,8 +135,10 @@ @Override public ReturnDTO addEquipmentApply(EquipmentApply equipmentApply) { Long maxNo = equipmentApplyMapper.selectMaxNo(); + // 生成编号 String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(equipmentApply.getApplyType()), maxNo); equipmentApply.setApplyNo(applyNo); + // 草稿箱状态 equipmentApply.setApprovalStatus(ApprovalStatusEnum.DRAFT); if(StringUtils.isEmpty(equipmentApply.getCreateUser()) && ShiroKit.getUser() != null){ equipmentApply.setCreateUser(ShiroKit.getUser().getId().toString()); @@ -144,10 +149,12 @@ applyEquipment.setApplyId(id.toString()); } boolean equipmentSaveBatchFlg = true; + // 新增设备信息 if(!CollectionUtils.isEmpty(equipmentApply.getEquipmentList())){ equipmentSaveBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList()); } boolean saveBatchFlg = true; + // 新增附件列表 if(ObjectUtil.isNotEmpty(equipmentApply.getFileList()) && equipmentApply.getFileList().size()!=0){ for (EquipmentApplyFile file : equipmentApply.getFileList()) { file.setApplyId(id); @@ -190,6 +197,7 @@ @Override public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) { + // 删除表单对应流程实例 ReturnDTO returnDTO = approvalOperateService.delete(request); if(ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()){ //本地删除 @@ -202,18 +210,22 @@ @Override public ReturnDTO updateEquipmentApply(EquipmentApply equipmentApply) { + // 修改申请基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); if(updateFlg>0){ List ids = new ArrayList<>(); List equipmentList = new ArrayList<>(); + // 获取删除的设备信息的id for (EquipmentApplyEquipment applyEquipment : equipmentApply.getEquipmentList()) { if(null != applyEquipment.getIsDel() && applyEquipment.getIsDel() == 1){ ids.add(applyEquipment.getId()); equipmentList.add(applyEquipment); } } + // 删除设备信息 equipmentMapper.deleteBatchIds(ids); equipmentApply.getEquipmentList().removeAll(equipmentList); + // 修改未删除的设备信息 boolean saveOrUpdateBatchFlg = equipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); if(saveOrUpdateBatchFlg){ return ReturnUtil.success(); @@ -226,6 +238,7 @@ @Override public void exportList(EquipmentApplyRequest request, HttpServletResponse response) throws Exception { List resultList; + // 判断是否为通过ids导出 if(!CollectionUtils.isEmpty(request.getIds())){ resultList = this.listByIds(request.getIds()); }else{ @@ -240,6 +253,7 @@ @Override public ReturnDTO borrowEquipmentApply(IdDTO idDto) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); + // 通过id修改处理结果 updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED.getCode()); if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); @@ -270,14 +284,17 @@ @Override public ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request) { String formId = request.getFormId(); + // 发起流程 ReturnDTO returnDTO = baseApprovalService.processSubmit(formId, request.getId()); if(ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()){ return returnDTO; } ProcessInstance processInstance = (ProcessInstance)returnDTO.getData(); - + // 通过id查出当前表单 EquipmentApply equipmentApply = this.baseMapper.selectById(request.getId()); + // 设置审批状态 equipmentApply.setApprovalStatus(ApprovalStatusEnum.UN_DRAFT); //非草稿状态 + // 存储流程实例id equipmentApply.setProcessId(processInstance.getId()); int row = this.baseMapper.updateById(equipmentApply); if (row <= 0) { diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 70ce007..a872bf2 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -23,7 +23,7 @@ msa.process_result, msa.remark FROM - equipment_equipment_apply msa + equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person LEFT JOIN sys_dept sd ON sd.id = msa.apply_unit LEFT JOIN equipment_apply_equipment meae on msa.id = meae.apply_id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 9364286..7fa819a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -125,12 +125,16 @@ @Override public Object acceptanceCheckInfo(IdDTO idDTO) throws Exception { + // 通过id查询出检修保养基本信息 AcceptanceCheck acceptanceCheckInfo = acceptanceCheckMapper.acceptanceCheckInfo(idDTO.getId()); + // 通过检修申请id查询出对应的检修设备列表 List checkList = equipmentApplyEquipmentMapper.queryCheckList(acceptanceCheckInfo.getAcceptanceCheckId()); for (EquipmentApplyEquipment applyEquipment : checkList) { + // 替换字典值 DictCodeUtils.convertDictCodeToName(applyEquipment); } acceptanceCheckInfo.setCheckList(checkList); + // 通过申请id获取对应附件列表 QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id",idDTO.getId()); List equipmentApplyFiles = equipmentApplyFileMapper.selectList(wrapper); @@ -140,10 +144,12 @@ @Override public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) { + // 新增基本信息 if(equipmentApplyMapper.insert(equipmentApply)>0){ + // 新增附件列表 equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId())); - boolean flg = equipmentApplyFileService.saveBatch(equipmentApply.getFileList()); - if(flg){ + boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList()); + if(flag){ return ReturnUtil.success(); }else{ return ReturnUtil.failed("新增失败"); @@ -154,7 +160,9 @@ @Override public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) { + // 编辑验收报验单基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); + // 编辑检修设备列表 boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); if(updateFlg>0 && saveOrUpdateBatch){ return ReturnUtil.success(); @@ -166,6 +174,7 @@ public void exportList(AcceptanceCheckRequest request, HttpServletResponse response) { try { List resultList; + // 判断是否为通过ids导出 if(!CollectionUtils.isEmpty(request.getIds())){ AcceptanceCheckRequest checkRequest = new AcceptanceCheckRequest(); checkRequest.setIds(request.getIds()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index 36ea717..40fd4d9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -122,8 +122,11 @@ @Override public Object equipmentApplyInfo(IdDTO idDTO) throws Exception{ + // 通过id查询申请基本信息 EquipmentApply equipmentApply = equipmentApplyMapper.equipmentApplyInfo(idDTO.getId()); + // 替换字典值 DictCodeUtils.convertDictCodeToName(equipmentApply); + // 查询设备详细信息 List fixedAssetsList = equipmentMapper.queryEquipmentList(idDTO.getId()); equipmentApply.setEquipmentInfoList(fixedAssetsList); return equipmentApply; @@ -132,8 +135,10 @@ @Override public ReturnDTO addEquipmentApply(EquipmentApply equipmentApply) { Long maxNo = equipmentApplyMapper.selectMaxNo(); + // 生成编号 String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(equipmentApply.getApplyType()), maxNo); equipmentApply.setApplyNo(applyNo); + // 草稿箱状态 equipmentApply.setApprovalStatus(ApprovalStatusEnum.DRAFT); if(StringUtils.isEmpty(equipmentApply.getCreateUser()) && ShiroKit.getUser() != null){ equipmentApply.setCreateUser(ShiroKit.getUser().getId().toString()); @@ -144,10 +149,12 @@ applyEquipment.setApplyId(id.toString()); } boolean equipmentSaveBatchFlg = true; + // 新增设备信息 if(!CollectionUtils.isEmpty(equipmentApply.getEquipmentList())){ equipmentSaveBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList()); } boolean saveBatchFlg = true; + // 新增附件列表 if(ObjectUtil.isNotEmpty(equipmentApply.getFileList()) && equipmentApply.getFileList().size()!=0){ for (EquipmentApplyFile file : equipmentApply.getFileList()) { file.setApplyId(id); @@ -190,6 +197,7 @@ @Override public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) { + // 删除表单对应流程实例 ReturnDTO returnDTO = approvalOperateService.delete(request); if(ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()){ //本地删除 @@ -202,18 +210,22 @@ @Override public ReturnDTO updateEquipmentApply(EquipmentApply equipmentApply) { + // 修改申请基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); if(updateFlg>0){ List ids = new ArrayList<>(); List equipmentList = new ArrayList<>(); + // 获取删除的设备信息的id for (EquipmentApplyEquipment applyEquipment : equipmentApply.getEquipmentList()) { if(null != applyEquipment.getIsDel() && applyEquipment.getIsDel() == 1){ ids.add(applyEquipment.getId()); equipmentList.add(applyEquipment); } } + // 删除设备信息 equipmentMapper.deleteBatchIds(ids); equipmentApply.getEquipmentList().removeAll(equipmentList); + // 修改未删除的设备信息 boolean saveOrUpdateBatchFlg = equipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); if(saveOrUpdateBatchFlg){ return ReturnUtil.success(); @@ -226,6 +238,7 @@ @Override public void exportList(EquipmentApplyRequest request, HttpServletResponse response) throws Exception { List resultList; + // 判断是否为通过ids导出 if(!CollectionUtils.isEmpty(request.getIds())){ resultList = this.listByIds(request.getIds()); }else{ @@ -240,6 +253,7 @@ @Override public ReturnDTO borrowEquipmentApply(IdDTO idDto) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); + // 通过id修改处理结果 updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED.getCode()); if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); @@ -270,14 +284,17 @@ @Override public ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request) { String formId = request.getFormId(); + // 发起流程 ReturnDTO returnDTO = baseApprovalService.processSubmit(formId, request.getId()); if(ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()){ return returnDTO; } ProcessInstance processInstance = (ProcessInstance)returnDTO.getData(); - + // 通过id查出当前表单 EquipmentApply equipmentApply = this.baseMapper.selectById(request.getId()); + // 设置审批状态 equipmentApply.setApprovalStatus(ApprovalStatusEnum.UN_DRAFT); //非草稿状态 + // 存储流程实例id equipmentApply.setProcessId(processInstance.getId()); int row = this.baseMapper.updateById(equipmentApply); if (row <= 0) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java index d62240a..6e30931 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java @@ -140,17 +140,20 @@ result.setMeterStandardEquipment(standardEquipment); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("standard_apply_id",result.getId()); + // 通过申请id查询对应设备表 List meterStandardApplyEquipments = standardApplyEquipmentMapper.selectList(wrapper); List equipmentIds = new ArrayList<>(); for (EquipmentStandardApplyEquipment equipment : meterStandardApplyEquipments) { equipmentIds.add(equipment.getEquipmentId()); } + // 通过对应设备id查询设备详细信息 QueryWrapper fixedAssetsWrapper = new QueryWrapper<>(); fixedAssetsWrapper.in("id", equipmentIds); List meterFixedAssets = meterFixedAssetsMapper.selectList(fixedAssetsWrapper); result.setFixedAssetsList(meterFixedAssets); QueryWrapper applyFileWrapper = new QueryWrapper<>(); applyFileWrapper.eq("standard_apply_id",result.getId()); + // 查询对应附件列表 List applyFileList = standardApplyFileMapper.selectList(applyFileWrapper); result.setFileList(applyFileList); return result; @@ -162,6 +165,7 @@ String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo); meterStandardApply.setApplyNo(applyNo); meterStandardApply.setApprovalStatus(ApprovalStatusEnum.DRAFT); + // 新增标准装置基本信息 if(meterStandardApplyMapper.insert(meterStandardApply)>0){ Long id = meterStandardApply.getId(); for (EquipmentStandardApplyEquipment applyEquipment : meterStandardApply.getApplyEquipmentList()) { @@ -170,7 +174,9 @@ for (EquipmentStandardApplyFile applyFile : meterStandardApply.getFileList()) { applyFile.setStandardApplyId(id); } + // 新增标准装置配套设备表 boolean fileListResult = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList()); + // 新增对应附件表 boolean equipmentListResult = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); if(fileListResult&&equipmentListResult){ return ReturnUtil.success(); @@ -214,7 +220,6 @@ return returnDTO; } ProcessInstance processInstance = (ProcessInstance)returnDTO.getData(); - EquipmentStandardApply meterStandardApply = meterStandardApplyMapper.selectById(request.getId()); meterStandardApply.setApprovalStatus(ApprovalStatusEnum.UN_DRAFT); //非草稿状态 meterStandardApply.setProcessId(processInstance.getId());