From 5dd6f4aa2123671e95907ee19f5925a98983cdc8 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 25 三月 2024 10:05:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java
index 4000224..23fc0bb 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java
@@ -1,15 +1,17 @@
package com.vci.ubcs.code.controller;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.shaded.com.google.gson.JsonObject;
import com.vci.ubcs.code.service.UniversalInterfaceI;
-import com.vci.ubcs.code.vo.webserviceModel.person.OrgData;
-import com.vci.ubcs.code.vo.webserviceModel.person.PersonData;
-import com.vci.ubcs.code.vo.webserviceModel.person.ResultOrgData;
+import com.vci.ubcs.code.vo.webserviceModel.person.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* 鐢宠浜哄憳閮ㄩ棬鎺у埗鍣�
@@ -34,15 +36,18 @@
/****
* 浜哄憳鏁版嵁鍚屾
- * @param personData
+ * @param personDataVO
* @return
* @throws Throwable
*/
@PostMapping("/syncDataForPerson")
- public ResultOrgData syncDataForPerson(@RequestBody PersonData personData, HttpServletRequest request) {
+ public ResultOrgData syncDataForPerson(@RequestBody PersonDataVO personDataVO, HttpServletRequest request) {
this.setHttpToThreadLocal(request);
- String result="";
try {
+ PersonData personData = new PersonData();
+ Func.copy(personDataVO,personData);
+ List<PersonMasterData> personMasterData = JSONObject.parseArray(personDataVO.getMasterData(), PersonMasterData.class);
+ personData.setMasterData(personMasterData);
return universalInterfaceI.syncDataForPerson(personData);
}catch (Throwable e){
e.printStackTrace();
@@ -53,15 +58,18 @@
/****
* 閮ㄩ棬鏁版嵁鍚屾
- * @param orgData 閮ㄩ棬鏁版嵁
+ * @param orgDataVO 閮ㄩ棬鏁版嵁
* @return
* @throws Throwable
*/
@PostMapping("/syncDataForOrg")
- public ResultOrgData syncDataForOrg(@RequestBody OrgData orgData, HttpServletRequest request) {
+ public ResultOrgData syncDataForOrg(@RequestBody OrgDataVO orgDataVO, HttpServletRequest request) {
this.setHttpToThreadLocal(request);
- String result="";
try {
+ OrgData orgData = new OrgData();
+ Func.copy(orgDataVO,orgData);
+ List<OrgMasterData> orgMasterData = JSONObject.parseArray(orgDataVO.getMasterData(), OrgMasterData.class);
+ orgData.setMasterData(orgMasterData);
return universalInterfaceI.syncDataForOrg(orgData);
}catch (Throwable e){
e.printStackTrace();
--
Gitblit v1.9.3