pic

src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingData.java

@@ -89,6 +89,11 @@ public class ProofTrackingData extends QueryPage {
     private String projectManager;
     @TableField(exist = false)
     private String projectOwner;
+    /**
+     * 列表展示字段：PIC（值取PJM）
+     */
+    @TableField(exist = false)
+    private String pic;
     @TableField(exist = false)
     private String cQualityEngineer1;
     @TableField(exist = false)

src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleProofTrackingServiceImpl.java

@@ -324,6 +324,8 @@ public class SampleProofTrackingServiceImpl implements SampleProofTrackingServic
                 return resolveRoleDisplayValue(getBeanPropertyValue(rowData, "engineerName"), rowData.getEngineer());
             case "projectManager":
                 return resolveRoleDisplayValue(getBeanPropertyValue(rowData, "projectManagerName"), rowData.getProjectManager());
+            case "pic":
+                return resolveRoleDisplayValue(getBeanPropertyValue(rowData, "projectOwnerName"), rowData.getPic());
             default:
                 return getExportDisplayValue(getBeanPropertyValue(rowData, columnProp));
         }

src/main/resources/mapper/grid/GridTableDefaultDao.xml

@@ -32,14 +32,18 @@
         FROM grid_table_default gtd
         LEFT JOIN sys_object_language_others gtl
         ON (gtd.table_id = gtl.table_id AND gtd.column_prop = gtl.object_id
-        AND gtd.function_id = gtl.function_id )
+        AND gtd.function_id = gtl.function_id
+        AND gtl.object_type='table'
+        <if test="languageCode != null and languageCode != ''">
+            AND gtl.language_code = #{languageCode}
+        </if>
+        )
         <where>
-            gtl.object_type='table' AND gtl.language_code = #{languageCode}
             <if test="tableId != null and tableId != ''">
                 and gtd.table_id = #{tableId,jdbcType=VARCHAR}
             </if>
             <if test="objectType != null and objectType != ''">
-                and gtl.object_type = #{objectType,jdbcType=VARCHAR}
+                and (gtl.object_type = #{objectType,jdbcType=VARCHAR} OR gtl.object_type IS NULL)
             </if>
             <if test="status != null and status != ''">
                 and gtd.status = #{status,jdbcType=BOOLEAN}

src/main/resources/mapper/grid/GridTableUserDao.xml

@@ -37,15 +37,19 @@
         FROM
         grid_table_user gtd
         LEFT JOIN sys_object_language_others gtl ON ( gtd.table_id = gtl.table_id AND gtd.column_prop = gtl.object_id
-        AND gtd.function_id = gtl.function_id )
+        AND gtd.function_id = gtl.function_id
+        AND gtl.object_type='table'
+        <if test="languageCode != null and languageCode != ''">
+            AND gtl.language_code = #{languageCode}
+        </if>
+        )
 
         <where>
-            gtl.object_type='table' AND gtl.language_code = #{languageCode}
             <if test="tableId != null and tableId != ''">
              and   gtd.table_id = #{tableId,jdbcType=VARCHAR}
             </if>
             <if test="objectType != null and objectType != ''">
-               and gtl.object_type = #{objectType,jdbcType=VARCHAR}
+               and (gtl.object_type = #{objectType,jdbcType=VARCHAR} OR gtl.object_type IS NULL)
             </if>
             <if test="userId != null and userId != ''">
                 and gtd.user_id = #{userId,jdbcType=VARCHAR}

src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml

@@ -36,6 +36,8 @@
             p.c_project_region,
             p.project_manager,
             p.project_owner,
+            COALESCE(NULLIF(LTRIM(RTRIM(p.project_owner)), ''),
+                     NULLIF(LTRIM(RTRIM(pp.project_owner)), '')) AS pic,
             p.need_date,
             pp.test_part_no,
             pp.part_desc,