diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml index d21c296..352950c 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml @@ -3,7 +3,7 @@ ################### spring配置 ################### spring: datasource: - driver-class-name: com.mysql.cj.jdbc.Driver +# driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: Casic203 diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml index d21c296..352950c 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml @@ -3,7 +3,7 @@ ################### spring配置 ################### spring: datasource: - driver-class-name: com.mysql.cj.jdbc.Driver +# driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: Casic203 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 40b875e..d1a468c 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -66,7 +66,7 @@ com.aspose aspose-words - 0.0.1-SNAPSHOT + 16.8.0 diff --git a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml index d21c296..352950c 100644 --- a/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-eqpt-api/src/main/resources/config/application-dev.yml @@ -3,7 +3,7 @@ ################### spring配置 ################### spring: datasource: - driver-class-name: com.mysql.cj.jdbc.Driver +# driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: Casic203 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 40b875e..d1a468c 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -66,7 +66,7 @@ com.aspose aspose-words - 0.0.1-SNAPSHOT + 16.8.0 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java index 559465a..67be945 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java @@ -174,7 +174,10 @@ @Override public void finishApproval(Long approvalId) { super.finishApproval(approvalId); - Subcontractor subcontractor = subcontractorService.getById(approvalId); + + SubcontractOrder order = this.getById(approvalId); + Subcontractor subcontractor = subcontractorService.getById(order.getSubcontractorId()); + List relationList = relationService.listByOrder(approvalId); for (SubcontractOrderRelation relation : relationList) { SampleStatueUpdate updateInfo = new SampleStatueUpdate();