浏览代码

开单合理项维护

zhaops 4 年之前
父节点
当前提交
74618ee8a3

+ 3 - 2
src/main/java/com/diagbot/facade/BillManFacade.java

@@ -353,7 +353,7 @@ public class BillManFacade {
             }
         }
 
-        if(!conditionLabels.contains(condition.getConditionLabel())){
+        if (!conditionLabels.contains(condition.getConditionLabel())) {
             throw new CommonException(CommonErrorCode.IS_EXISTS, "开单项目与条件明细无关联");
         }
 
@@ -380,7 +380,8 @@ public class BillManFacade {
             BillSaveVO oldBillRecord = getRecordByRelationId(relationIdVO);
             if (oldBillRecord != null
                     && oldBillRecord.getRelationId().equals(billSaveVO.getRelationId())
-                    && !oldBillRecord.getCondition().getName().equals(condition.getName())) {
+                    && (!oldBillRecord.getCondition().getId().equals(condition.getId())
+                    || !oldBillRecord.getConcept().getId().equals(concept.getId()))) {
                 baseNodeRepository.deleteRelationStatusById(billSaveVO.getRelationId());
             }
         }

+ 1 - 1
src/main/resources/application-local.yml

@@ -106,7 +106,7 @@ spring:
 
 neo4j:
   data:
-    URI: http://192.168.3.150:7480
+    URI: http://192.168.2.234:7480
     username: neo4j
     password: root
 

+ 1 - 1
src/main/resources/logback-spring.xml

@@ -204,7 +204,7 @@
     <!-- FrameworkServlet日志-->
     <logger name="org.springframework" level="WARN"/>
 
-    <!--<logger name="org.neo4j.ogm" level="DEBUG" />-->
+    <logger name="org.neo4j.ogm" level="DEBUG" />
 
     <!-- mybatis日志打印-->
     <logger name="org.apache.ibatis" level="DEBUG"/>