Merge branch 'V1' of http://223.75.76.159:9090/xiao547607/smart-community-server

web/src/main/java/com/jpsoft/smart/modules/base/controller/CompanyInfoController.java

@@ -105,6 +105,22 @@ public class CompanyInfoController {
 
             if (companyInfo != null) {
                 PojoUtils.map(companyInfo, companyInfoDTO);
+
+                CompanyPosition companyPosition = new CompanyPosition();
+                Map<String,Object> searchParams1 = new HashMap<>();
+                searchParams1.put("companyId",companyInfo.getId());
+                List<Sort> sortList1 = new ArrayList<>();
+                sortList1.add(new Sort("id_","asc"));
+                Page<CompanyPosition> page1 = companyPositionService.pageSearch(searchParams1,1,1,false,sortList1);
+                if(page1.size() > 0) {
+                    companyPosition = page1.get(0);
+                    companyInfoDTO.setPosition1Name(companyPosition.getPosition1Name());
+                    companyInfoDTO.setPosition2Name(companyPosition.getPosition2Name());
+                    companyInfoDTO.setPosition3Name(companyPosition.getPosition3Name());
+                    companyInfoDTO.setPosition4Name(companyPosition.getPosition4Name());
+                    companyInfoDTO.setPosition5Name(companyPosition.getPosition5Name());
+                }
+
                 msgResult.setResult(true);
                 msgResult.setData(companyInfoDTO);
             } else {

web/src/main/java/com/jpsoft/smart/modules/base/controller/PersonInfoController.java

@@ -761,21 +761,23 @@ public class PersonInfoController {
         return msgResult;
     }
 
-//    @ApiOperation(value="导出人员")
-//    @PostMapping("exportXls")
-//    public MessageResult<String> exportXls(@RequestBody List<String> ids){
-//        MessageResult<String> msgResult = new MessageResult<>();
-//
-//        try {
-//
-//        }
-//        catch(Exception ex){
-//            logger.error(ex.getMessage(),ex);
-//
-//            msgResult.setResult(false);
-//            msgResult.setMessage(ex.getMessage());
-//        }
-//
-//        return msgResult;
-//    }
+    @ApiOperation(value="数据同步")
+    @PostMapping("dataSync")
+    public MessageResult<String> dataSync(@RequestBody List<String> ids){
+        MessageResult<String> msgResult = new MessageResult<>();
+
+        try {
+            for(String id : ids){
+
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }