财务-报告管理项目经理查询修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/domain/CwProjectReportData.java

@@ -68,6 +68,12 @@ public class CwProjectReportData extends BaseDTO {
     @Query(tableColumn = "e.name")
     @Excel(name = "项目经理",width = 12)
     private String projectMasterName;
+
+    /**
+     * 项目经理id
+     */
+    @TableField(exist = false)
+    private String projectMasterId;
     /**
      * 签字注师1
      */

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -59,6 +59,7 @@
         a.process_definition_id,
         b.project_number as projectNumber,
         b.project_name as projectName,
+        b.project_master_id as projectMasterId,
         c.name as departmentName,
         d.name as userName,
         a.create_date,

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportService.java

@@ -497,8 +497,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         if (StringUtils.isNotEmpty(projectReportData.getProjectName())) {
             queryWrapper.like("b.project_name", projectReportData.getProjectName());
         }
-        if (StringUtils.isNotEmpty(projectReportData.getProjectMasterName())) {
-            queryWrapper.like("e.name", projectReportData.getProjectMasterName());
+        if (StringUtils.isNotEmpty(projectReportData.getProjectMasterId())) {
+            queryWrapper.eq("b.project_master_id", projectReportData.getProjectMasterId());
         }
         if (StringUtils.isNotEmpty(projectReportData.getCreateBy().getId())) {
             queryWrapper.like("a.create_by", projectReportData.getCreateBy().getId());

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/mapper/xml/ReportCancellApplyMapper.xml

@@ -61,7 +61,8 @@
 				e.name as departmentName,
 				f.name as userName,
 				g.name as projectMasterName,
-				h.name as reportSponsor
+				h.name as reportSponsor,
+				d.project_master_id as projectMasterId
 
 				FROM cw_project_report_cancell_apply a
 				LEFT JOIN cw_project_report_new_line b

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/service/ReportCancellApplyService.java

@@ -81,8 +81,8 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
         if (StringUtils.isNotEmpty(projectReportData.getProjectName())) {
             queryWrapper.like("b.project_name", projectReportData.getProjectName());
         }
-        if (StringUtils.isNotEmpty(projectReportData.getProjectMasterName())) {
-            queryWrapper.like("e.name", projectReportData.getProjectMasterName());
+        if (StringUtils.isNotEmpty(projectReportData.getProjectMasterId())) {
+            queryWrapper.eq("d.project_master_id", projectReportData.getProjectMasterId());
         }
         if (StringUtils.isNotEmpty(projectReportData.getCreateBy().getId())) {
             queryWrapper.like("a.create_by", projectReportData.getCreateBy().getId());

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/service/dto/ReportInfoDto.java

@@ -67,6 +67,12 @@ public class ReportInfoDto extends BaseDTO {
     private String projectMasterName;
 
     /**
+     * 项目经理id
+     */
+    @TableField(exist = false)
+    private String projectMasterId;
+
+    /**
      * 新建行id
      */
     private String reportNewLineId;