修改检查表确认人为姓名

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbBlqController.java

@@ -128,7 +128,7 @@ public class BusJcbBlqController extends BaseController {
         params.put("${jsqDzjs}", info.getJsqDzjs());
         params.put("${blqjdztJddz}", info.getBlqjdztJddz().toString());
         params.put("${sbzt}", StringUtils.YES_VALUE.equals(info.getSbzt()) ? "合格" : "不合格");
-        params.put("${confirmUser}", StringUtils.isEmpty(info.getConfirmUser())?"":info.getConfirmUser());
+        params.put("${confirmUser}", StringUtils.isEmpty(info.getConfirmUserRealName())?"":info.getConfirmUserRealName());
         params.put("${czwt}", info.getCzwt());
 
         //生成word文件的文件名

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbFdfxjyqController.java

@@ -158,7 +158,7 @@ public class BusJcbFdfxjyqController extends BaseController {
         params.put("${xlfdFdsxlqj}", info.getXlfdFdsxlqj().toString());
         params.put("${xlfdFdczxlqj}", info.getXlfdFdczxlqj().toString());
         params.put("${sdgjcztSddg}", StringUtils.yesOrNo(info.getSdgjcztSddg()));
-        params.put("${confirmUser}", info.getConfirmUser()==null?"":info.getConfirmUser());
+        params.put("${confirmUser}", StringUtils.isEmpty(info.getConfirmUserRealName())?"":info.getConfirmUserRealName());
         params.put("${czwt}", info.getCzwt());
         //填充图片信息
         Map<String,Object> header = new HashMap<>();

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcab.java

@@ -73,6 +73,9 @@ public class BusJcab extends BaseEntity {
   @ApiModelProperty(value = "确认人")
   private String confirmUser;
 
+  @ApiModelProperty(value = "确认人姓名")
+  private String confirmUserRealName;
+
   @ApiModelProperty(value = "存在问题")
   @Length(max = 1000, message = "【存在问题】长度必须介于 {min} 和 {max} 之间")
   private String czwt;

railway-business/src/main/resources/mapper/catenary/BusJcbBlqMapper.xml

@@ -351,9 +351,10 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>,u.real_name confirm_user_real_name
     FROM bus_jcb_blq t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    LEFT JOIN sys_user u on t.confirm_user = u.user_name
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>

railway-business/src/main/resources/mapper/catenary/BusJcbFdfxjyqMapper.xml

@@ -471,11 +471,12 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>,u.real_name confirm_user_real_name
     FROM
     bus_jcb_fdfxjyq t
     left join base_fdfxjyq b on t.fdfxjyq_id = b.id
     LEFT JOIN v_station v on b.dept_station_id = v.dept_station_id
+    LEFT JOIN sys_user u on t.confirm_user = u.user_name
     where t.del_flag='0' and b.del_flag='0' and b.del_flag='0' and t.id = #{id}
 
   </select>