设备档案卡导出接口新增类型字段

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/equipment/provider/EquipmentCardProvider.java

@@ -101,11 +101,14 @@ public class EquipmentCardProvider extends GenericProvider implements IEquipment
 					"        FROM ibps_party_employee e2 " +
 					"        WHERE FIND_IN_SET(e2.id_, s.guan_li_ren_) " +
 					"    ) AS guan_li_ren_, " +
-					"s.gui_ge_xing_hao_, " +
-					"s.chang_shang_, " +
-					"s.gong_ying_shang_, " +
-					"s.ji_shen_xu_hao_, " +
-					"s.qi_yong_ri_qi_ " +
+					" s.gui_ge_xing_hao_, " +
+					" s.chang_shang_, " +
+					" s.gong_ying_shang_, " +
+					" s.ji_shen_xu_hao_, " +
+					" s.qi_yong_ri_qi_, " +
+					" concat( ifnull( s.chang_shang_, '' ), '  ', " +
+					"  ifnull( s.she_bei_ming_cheng_, '' ), '  ', " +
+					"  ifnull( s.gui_ge_xing_hao_, '' )  ) AS xin_xi_ " +
 					"from t_sbdj s join ibps_party_position p on s.bian_zhi_bu_men_ = p.id_ where ";
 			String fixSql = buildSql(id,buMen,start,end,yuan,name,type,stats,diDian,user,po);
 			String orderSql = " order by STR_TO_DATE(bian_zhi_shi_jian, '%Y-%m-%d %H:%i') desc,s.create_time_ desc";