lgs 11 місяців тому
батько
коміт
ffec919af1

+ 2 - 0
src/main/java/com/kexun/controller/ReportInfoController.java

@@ -94,4 +94,6 @@ public class ReportInfoController {
 
     }
 
+
+
 }

+ 11 - 7
src/main/java/com/kexun/service/xml/SmryQueryRecordHandlerService.java

@@ -30,14 +30,18 @@ public class SmryQueryRecordHandlerService implements IHandleXmlBaseService {
             SmryQueryRecord smryQueryRecord = (SmryQueryRecord) reportXmlBase;
             SmryQueryRecordEntity smryQueryRecordEntity = new SmryQueryRecordEntity();
             LastQueryRecord lastQueryRecord = smryQueryRecord.getLastQueryRecord();
-            BeanUtils.copyProperties(lastQueryRecord, smryQueryRecordEntity);
             LastMounthQueryRecord lastMounthQueryRecord = smryQueryRecord.getLastMounthQueryRecord();
-            BeanUtils.copyProperties(lastMounthQueryRecord, smryQueryRecordEntity);
-            smryQueryRecordEntity.setHeadInfId(commonParam.getHeadInfId());
-            smryQueryRecordEntity.setIdNum(commonParam.getIdNum());
-            smryQueryRecordEntity.setName(commonParam.getName());
-            smryQueryRecordEntity.setRptNo(commonParam.getRptNo());
-            smryQueryRecordService.save(smryQueryRecordEntity);
+            if (lastQueryRecord != null && lastMounthQueryRecord != null) {
+                BeanUtils.copyProperties(lastQueryRecord, smryQueryRecordEntity);
+                BeanUtils.copyProperties(lastMounthQueryRecord, smryQueryRecordEntity);
+
+                smryQueryRecordEntity.setHeadInfId(commonParam.getHeadInfId());
+                smryQueryRecordEntity.setIdNum(commonParam.getIdNum());
+                smryQueryRecordEntity.setName(commonParam.getName());
+                smryQueryRecordEntity.setRptNo(commonParam.getRptNo());
+                smryQueryRecordService.save(smryQueryRecordEntity);
+            }
+
         }
     }
 }

+ 6 - 3
src/main/resources/application.yml

@@ -71,7 +71,7 @@ pagehelperhelper-dialect: mysql
 logging:
   config: classpath:log4j.properties
   level:
-    com.baomidou.mybatisplus.core.mapper: debug
+    com.baomidou.mybatisplus.core.mapper: info
 
 config:
   fileupload:
@@ -81,11 +81,14 @@ config:
 report:
   file:
     # xml文件来源路径
-    xmlSourcePath: "/home/credit/file/zxjx/"
+    #xmlSourcePath: "/home/credit/file/zxjx/"
+    xmlSourcePath: "/Users/lgs/work/xml/"
     # 解析出来的json文件
-    jsonTargetPath: "/home/credit/file/zxjx/"
+    jsonTargetPath: "/home/credit/file/json/"
+    #jsonTargetPath: "/Users/lgs/work/json/"
     # 存放的model文件
     modelTargetPath: "/home/credit/file/model/"
+    #modelTargetPath: "/Users/lgs/work/model/"
 
 xxl:
   job: