diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml index 5b7af18..b215c51 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml @@ -46,7 +46,7 @@ create_time as createTime, approval_status as approvalStatus, process_id as processId, - (select count(id) from eqpt_subcontract_order_relation where order_id = id) as equipmentNum + (select count(eqpt_subcontract_order_relation.id) from eqpt_subcontract_order_relation where eqpt_subcontract_order_relation.order_id = eqpt_subcontract_order.id) as equipmentNum FROM eqpt_subcontract_order diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml index 5b7af18..b215c51 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml @@ -46,7 +46,7 @@ create_time as createTime, approval_status as approvalStatus, process_id as processId, - (select count(id) from eqpt_subcontract_order_relation where order_id = id) as equipmentNum + (select count(eqpt_subcontract_order_relation.id) from eqpt_subcontract_order_relation where eqpt_subcontract_order_relation.order_id = eqpt_subcontract_order.id) as equipmentNum FROM eqpt_subcontract_order diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java index a453e01..5fc4e6e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java @@ -165,6 +165,11 @@ @TableField(exist = false) private String approvalStatusName; + @ApiModelProperty("外送设备数量") + @TableField(exist = false) + private Integer equipmentNum; + + } diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml index 5b7af18..b215c51 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml @@ -46,7 +46,7 @@ create_time as createTime, approval_status as approvalStatus, process_id as processId, - (select count(id) from eqpt_subcontract_order_relation where order_id = id) as equipmentNum + (select count(eqpt_subcontract_order_relation.id) from eqpt_subcontract_order_relation where eqpt_subcontract_order_relation.order_id = eqpt_subcontract_order.id) as equipmentNum FROM eqpt_subcontract_order diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java index a453e01..5fc4e6e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java @@ -165,6 +165,11 @@ @TableField(exist = false) private String approvalStatusName; + @ApiModelProperty("外送设备数量") + @TableField(exist = false) + private Integer equipmentNum; + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java index eebf79e..bd9398d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java @@ -162,7 +162,16 @@ queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()),"model",queryForm.getModel()); queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getHelpInstruction()),"help_instruction",queryForm.getHelpInstruction()); queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCategory()),"category",queryForm.getCategory()); - queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInspectable()),"inspectable",queryForm.getInspectable()); + + if(StrUtil.isNotEmpty(queryForm.getInspectable())){ + if("66".equals(queryForm.getInspectable())){ + queryWrapper.and(i->i.eq("inspectable","").or().isNull("inspectable")); + }else { + queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getInspectable()),"inspectable",queryForm.getInspectable()); + } + } + + queryWrapper.in(CollUtil.isNotEmpty(queryForm.getIds()),"id",queryForm.getIds()); queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getEquipmentType()),"equipment_type",queryForm.getEquipmentType()); return queryWrapper; diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml index 5b7af18..b215c51 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml @@ -46,7 +46,7 @@ create_time as createTime, approval_status as approvalStatus, process_id as processId, - (select count(id) from eqpt_subcontract_order_relation where order_id = id) as equipmentNum + (select count(eqpt_subcontract_order_relation.id) from eqpt_subcontract_order_relation where eqpt_subcontract_order_relation.order_id = eqpt_subcontract_order.id) as equipmentNum FROM eqpt_subcontract_order diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java index a453e01..5fc4e6e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java @@ -165,6 +165,11 @@ @TableField(exist = false) private String approvalStatusName; + @ApiModelProperty("外送设备数量") + @TableField(exist = false) + private Integer equipmentNum; + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java index eebf79e..bd9398d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java @@ -162,7 +162,16 @@ queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getModel()),"model",queryForm.getModel()); queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getHelpInstruction()),"help_instruction",queryForm.getHelpInstruction()); queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getCategory()),"category",queryForm.getCategory()); - queryWrapper.like(StrUtil.isNotEmpty(queryForm.getInspectable()),"inspectable",queryForm.getInspectable()); + + if(StrUtil.isNotEmpty(queryForm.getInspectable())){ + if("66".equals(queryForm.getInspectable())){ + queryWrapper.and(i->i.eq("inspectable","").or().isNull("inspectable")); + }else { + queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getInspectable()),"inspectable",queryForm.getInspectable()); + } + } + + queryWrapper.in(CollUtil.isNotEmpty(queryForm.getIds()),"id",queryForm.getIds()); queryWrapper.eq(StrUtil.isNotEmpty(queryForm.getEquipmentType()),"equipment_type",queryForm.getEquipmentType()); return queryWrapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java index d978812..17907b6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java @@ -73,14 +73,15 @@ private final AbstractDictService dictService; private IEquipmentInfoService equipmentInfoService; private ISubcontractorService subcontractorService; - private final IPlanEquipmentRelationService planEquipmentRelationService; + private IPlanEquipmentRelationService planEquipmentRelationService; @Value("${casic.role.operator: user}") private String operatorRoleTip; @Autowired - public void setEquipmentInfoService(IEquipmentInfoService equipmentInfoService, ISubcontractorService subcontractorService) { + public void setEquipmentInfoService(IEquipmentInfoService equipmentInfoService, ISubcontractorService subcontractorService,IPlanEquipmentRelationService planEquipmentRelationService) { this.equipmentInfoService = equipmentInfoService; this.subcontractorService = subcontractorService; + this.planEquipmentRelationService = planEquipmentRelationService; } @Override