Merge remote-tracking branch 'origin/test' into test

src/main/java/com/uas/credit/controller/ErpQueryController.java

@@ -64,7 +64,7 @@ public class ErpQueryController {
     /**
      * erp对个人进行查询
      */
-    @RequestMapping(value = "/queryPe",method = RequestMethod.POST, produces="application/json;charset=UTF-8")
+    @RequestMapping(value = "/queryPe",method = RequestMethod.POST)
     public ModelMap queryPerson(@RequestBody PersonQuery erpQuery) {
         ModelMap modelMap = new ModelMap();
         if(erpQuery != null){

src/main/java/com/uas/credit/dao/PersonCorporationDao.java

@@ -1,6 +1,6 @@
 package com.uas.credit.dao;
 
-import com.uas.credit.model.personCorporation.PersonCorporationReport;
+import com.uas.credit.model.personCorporation.PersonCorporationRoot;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -10,6 +10,6 @@ import org.springframework.stereotype.Repository;
  * created by shicr on 2018/6/15
  **/
 @Repository
-public interface PersonCorporationDao extends JpaRepository<PersonCorporationReport, Long> {
+public interface PersonCorporationDao extends JpaRepository<PersonCorporationRoot, Long> {
 
 }

src/main/java/com/uas/credit/model/personal/PoliceCheckReport.java

@@ -36,7 +36,7 @@ public class PoliceCheckReport {
     @OneToOne(cascade = {CascadeType.PERSIST})
     private PoliceCheckRoot policeCheckRoot;
 
-    @OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
+    @OneToMany(cascade = { CascadeType.PERSIST })
     @JoinColumn(name = "pc_id")
     List<PoliceCheckInfo> cisReport;
 

src/main/java/com/uas/credit/service/impl/PersonCorporationServiceImpl.java

@@ -2,13 +2,12 @@ package com.uas.credit.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.uas.credit.controller.PyConfig;
-import com.uas.credit.dao.EnterpriseDao;
 import com.uas.credit.dao.PersonCorporationDao;
 import com.uas.credit.model.Item;
 import com.uas.credit.model.PersonQuery;
 import com.uas.credit.model.QueryCondition;
 import com.uas.credit.model.QueryConditions;
-import com.uas.credit.model.personCorporation.PersonCorporationReport;
+import com.uas.credit.model.personCorporation.PersonCorporationRoot;
 import com.uas.credit.service.ErpQueryService;
 import com.uas.credit.service.PersonCorporationService;
 
@@ -87,8 +86,8 @@ public class PersonCorporationServiceImpl implements PersonCorporationService {
         //发起鹏元征信的请求
         String corporationResult = erpQueryService.requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP, corporation);
         //保存返回的结果
-        PersonCorporationReport personCorporationReport = JSON.parseObject(corporationResult, PersonCorporationReport.class);
-        PersonCorporationReport personCorporationReport1 = personCorporationDao.save(personCorporationReport);
+        PersonCorporationRoot personCorporationRoot = JSON.parseObject(corporationResult, PersonCorporationRoot.class);
+        PersonCorporationRoot personCorporationReport1 = personCorporationDao.save(personCorporationRoot);
         return corporationResult;
 
     }