实体类调整

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/domain/CwProjectRecords.java

@@ -3,9 +3,6 @@ package com.jeeplus.test.cw.projectRecords.domain;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.core.query.Query;
-import com.jeeplus.core.query.QueryType;
-import com.jeeplus.sys.service.dto.OfficeDTO;
-import com.jeeplus.sys.service.dto.UserDTO;
 import lombok.Data;
 
 import java.util.Date;
@@ -38,8 +35,7 @@ public class CwProjectRecords extends BaseEntity {
     /**
      * 项目所属部门
      */
-    @Query(type = QueryType.EQ, tableColumn = "su.office.id", javaField = "officeDTO.id")
-    private OfficeDTO officeDTO;
+    private String officeId;
 
     /**
      * 项目金额
@@ -64,14 +60,12 @@ public class CwProjectRecords extends BaseEntity {
     /**
      * 项目经理
      */
-    @Query(tableColumn = "a.project_master_id", javaField = "master.id", type = QueryType.EQ)
-    private UserDTO projectMaster;
+    private String projectMasterId;
 
     /**
      * 现场负责人
      */
-    @Query(tableColumn = "a.project_leader_id", javaField = "leader.id", type = QueryType.EQ)
-    private UserDTO projectLeader;
+    private String projectLeaderId;
 
     /**
      * 流程id

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/CwProjectRecordsService.java

@@ -10,7 +10,6 @@ import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
-import com.jeeplus.test.cw.contractRegistration.domain.ContractInfo;
 import com.jeeplus.test.cw.projectRecords.domain.CwProjectRecords;
 import com.jeeplus.test.cw.projectRecords.mapper.CwProjectRecordsMapper;
 import com.jeeplus.test.cw.projectRecords.service.dto.CwProjectClientInfoDTO;