Merge remote-tracking branch 'origin/master'

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

@@ -129,7 +129,7 @@ public class BusJcbBlqController extends BaseController {
         params.put("${blqjdztJddz}", info.getBlqjdztJddz().toString());
         params.put("${sbzt}", StringUtils.YES_VALUE.equals(info.getSbzt()) ? "合格" : "不合格");
         params.put("${confirmUser}", StringUtils.isEmpty(info.getConfirmUserRealName())?"":info.getConfirmUserRealName());
-        params.put("${czwt}", info.getCzwt());
+        params.put("${czwt}", info.getCzwtAll());
 
         //生成word文件的文件名
         String fileName = "避雷器手册.docx";

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

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

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

@@ -147,7 +147,7 @@ public class BusJcbBlq extends BusJcab{
         }
     }
 
-    public String getCzwt(){
+    public String getCzwtAll(){
         StringBuffer sb = new StringBuffer();
         if(!StringUtils.isEmpty(tjwzBlqtjazspDesc)){ sb.append(tjwzBlqtjazspDesc).append(";"); }
         if(!StringUtils.isEmpty(tjwzWxsDesc)){ sb.append(tjwzWxsDesc).append(";"); }
@@ -157,6 +157,7 @@ public class BusJcbBlq extends BusJcab{
         if(!StringUtils.isEmpty(blqyxBlqyxwssdgDesc)){ sb.append(blqyxBlqyxwssdgDesc).append(";"); }
         if(!StringUtils.isEmpty(tlqZtlhwpslhDesc)){ sb.append(tlqZtlhwpslhDesc).append(";"); }
         if(!StringUtils.isEmpty(sbztDesc)){ sb.append(sbztDesc).append(";"); }
+        if(!StringUtils.isEmpty(getCzwt())){ sb.append(getCzwt()).append(";"); }
         return sb.toString();
     }
 

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

@@ -177,7 +177,7 @@ public class BusJcbFdfxjyq extends BusJcab{
         return "检测";
     }
 
-    public String getCzwt(){
+    public String getCzwtAll(){
         StringBuffer sb = new StringBuffer();
         if(!StringUtils.isEmpty(jybjFdjyqzjyztDesc)){ sb.append(jybjFdjyqzjyztDesc).append(";"); }
         if(!StringUtils.isEmpty(jybjClsjyzztDesc)){ sb.append(jybjClsjyzztDesc).append(";"); }
@@ -188,6 +188,7 @@ public class BusJcbFdfxjyq extends BusJcab{
         if(!StringUtils.isEmpty(lbjztXhjDesc)){ sb.append(lbjztXhjDesc).append(";"); }
         if(!StringUtils.isEmpty(sdgjcztSddgDesc)){ sb.append(sdgjcztSddgDesc).append(";"); }
         if(!StringUtils.isEmpty(sbztDesc)){ sb.append(sbztDesc).append(";"); }
+        if(!StringUtils.isEmpty(getCzwt())){ sb.append(getCzwt()).append(";"); }
         return sb.toString();
     }
 

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

@@ -36,6 +36,7 @@
     <result column="sbzt_desc" property="sbztDesc"/>
     <result column="check_user" property="checkUser"/>
     <result column="confirm_user" property="confirmUser"/>
+    <result column="confirm_user_real_name" property="confirmUserRealName"/>
     <result column="czwt" property="czwt"/>
     <result column="create_by" property="createBy"/>
     <result column="create_time" property="createTime"/>

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

@@ -44,6 +44,7 @@
     <result column="sbzt_desc" property="sbztDesc"/>
     <result column="check_user" property="checkUser"/>
     <result column="confirm_user" property="confirmUser"/>
+    <result column="confirm_user_real_name" property="confirmUserRealName"/>
     <result column="czwt" property="czwt"/>
     <result column="create_by" property="createBy"/>
     <result column="create_time" property="createTime"/>