diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index ca129e3..0e357fa 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -51,10 +51,10 @@
and mp.model like concat('%', #{request.model}, '%')
- and mp.price_type like concat('%', #{request.priceType}, '%')
+ and mpc.category_name like concat('%', #{request.priceType}, '%')
- and mp.price_item like concat('%', #{request.priceItem}, '%')
+ and mpi.item_name like concat('%', #{request.priceItem}, '%')
and t1.id in
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index ca129e3..0e357fa 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -51,10 +51,10 @@
and mp.model like concat('%', #{request.model}, '%')
- and mp.price_type like concat('%', #{request.priceType}, '%')
+ and mpc.category_name like concat('%', #{request.priceType}, '%')
- and mp.price_item like concat('%', #{request.priceItem}, '%')
+ and mpi.item_name like concat('%', #{request.priceItem}, '%')
and t1.id in
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 d468012..403f44a 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
@@ -374,7 +374,7 @@
if(updateFlg>0){
// 删除所有关联设备信息
QueryWrapper wrapper = new QueryWrapper<>();
- wrapper.eq("applyId",equipmentApply.getId());
+ wrapper.eq("apply_id",equipmentApply.getId());
equipmentService.remove(wrapper);
equipmentApply.getEquipmentList().forEach(bean->{
bean.setApplyId(equipmentApply.getId().toString());
@@ -389,6 +389,7 @@
taskService.complete(task.getId());
//更新状态为审批中
runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
+ return ReturnUtil.success();
}
throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
}