修改人员导出

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrExcelDto.java

@@ -252,14 +252,4 @@ public class OrgUsrExcelDto extends BaseDto {
     @ApiModelProperty(value = "消防人员id")
     private Long firefightersId;
 
-
-
-
-
-
-
-
-
-
-
 }

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

@@ -3,14 +3,12 @@ package com.yeejoin.amos.boot.module.common.api.mapper;
 import java.util.List;
 import java.util.Map;
 
-import com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.*;
 
 import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.biz.common.utils.FirefightersTreeDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
 import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
 
 /**
@@ -42,4 +40,6 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
     List<Map<String, String>> selectNormalFirePerson(String jobId);
 
     List<Firefighters> getPersonByCodes(@Param("list") List<String> list);
+
+    List<OrgUsrFireExcelDto> exportToExcelNew(Boolean isDelete, String name, String postQualification, String fireTeamId, String state, String areasExpertise, String jobTitle, String bizOrgCode);
 }

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

@@ -271,4 +271,174 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
         </foreach>
         and is_delete = 0
     </select>
+    <select id="exportToExcelNew" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFireExcelDto">
+        select
+        a.biz_org_name bizOrgName,
+        (select c.biz_org_name from cb_org_usr c  where c.sequence_nbr=a.parent_id) parentId,
+        (
+        SELECT
+        cb_fire_team. NAME
+        FROM
+        cb_fire_team
+        WHERE
+        cb_fire_team.sequence_nbr = f.fire_team_id
+        ) fireTeam,
+        (
+        SELECT
+        NAME
+        FROM
+        cb_data_dictionary
+        WHERE
+        CODE = fe.first_degree
+        AND type = 'XLLX'
+        ) AS first_degree,
+        (
+        SELECT
+        NAME
+        FROM
+        cb_data_dictionary
+        WHERE
+        CODE = fe.highest_education
+        AND type = 'XLLX'
+        ) AS highest_education,
+        (
+        SELECT
+        NAME
+        FROM
+        cb_data_dictionary
+        WHERE
+        CODE = fe.academic_degree
+        AND type = 'XWLX'
+        ) AS academic_degree,
+        fe.school,
+        fe.professional_name,
+        (
+        SELECT
+        NAME
+        FROM
+        cb_data_dictionary
+        WHERE
+        CODE = fp.employee_hierarchy
+        AND type = 'YGCJ'
+        ) AS employee_hierarchy,
+        (
+        SELECT
+        NAME
+        FROM
+        cb_data_dictionary
+        WHERE
+        CODE = fp.internal_position_code
+        AND type = 'JGNBZW'
+        ) AS internal_position_code,
+        (
+        SELECT
+        NAME
+        FROM
+        cb_data_dictionary
+        WHERE
+        CODE = fp.audit_cycle
+        AND type = 'SHZQ'
+        ) AS audit_cycle,
+        fp.administrative_position as administrativePositionCode,
+        fp.job_title as positionType,
+        fp.post_qualification as postQualification,
+        fp.fire_management_post as fireManagementPostCode,
+        fp.certificate_type as certificateType,
+        (
+        SELECT
+        NAME
+        FROM
+        cb_data_dictionary
+        WHERE
+        CODE = fc.relationship
+        AND type = 'RJGX'
+        ) AS relationship,
+        (
+        SELECT
+        NAME
+        FROM
+        cb_data_dictionary
+        WHERE
+        CODE = b.gender
+        AND type = 'XB'
+        ) AS gender,
+        (
+        SELECT
+        NAME
+        FROM
+        cb_data_dictionary
+        WHERE
+        CODE = b.safetyTraining
+        AND type = 'AQPX'
+        ) AS safetyTraining,
+        (
+        SELECT
+        NAME
+        FROM
+        cb_data_dictionary
+        WHERE
+        CODE = b.peopleType
+        AND type = 'DWRYLX'
+        ) AS peopleType,
+        fc.emergency_contact,
+        fc.emergency_contact_phone,
+        fp.category,
+        fp.level,
+        fp.areas_expertise,
+        (
+        SELECT
+        NAME
+        FROM
+        cb_data_dictionary
+        WHERE
+        CODE = b.certificatesTypeCode
+        AND type = 'RYZJLX'
+        ) AS certificatesTypeCode,
+        fp.employee_hierarchy,
+        cast(b.birthdayTime as datetime) as birthdayTime,
+        b.*,
+        fw.*
+        from cb_org_usr a LEFT JOIN
+        (SELECT
+        instance_id,
+        max(case field_code when 'auditCycle' then field_value_label end)                     auditCycle,
+        max(case field_code when 'certificatesNumber' then field_value end)                   certificatesNumber,
+        max(case field_code when 'certificatesTypeCode' then field_value end)           certificatesTypeCode,
+        max(case field_code when 'certificateType' then field_value_label end)                certificateType,
+        max(case field_code when 'fireManagementPostCode' then field_value_label end)         fireManagementPostCode,
+        max(case field_code when 'gender' then field_value end)                         gender,
+        max(case field_code when 'internalPositionCode' then field_value_label end)           internalPositionCode,
+        max(case field_code when 'personNumber' then field_value end)                         personNumber,
+        max(case field_code when 'positionType' then field_value_label end)                   positionType,
+        max(case field_code when 'safetyTraining' then field_value end)                 safetyTraining,
+        max(case field_code when 'stateCode' then field_value_label end)                      stateCode,
+        max(case field_code when 'telephone' then field_value end)                            telephone,
+        max(case field_code when 'peopleType' then field_value end)                     peopleType,
+        max(case field_code when 'nation' then field_value end)                     nation,
+        max(case field_code when 'birthdayTime' then field_value end)                     birthdayTime,
+        max(case field_code when 'maritalStatus' then field_value end)                     maritalStatus,
+        max(case field_code when 'nativePlace' then field_value end)                     nativePlace,
+        max(case field_code when 'nativePlaceVal' then field_value end)                     nativePlaceVal,
+        max(case field_code when 'politicalOutlook' then field_value end)                     politicalOutlook,
+        max(case field_code when 'residenceDetails' then field_value end)                     residenceDetails,
+        max(case field_code when 'residenceDetailVal' then field_value end)                     residenceDetailVal,
+        max(case field_code when 'airportAccommodation' then field_value end)                     airportAccommodation
+        FROM cb_dynamic_form_instance GROUP BY instance_id) b
+
+        on b.instance_id=a.sequence_nbr
+        LEFT JOIN cb_firefighters_contacts fc ON a.sequence_nbr = fc.org_usr_id
+        LEFT JOIN cb_firefighters_workexperience fw ON a.sequence_nbr = fw.org_usr_id
+        LEFT JOIN cb_firefighters_education fe ON a.sequence_nbr = fe.org_usr_id
+        LEFT JOIN cb_firefighters_post fp ON a.sequence_nbr = fp.org_usr_id
+        LEFT JOIN  cb_firefighters f ON a.sequence_nbr = f.org_usr_id
+
+        where a.biz_org_name is not null and a.is_delete = 0 and a.biz_org_type = 'PERSON'
+        <if test="name!=null and name !='-1' and name !=''">and a.`name` like concat('%',#{name},'%')</if>
+        <if test='postQualification!=null'>and fp.post_qualification_code = #{postQualification}</if>
+        <if test='fireTeamId !=null'>and f.fire_team_id = #{fireTeamId}</if>
+        <if test='state !=null'>and f.state_code = #{state}</if>
+        <if test='areasExpertise!=null'>and fp.areas_expertise_code = #{areasExpertise}</if>
+        <if test='jobTitle!=null'>and f.job_title_code = #{jobTitle}</if>
+        <if test='bizOrgCode!=null'>and f.biz_org_code  like concat ('%',#{bizOrgCode},'%')  </if>
+    </select>
 </mapper>

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

@@ -121,7 +121,7 @@
             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,
-            max(case v.field_code when 'peopleType' then IFNULL(v.field_value_label,v.field_value) end) peopleType
+            max(case v.field_code when 'peopleType' then v.field_value end) peopleType
             FROM
             `cb_dynamic_form_instance` v
             WHERE
@@ -552,26 +552,152 @@ GROUP BY
          select
     a.biz_org_name bizOrgName,
     (select c.biz_org_name from cb_org_usr c  where c.sequence_nbr=a.parent_id) parentId,
-    b.*
+        (
+    SELECT
+    NAME
+    FROM
+    cb_data_dictionary
+    WHERE
+    CODE = fe.first_degree
+    AND type = 'XLLX'
+    ) AS first_degree,
+    (
+    SELECT
+    NAME
+    FROM
+    cb_data_dictionary
+    WHERE
+    CODE = fe.highest_education
+    AND type = 'XLLX'
+    ) AS highest_education,
+    (
+    SELECT
+    NAME
+    FROM
+    cb_data_dictionary
+    WHERE
+    CODE = fe.academic_degree
+    AND type = 'XWLX'
+    ) AS academic_degree,
+    fe.school,
+    fe.professional_name,
+    (
+    SELECT
+    NAME
+    FROM
+    cb_data_dictionary
+    WHERE
+    CODE = fp.employee_hierarchy
+    AND type = 'YGCJ'
+    ) AS employee_hierarchy,
+    (
+    SELECT
+    NAME
+    FROM
+    cb_data_dictionary
+    WHERE
+    CODE = fp.internal_position_code
+    AND type = 'JGNBZW'
+    ) AS internal_position_code,
+    (
+    SELECT
+    NAME
+    FROM
+    cb_data_dictionary
+    WHERE
+    CODE = fp.audit_cycle
+    AND type = 'SHZQ'
+    ) AS audit_cycle,
+    fp.administrative_position as administrativePositionCode,
+    fp.job_title as positionType,
+    fp.post_qualification as postQualification,
+    fp.fire_management_post as fireManagementPostCode,
+    fp.certificate_type as certificateType,
+    (
+    SELECT
+    NAME
+    FROM
+    cb_data_dictionary
+    WHERE
+    CODE = fc.relationship
+    AND type = 'RJGX'
+    ) AS relationship,
+    (
+    SELECT
+    NAME
+    FROM
+    cb_data_dictionary
+    WHERE
+    CODE = b.gender
+    AND type = 'XB'
+    ) AS gender,
+    (
+    SELECT
+    NAME
+    FROM
+    cb_data_dictionary
+    WHERE
+    CODE = b.safetyTraining
+    AND type = 'AQPX'
+    ) AS safetyTraining,
+    (
+    SELECT
+    NAME
+    FROM
+    cb_data_dictionary
+    WHERE
+    CODE = b.peopleType
+    AND type = 'DWRYLX'
+    ) AS peopleType,
+    (
+    SELECT
+    NAME
+    FROM
+    cb_data_dictionary
+    WHERE
+    CODE = b.certificatesTypeCode
+    AND type = 'RYZJLX'
+    ) AS certificatesTypeCode,
+    fc.emergency_contact,
+    fc.emergency_contact_phone,
+    fp.employee_hierarchy employeeHierarchy,
+    cast(b.birthdayTime as datetime) as birthdayTime,
+    b.*,
+    fw.*
     from cb_org_usr a LEFT JOIN
     (SELECT
     instance_id,
-    max(case field_code when 'administrativePositionCode' then field_value_label end)     administrativePositionCode,
     max(case field_code when 'auditCycle' then field_value_label end)                     auditCycle,
     max(case field_code when 'certificatesNumber' then field_value end)                   certificatesNumber,
-    max(case field_code when 'certificatesTypeCode' then field_value_label end)           certificatesTypeCode,
+    max(case field_code when 'certificatesTypeCode' then field_value end)           certificatesTypeCode,
     max(case field_code when 'certificateType' then field_value_label end)                certificateType,
     max(case field_code when 'fireManagementPostCode' then field_value_label end)         fireManagementPostCode,
-    max(case field_code when 'gender' then field_value_label end)                         gender,
+    max(case field_code when 'gender' then field_value end)                         gender,
     max(case field_code when 'internalPositionCode' then field_value_label end)           internalPositionCode,
     max(case field_code when 'personNumber' then field_value end)                         personNumber,
     max(case field_code when 'positionType' then field_value_label end)                   positionType,
-    max(case field_code when 'safetyTraining' then field_value_label end)                 safetyTraining,
+    max(case field_code when 'safetyTraining' then field_value end)                 safetyTraining,
     max(case field_code when 'stateCode' then field_value_label end)                      stateCode,
-    max(case field_code when 'telephone' then field_value end)                            telephone
+    max(case field_code when 'telephone' then field_value end)                            telephone,
+    max(case field_code when 'peopleType' then field_value end)                     peopleType,
+    max(case field_code when 'nation' then field_value end)                     nation,
+    max(case field_code when 'birthdayTime' then field_value end)                     birthdayTime,
+    max(case field_code when 'maritalStatus' then field_value end)                     maritalStatus,
+    max(case field_code when 'nativePlace' then field_value end)                     nativePlace,
+    max(case field_code when 'nativePlaceVal' then field_value end)                     nativePlaceVal,
+    max(case field_code when 'politicalOutlook' then field_value end)                     politicalOutlook,
+    max(case field_code when 'residenceDetails' then field_value end)                     residenceDetails,
+    max(case field_code when 'residenceDetailVal' then field_value end)                     residenceDetailVal,
+    max(case field_code when 'airportAccommodation' then field_value end)                     airportAccommodation
     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 and a.biz_org_type = 'PERSON'
+    on b.instance_id=a.sequence_nbr
+        LEFT JOIN cb_firefighters_contacts fc ON a.sequence_nbr = fc.org_usr_id
+        LEFT JOIN cb_firefighters_workexperience fw ON a.sequence_nbr = fw.org_usr_id
+        LEFT JOIN cb_firefighters_education fe ON a.sequence_nbr = fe.org_usr_id
+        LEFT JOIN cb_firefighters_post fp ON a.sequence_nbr = fp.org_usr_id
+
+    where a.biz_org_name is not null and a.is_delete = 0 and a.biz_org_type = 'PERSON'
      		<if test="parentId  != null and parentId  != '' and parentId  != '-1'">
                 and a.parent_id = #{parentId}
             </if>

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

@@ -135,6 +135,25 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 				jobTitle,bizOrgCode);
 	}
 
+	/**
+	 * 导出列表
+	 */
+	public List<OrgUsrFireExcelDto> exportToExcelNew(@Condition(Operator.eq) Boolean isDelete, Map par) {
+		if (par == null || par.size() < 1) {
+			return firefightersMapper.exportToExcelNew(isDelete, null, null, null, null, null, null,null);
+		}
+		String name = par.containsKey("name") ? par.get("name").toString() : null;
+		String postQualification = par.containsKey("postQualification") ? par.get("postQualification").toString()
+				: null;
+		String fireTeamId = par.containsKey("fireTeamId") ? par.get("fireTeamId").toString() : null;
+		String state = par.containsKey("state") ? par.get("state").toString() : null;
+		String areasExpertise = par.containsKey("areasExpertise") ? par.get("areasExpertise").toString() : null;
+		String jobTitle = par.containsKey("jobTitle") ? par.get("jobTitle").toString() : null;
+		String bizOrgCode = par.containsKey("bizOrgCode") ?  par.get("bizOrgCode").toString() : null;
+		return firefightersMapper.exportToExcelNew(isDelete, name, postQualification, fireTeamId, state, areasExpertise,
+				jobTitle,bizOrgCode);
+	}
+
 	@Override
 	public List<Menu> getFirefightersJobTitleCount(String bizOrgCode) throws Exception {
 

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

@@ -2840,7 +2840,26 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			String key = dynamicFormInstanceDto.getFieldCode();
 			Object value = map.get(key);
 			if (value != null) {
-				dynamicFormInstanceDto.setFieldValue(value.toString());
+				Object o = null;
+				if (key.contains("Code")) {
+					String code = key.substring(0, key.indexOf("Code"));
+					o = map.get(code);
+				}
+				if (!ObjectUtils.isEmpty(o)) {
+					dynamicFormInstanceDto.setFieldValue(value.toString());
+					dynamicFormInstanceDto.setFieldValueLabel(o.toString());
+				} else {
+					dynamicFormInstanceDto.setFieldValue(value.toString());
+				}
+				if ("birthdayTime".equals(key)) {
+					SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+					try {
+						String date = ft.format(value);
+						dynamicFormInstanceDto.setFieldValue(date);
+					} catch (Exception e) {
+						logger.error("日期转换失败");
+					}
+				}
 			}
 			DynamicFormInstance dynamicFormInstance = new DynamicFormInstance();
 			BeanUtils.copyProperties(dynamicFormInstanceDto, dynamicFormInstance);
@@ -2947,7 +2966,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				if ("Date".equals(genericType)) {
 					if (!ObjectUtils.isEmpty(value)) {
 						Date date;
-						SimpleDateFormat ft = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
+						SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 						try {
 							date = ft.parse(value.toString());
 							field.set(peopleBasicInfoDto, date);

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -10,6 +10,7 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.poi.ss.usermodel.Cell;
@@ -46,33 +47,6 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
-import com.yeejoin.amos.boot.module.common.api.dto.DutyCarDto;
-import com.yeejoin.amos.boot.module.common.api.dto.DutyFireFightingDto;
-import com.yeejoin.amos.boot.module.common.api.dto.DutyFirstAidDto;
-import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonDto;
-import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonShiftDto;
-import com.yeejoin.amos.boot.module.common.api.dto.DutyShiftDto;
-import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInitDto;
-import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
-import com.yeejoin.amos.boot.module.common.api.dto.ExcelDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FireChemicalDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FireTeamDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FirefightersInfoDto;
-import com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto;
-import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
-import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitVo;
-import com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonExcleDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.RescueEquipmentDto;
-import com.yeejoin.amos.boot.module.common.api.dto.SpecialPositionStaffDto;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.FireChemical;
@@ -324,7 +298,10 @@ public class ExcelServiceImpl {
 						null, FirefightersExcelDto.class, null, false);
 				break;
 			}
-			List<FirefightersExcelDto> firefightersExcelDtoList = firefightersService.exportToExcel(false, par);
+//			List<FirefightersExcelDto> firefightersExcelDtoList = firefightersService.exportToExcel(false, par);
+			List<OrgUsrFireExcelDto> firefightersExcelDtoList = firefightersService.exportToExcelNew(false, par);
+			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
+					firefightersExcelDtoList, OrgUsrFireExcelDto.class, null, false);
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
 					firefightersExcelDtoList, FirefightersExcelDto.class, null, false);
 			break;
@@ -768,6 +745,15 @@ public class ExcelServiceImpl {
 							}
 						}
 					}
+					if ("birthdayTime".equals(key)) {
+						SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+						try {
+							String date = ft.format(value);
+							dynamicFormInstanceDto.setFieldValue(date);
+						} catch (Exception e) {
+							logger.error("日期转换失败");
+						}
+					}
 					DynamicFormInstance dynamicFormInstance = new DynamicFormInstance();
 					BeanUtils.copyProperties(dynamicFormInstanceDto, dynamicFormInstance);
 					dynamicFormInstancelist.add(dynamicFormInstance);