添加了 消防专家、机场单位人员的excle导出数据帅选

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -65,7 +65,7 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 
 
     List< Map<String,Object>> getparent();
-    List< OrgUsrExcelDto> exportToExcel();
+    List< OrgUsrExcelDto> exportToExcel(String parentId ,String bizOrgName,String internalPositionCode ,String positionType);
 
     /**
      * 查询单位基本信息列表和单位下所有的重点部位数量。

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -181,7 +181,7 @@ public interface IOrgUsrService {
 
     List<Map<String, Object>> getparent();
 
-    List<OrgUsrExcelDto> exportToExcel();
+    List<OrgUsrExcelDto> exportToExcel( Map par);
 
     UserUnitDto getUserUnit(String userId);
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -68,21 +68,21 @@
         (  SELECT
         v.`instance_id`,
         max(case v.field_code when 'personNumber' then IFNULL(v.field_value_label,v.field_value) end) personNumber,
-        max(case v.field_code when 'certificates_type' then IFNULL(v.field_value_label,v.field_value) end) certificates_type,
+        max(case v.field_code when 'certificatesTypeCode' then IFNULL(v.field_value_label,v.field_value) end) certificatesTypeCode,
         max(case v.field_code when 'gender' then IFNULL(v.field_value_label,v.field_value) end) gender,
-        max(case v.field_code when 'certificates_number' then IFNULL(v.field_value_label,v.field_value) end) certificates_number,
+        max(case v.field_code when 'certificatesNumber' then IFNULL(v.field_value_label,v.field_value) end) certificatesNumber,
         max(case v.field_code when 'telephone' then IFNULL(v.field_value_label,v.field_value) end) telephone,
         max(case v.field_code when 'state' then IFNULL(v.field_value_label,v.field_value) end) state,
-        max(case v.field_code when 'safety_training' then IFNULL(v.field_value_label,v.field_value) end) safety_training,
-        max(case v.field_code when 'administrative_position' then IFNULL(v.field_value_label,v.field_value) end) administrative_position,
-        max(case v.field_code when 'internal_position' then IFNULL(v.field_value_label,v.field_value) end) internal_position,
-        max(case v.field_code when 'fireManagement_post' then IFNULL(v.field_value_label,v.field_value) end) fireManagement_post,
-        max(case v.field_code when 'position_type' then IFNULL(v.field_value_label,v.field_value) end) position_type,
-        max(case v.field_code when 'certificate_type' then IFNULL(v.field_value_label,v.field_value) end) certificate_type,
-        max(case v.field_code when 'holding_time' then IFNULL(v.field_value_label,v.field_value) end) holding_time,
-        max(case v.field_code when 'audit_cycle' then IFNULL(v.field_value_label,v.field_value) end) audit_cycle,
-        max(case v.field_code when 'person_img' then IFNULL(v.field_value_label,v.field_value) end) person_img,
-        max(case v.field_code when 'certificate_img' then IFNULL(v.field_value_label,v.field_value) end) certificate_img
+        max(case v.field_code when 'safetyTraining' then IFNULL(v.field_value_label,v.field_value) end) safetyTraining,
+        max(case v.field_code when 'administrativePositionCode' then IFNULL(v.field_value_label,v.field_value) end) administrativePositionCode,
+        max(case v.field_code when 'internalPositionCode' then IFNULL(v.field_value_label,v.field_value) end) internalPositionCode,
+        max(case v.field_code when 'fireManagementPostCode' then IFNULL(v.field_value_label,v.field_value) end) fireManagementPostCode,
+        max(case v.field_code when 'positionType' then IFNULL(v.field_value_label,v.field_value) end) positionType,
+        max(case v.field_code when 'certificateType' then IFNULL(v.field_value_label,v.field_value) end) certificateType,
+        max(case v.field_code when 'holdingTime' then IFNULL(v.field_value_label,v.field_value) end) holdingTime,
+        max(case v.field_code when 'auditCycle' then IFNULL(v.field_value_label,v.field_value) end) auditCycle,
+        max(case v.field_code when 'personImg' then IFNULL(v.field_value_label,v.field_value) end) personImg,
+        max(case v.field_code when 'certificateImg' then IFNULL(v.field_value_label,v.field_value) end) certificateImg
         FROM
         `cb_dynamic_form_instance` v
         WHERE
@@ -223,23 +223,23 @@
                  left join
              (
                  select instance_id,
-                        max(case field_code when 'personNumber' then field_value end)                   person_number,
-                        max(case field_code when 'certificatesTypeCode' then field_value end)           certificates_type,
+                        max(case field_code when 'personNumber' then field_value end)                   personNumber,
+                        max(case field_code when 'certificatesTypeCode' then field_value end)           certificatesTypeCode,
                         max(case field_code when 'gender' then field_value end)                         gender,
-                        max(case field_code when 'certificatesNumber' then field_value end)             certificates_number,
+                        max(case field_code when 'certificatesNumber' then field_value end)             certificatesNumber,
                         max(case field_code when 'telephone' then field_value end)                      telephone,
                         max(case field_code when 'stateCode' then field_value end)                      state,
-                        max(case field_code when 'safetyTraining' then field_value end)                 safety_training,
+                        max(case field_code when 'safetyTraining' then field_value end)                 safetyTraining,
                         max(
-                                case field_code when 'administrativePositionCode' then field_value end) administrative_position,
-                        max(case field_code when 'internalPositionCode' then field_value end)           internal_position,
-                        max(case field_code when 'fireManagementPostCode' then field_value end)         fireManagement_post,
-                        max(case field_code when 'positionType' then field_value end)                   position_type,
-                        max(case field_code when 'certificateType' then field_value end)                certificate_type,
-                        max(case field_code when 'holdingTime' then field_value end)                    holding_time,
-                        max(case field_code when 'auditCycle' then field_value end)                     audit_cycle,
-                        max(case field_code when 'personImg' then field_value end)                      person_img,
-                        max(case field_code when 'certificateImg' then field_value end)                 certificate_img
+                                case field_code when 'administrativePositionCode' then field_value end) administrativePositionCode,
+                        max(case field_code when 'internalPositionCode' then field_value end)           internalPositionCode,
+                        max(case field_code when 'fireManagementPostCode' then field_value end)         fireManagementPostCode,
+                        max(case field_code when 'positionType' then field_value end)                   positionType,
+                        max(case field_code when 'certificateType' then field_value end)                certificateType,
+                        max(case field_code when 'holdingTime' then field_value end)                    holdingTime,
+                        max(case field_code when 'auditCycle' then field_value end)                     auditCycle,
+                        max(case field_code when 'personImg' then field_value end)                      personImg,
+                        max(case field_code when 'certificateImg' then field_value end)                 certificateImg
                  from cb_dynamic_form_instance
                  where group_code = 246
                  group by instance_id
@@ -503,6 +503,18 @@ GROUP BY
     FROM cb_dynamic_form_instance GROUP BY instance_id) b
 
     on b.instance_id=a.sequence_nbr where a.biz_org_name is not null and a.is_delete = 0
+     		<if test="parentId  != null and parentId  != '' and parentId  != '-1'">
+                and a.parent_id = #{parentId}
+            </if>
+             <if test="bizOrgName != null and bizOrgName != ''">
+                AND  a.biz_org_name LIKE CONCAT( '%',#{bizOrgName}, '%')
+            </if>
+             <if test="internalPositionCode  != null and internalPositionCode  != ''">
+               and b.internalPositionCode = #{internalPositionCode}
+            </if>
+             <if test="positionType != null and positionType != ''">
+                b.positionType = #{positionType}
+            </if>
     </select>
 
 <select id="getCompanyAndKeySite" resultType="com.yeejoin.amos.boot.module.common.api.dto.CheckObjectDto" >

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireExpertsServiceImpl.java

@@ -37,7 +37,9 @@ public class FireExpertsServiceImpl extends BaseService<FireExpertsDto, FireExpe
     /**
      * 列表查询 示例
      */
-    public List<FireExpertsDto> queryForFireExpertsList(@Condition(Operator.eq) Boolean isDelete) {
-        return this.queryForList("", false, isDelete);
+    public List<FireExpertsDto> queryForFireExpertsList(@Condition(Operator.eq) Boolean isDelete,
+    		 @Condition(Operator.like) String name,
+             @Condition(Operator.eq) String expertCode) {
+        return this.queryForList("", false, isDelete, name, expertCode);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -1184,8 +1184,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
-	public List<OrgUsrExcelDto> exportToExcel() {
-		return orgUsrMapper.exportToExcel();
+	public List<OrgUsrExcelDto> exportToExcel(Map par) {
+		String parentId = par.containsKey("parentId")?par.get("parentId").toString():null;
+		String bizOrgName = par.containsKey("bizOrgName")?par.get("bizOrgName").toString():null;
+		String internalPositionCode = par.containsKey("internalPositionCode")?par.get("internalPositionCode").toString():null;
+		String positionType= par.containsKey("positionType")?par.get("positionType").toString():null;
+		return orgUsrMapper.exportToExcel(parentId,bizOrgName,internalPositionCode,positionType);
 	}
 
 	@Override