diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index bd64596..161767f 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.9
+ 1.2.0.10
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.2.0.9
+ 1.2.0.10
com.casic
casic-metering-model
- 1.2.0.9
+ 1.2.0.10
com.github.oshi
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index bd64596..161767f 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.9
+ 1.2.0.10
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.2.0.9
+ 1.2.0.10
com.casic
casic-metering-model
- 1.2.0.9
+ 1.2.0.10
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index f14fe2c..d0337b8 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.9
+ 1.2.0.10
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.2.0.9
+ 1.2.0.10
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index bd64596..161767f 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.9
+ 1.2.0.10
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.2.0.9
+ 1.2.0.10
com.casic
casic-metering-model
- 1.2.0.9
+ 1.2.0.10
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index f14fe2c..d0337b8 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.9
+ 1.2.0.10
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.2.0.9
+ 1.2.0.10
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanEquipmentRelationMapper.java
index 440a2ab..d99b577 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanEquipmentRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanEquipmentRelationMapper.java
@@ -2,6 +2,7 @@
import com.casic.missiles.core.datascope.DataScope;
import com.casic.missiles.dto.board.PlanFinishDTO;
+import com.casic.missiles.dto.plan.PlanEquipmentAggr;
import com.casic.missiles.dto.plan.PlanEquipmentStatus;
import com.casic.missiles.model.plan.PlanEquipmentRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -20,9 +21,13 @@
*/
public interface PlanEquipmentRelationMapper extends BaseMapper {
+ List getPlanEquipmentAggr(@Param("planId") Long planId);
List listByPlanAndName(@Param("planId") Long planId,
@Param("equipmentName") String equipmentName);
+ List listByPlansAndName(@Param("planIds") List planIds,
+ @Param("equipmentName") String equipmentName);
+
PlanEquipmentStatus getPlanEquipmentStatus(@Param("equipmentId")Long equipmentId);
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index bd64596..161767f 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.9
+ 1.2.0.10
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.2.0.9
+ 1.2.0.10
com.casic
casic-metering-model
- 1.2.0.9
+ 1.2.0.10
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index f14fe2c..d0337b8 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.9
+ 1.2.0.10
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.2.0.9
+ 1.2.0.10
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanEquipmentRelationMapper.java
index 440a2ab..d99b577 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanEquipmentRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/plan/PlanEquipmentRelationMapper.java
@@ -2,6 +2,7 @@
import com.casic.missiles.core.datascope.DataScope;
import com.casic.missiles.dto.board.PlanFinishDTO;
+import com.casic.missiles.dto.plan.PlanEquipmentAggr;
import com.casic.missiles.dto.plan.PlanEquipmentStatus;
import com.casic.missiles.model.plan.PlanEquipmentRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -20,9 +21,13 @@
*/
public interface PlanEquipmentRelationMapper extends BaseMapper {
+ List getPlanEquipmentAggr(@Param("planId") Long planId);
List listByPlanAndName(@Param("planId") Long planId,
@Param("equipmentName") String equipmentName);
+ List listByPlansAndName(@Param("planIds") List planIds,
+ @Param("equipmentName") String equipmentName);
+
PlanEquipmentStatus getPlanEquipmentStatus(@Param("equipmentId")Long equipmentId);
diff --git a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml
index 2b43230..ac7b375 100644
--- a/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/plan/PlanEquipmentRelationMapper.xml
@@ -16,30 +16,52 @@
id, plan_id, equipment_id, create_time, update_time
+
+
+
+ r1.id AS id,
+ r1.plan_id AS planId,
+ e.id AS equipmentId,
+ e.equipment_no AS equipmentNo,
+ e.equipment_name AS equipmentName,
+ e.model AS model,
+ e.company_id AS companyId,
+ e.use_position AS usePosition,
+ e.check_organization AS checkOrganization,
+ e.certificate_valid AS certificateValid,
+ e.director_name AS director_name,
+ e.dept_id AS deptId,
+ e.usage_status AS usageStatus,
+ e.manufacture_no AS manufactureNo,
+ e.manufacturer as manufacturer,
+ e.meter_identify as meterIdentify,
+ r1.plan_deliver_time AS planDeliverTime,
+ r1.real_deliver_time AS realDeliverTime,
+ r1.plan_measure_company AS planMeasureCompany,
+ r1.real_measure_company AS realMeasureCompany,
+ r1.check_completion AS checkCompletion,
+ r1.check_finish_time AS checkFinishTime,
+ r1.create_time AS createTime,
+ r1.update_time AS updateTime
+
+
+
+