diff --git a/.gitignore b/.gitignore
index 9e20bc1..172452b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
**/target/**
logs/
*.iml
+*.zip
+*.xls
+*.xlsx
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 9e20bc1..172452b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
**/target/**
logs/
*.iml
+*.zip
+*.xls
+*.xlsx
\ No newline at end of file
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 34fc67a..11f343d 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.github.oshi
diff --git a/.gitignore b/.gitignore
index 9e20bc1..172452b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
**/target/**
logs/
*.iml
+*.zip
+*.xls
+*.xlsx
\ No newline at end of file
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 34fc67a..11f343d 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 69ed2b9..db6d5e7 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
diff --git a/.gitignore b/.gitignore
index 9e20bc1..172452b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
**/target/**
logs/
*.iml
+*.zip
+*.xls
+*.xlsx
\ No newline at end of file
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 34fc67a..11f343d 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 69ed2b9..db6d5e7 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index 82c0039..5c2733a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-job
- 1.3.0.1
+ 1.3.0.2
org.springframework.boot
diff --git a/.gitignore b/.gitignore
index 9e20bc1..172452b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
**/target/**
logs/
*.iml
+*.zip
+*.xls
+*.xlsx
\ No newline at end of file
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 34fc67a..11f343d 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 69ed2b9..db6d5e7 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index 82c0039..5c2733a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-job
- 1.3.0.1
+ 1.3.0.2
org.springframework.boot
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index 77c4fed..fd4b7fc 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.0.1
+ 1.3.0.2
compile
diff --git a/.gitignore b/.gitignore
index 9e20bc1..172452b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
**/target/**
logs/
*.iml
+*.zip
+*.xls
+*.xlsx
\ No newline at end of file
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 34fc67a..11f343d 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 69ed2b9..db6d5e7 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index 82c0039..5c2733a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-job
- 1.3.0.1
+ 1.3.0.2
org.springframework.boot
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index 77c4fed..fd4b7fc 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.0.1
+ 1.3.0.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 60af08b..cb816b0 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
diff --git a/.gitignore b/.gitignore
index 9e20bc1..172452b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
**/target/**
logs/
*.iml
+*.zip
+*.xls
+*.xlsx
\ No newline at end of file
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 34fc67a..11f343d 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 69ed2b9..db6d5e7 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index 82c0039..5c2733a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-job
- 1.3.0.1
+ 1.3.0.2
org.springframework.boot
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index 77c4fed..fd4b7fc 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.0.1
+ 1.3.0.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 60af08b..cb816b0 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index 358c355..2ae758a 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-common
- 1.3.0.1
+ 1.3.0.2
org.springframework.boot
diff --git a/.gitignore b/.gitignore
index 9e20bc1..172452b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
**/target/**
logs/
*.iml
+*.zip
+*.xls
+*.xlsx
\ No newline at end of file
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 34fc67a..11f343d 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 69ed2b9..db6d5e7 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index 82c0039..5c2733a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-job
- 1.3.0.1
+ 1.3.0.2
org.springframework.boot
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index 77c4fed..fd4b7fc 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.0.1
+ 1.3.0.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 60af08b..cb816b0 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index 358c355..2ae758a 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-common
- 1.3.0.1
+ 1.3.0.2
org.springframework.boot
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
index 8cbff01..750b461 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
@@ -377,6 +377,7 @@
dictTotalMap.put(MeterDictCode.EQUIPMENT_LEVEL, dictService.findInDictByCode(MeterDictCode.EQUIPMENT_LEVEL));
dictTotalMap.put(MeterDictCode.EQUIPMENT_METER_IDENTITY, dictService.findInDictByCode(MeterDictCode.EQUIPMENT_METER_IDENTITY));
dictTotalMap.put(MeterDictCode.EQUIPMENT_IN_USE, dictService.findInDictByCode(MeterDictCode.EQUIPMENT_IN_USE));
+ dictTotalMap.put(MeterDictCode.EQUIPMENT_QUALITY, dictService.findInDictByCode(MeterDictCode.EQUIPMENT_QUALITY));
Long companyId = null;
List parentDeptIds = permissionContext.getDeptService().getParentListById(user.getDeptId());
diff --git a/.gitignore b/.gitignore
index 9e20bc1..172452b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
**/target/**
logs/
*.iml
+*.zip
+*.xls
+*.xlsx
\ No newline at end of file
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 34fc67a..11f343d 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 69ed2b9..db6d5e7 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index 82c0039..5c2733a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-job
- 1.3.0.1
+ 1.3.0.2
org.springframework.boot
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index 77c4fed..fd4b7fc 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.0.1
+ 1.3.0.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 60af08b..cb816b0 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index 358c355..2ae758a 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-common
- 1.3.0.1
+ 1.3.0.2
org.springframework.boot
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
index 8cbff01..750b461 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
@@ -377,6 +377,7 @@
dictTotalMap.put(MeterDictCode.EQUIPMENT_LEVEL, dictService.findInDictByCode(MeterDictCode.EQUIPMENT_LEVEL));
dictTotalMap.put(MeterDictCode.EQUIPMENT_METER_IDENTITY, dictService.findInDictByCode(MeterDictCode.EQUIPMENT_METER_IDENTITY));
dictTotalMap.put(MeterDictCode.EQUIPMENT_IN_USE, dictService.findInDictByCode(MeterDictCode.EQUIPMENT_IN_USE));
+ dictTotalMap.put(MeterDictCode.EQUIPMENT_QUALITY, dictService.findInDictByCode(MeterDictCode.EQUIPMENT_QUALITY));
Long companyId = null;
List parentDeptIds = permissionContext.getDeptService().getParentListById(user.getDeptId());
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 5244982..9a0b1ce 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
@@ -159,7 +159,7 @@
if(CollUtil.isNotEmpty(subcontractorNos)){
QueryWrapper subcontractorQueryWrapper = new QueryWrapper<>();
subcontractorQueryWrapper.in("subcontractor_no",subcontractorNos);
- subcontractorQueryWrapper.eq("approval_status", ApprovalStatusEnum.PASSED);
+// subcontractorQueryWrapper.eq("approval_status", ApprovalStatusEnum.PASSED);
subcontractorList = subcontractorService.list(subcontractorQueryWrapper);
}
diff --git a/.gitignore b/.gitignore
index 9e20bc1..172452b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
**/target/**
logs/
*.iml
+*.zip
+*.xls
+*.xlsx
\ No newline at end of file
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 34fc67a..11f343d 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 69ed2b9..db6d5e7 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index 82c0039..5c2733a 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-job
- 1.3.0.1
+ 1.3.0.2
org.springframework.boot
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index 77c4fed..fd4b7fc 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.3.0.1
+ 1.3.0.2
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 60af08b..cb816b0 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index 358c355..2ae758a 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.3.0.1
+ 1.3.0.2
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-model
- 1.3.0.1
+ 1.3.0.2
com.casic
casic-metering-common
- 1.3.0.1
+ 1.3.0.2
org.springframework.boot
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
index 8cbff01..750b461 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
@@ -377,6 +377,7 @@
dictTotalMap.put(MeterDictCode.EQUIPMENT_LEVEL, dictService.findInDictByCode(MeterDictCode.EQUIPMENT_LEVEL));
dictTotalMap.put(MeterDictCode.EQUIPMENT_METER_IDENTITY, dictService.findInDictByCode(MeterDictCode.EQUIPMENT_METER_IDENTITY));
dictTotalMap.put(MeterDictCode.EQUIPMENT_IN_USE, dictService.findInDictByCode(MeterDictCode.EQUIPMENT_IN_USE));
+ dictTotalMap.put(MeterDictCode.EQUIPMENT_QUALITY, dictService.findInDictByCode(MeterDictCode.EQUIPMENT_QUALITY));
Long companyId = null;
List parentDeptIds = permissionContext.getDeptService().getParentListById(user.getDeptId());
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 5244982..9a0b1ce 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
@@ -159,7 +159,7 @@
if(CollUtil.isNotEmpty(subcontractorNos)){
QueryWrapper subcontractorQueryWrapper = new QueryWrapper<>();
subcontractorQueryWrapper.in("subcontractor_no",subcontractorNos);
- subcontractorQueryWrapper.eq("approval_status", ApprovalStatusEnum.PASSED);
+// subcontractorQueryWrapper.eq("approval_status", ApprovalStatusEnum.PASSED);
subcontractorList = subcontractorService.list(subcontractorQueryWrapper);
}
diff --git a/pom.xml b/pom.xml
index 22a0e2a..dcd5007 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.casic
casic-metering-eqpt-xichang
- 1.3.0.1
+ 1.3.0.2
casic-metering-eqpt-xichang
pom