Commit 0e59622e authored by 韩桐桐's avatar 韩桐桐

历史有证管道导入bugfix

parent 54a09edf
...@@ -65,6 +65,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext; ...@@ -65,6 +65,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.io.InputStream; import java.io.InputStream;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.ParseException; import java.text.ParseException;
...@@ -74,6 +75,7 @@ import java.util.concurrent.CompletableFuture; ...@@ -74,6 +75,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import static com.alibaba.fastjson.JSON.toJSONString; import static com.alibaba.fastjson.JSON.toJSONString;
@Slf4j @Slf4j
...@@ -1893,6 +1895,12 @@ public class DataDockServiceImpl { ...@@ -1893,6 +1895,12 @@ public class DataDockServiceImpl {
// 监督管理 // 监督管理
IdxBizJgSupervisionInfo supervisionInfo = JSON.parseObject(toJSONString(pipeline), IdxBizJgSupervisionInfo.class); IdxBizJgSupervisionInfo supervisionInfo = JSON.parseObject(toJSONString(pipeline), IdxBizJgSupervisionInfo.class);
supervisionInfo.setRecord(record); supervisionInfo.setRecord(record);
supervisionInfo.setOrgBranchCode(paramsDto.getOrgBranchCode());
supervisionInfo.setOrgBranchName(paramsDto.getOrgBranchName());
HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(paramsDto.getOrgBranchCode()).getResult();
// 目前平台返回key为compnay(存在拼写错误)
CompanyModel parentModel = JSON.parseObject(JSON.toJSONString(parentMessage.get("compnay")), CompanyModel.class);
supervisionInfo.setCompanyOrgBranchCode(parentModel.getCompanyCode());
supervisionInfo.setRecDate(new Date()); supervisionInfo.setRecDate(new Date());
supervisionInfo.setSequenceNbr(null); supervisionInfo.setSequenceNbr(null);
supervisionInfoList.add(supervisionInfo); supervisionInfoList.add(supervisionInfo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment