20220913

合同管理-合同登记

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/service/WorkContractService.java

@@ -3,9 +3,13 @@ package com.jeeplus.test.workContract.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jeeplus.sys.utils.TicketQueryUtils;
 import com.jeeplus.test.oss.service.OssService;
 import com.jeeplus.test.workClientInfo.domain.WorkClientInfo;
+import com.jeeplus.test.workClientInfo.domain.dto.WorkClientInfosDto;
 import com.jeeplus.test.workClientInfo.mapper.WorkClientInfoMapper;
+import com.jeeplus.test.workClientInfo.service.WorkClientService;
+import net.sf.json.JSONObject;
 import org.flowable.editor.language.json.converter.util.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.sys.service.dto.UserDTO;
@@ -33,7 +37,7 @@ public class WorkContractService {
     private WorkContractInfoMapper workContractInfoMapper;
 
     @Resource
-    private WorkClientInfoMapper workClientInfoMapper;
+    private WorkClientService workClientService;
 
     @Resource
     private OssServiceMapper ossServiceMapper;
@@ -152,8 +156,9 @@ public class WorkContractService {
         BeanUtils.copyProperties(info, dto);
         // 查询客户信息
         if (StringUtils.isNotEmpty(dto.getClientId())) {
-            WorkClientInfo workClientInfo = workClientInfoMapper.selectById(dto.getClientId());
-            dto.setClientName(workClientInfo.getName());
+            String s = TicketQueryUtils.enterpriseTicketInfoQueryById(dto.getClientId());
+            JSONObject jsonObject = JSONObject.fromObject(s);
+            dto.setClientName(jsonObject.getString("ENTNAME"));
         }
         // 查询附件信息
         LambdaQueryWrapper<WorkAttachment> wrapper = new LambdaQueryWrapper<>();