修该统计导出

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

@@ -141,4 +141,7 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
     List<OrgUsr> companyTreeByUserToPatrolRoute(Map<String, Object> param);
 
     String getBizOrgCodeByOrgCode(String orgCode);
+
+    OrgUsr queryByBizCode(@Param("code") String code);
+
 }

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

@@ -1094,6 +1094,20 @@ LEFT JOIN (
             AND code = #{companyCode}
         </if>
     </select>
+
+
+
+
+    <select id="queryByBizCode" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        SELECT *
+        FROM cb_org_usr
+        WHERE is_delete = 0
+        <if test="code != null and code != ''">
+            AND biz_org_code = #{code}
+        </if>
+    </select>
+
+
     <select id="getOrgUsrSyncDataList" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrSyncDto">
         SELECT
         u.*,

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

@@ -334,7 +334,9 @@ public class ExcelServiceImpl {
 			break;
 		case "QDSJ":
 			SignDto dto = new SignDto();
+			String fileName=null;
 			if(par!=null && par.size()>0) {
+
 				String date =par.containsKey("date")?par.get("date").toString():null;
 //				String bizOrgCode =par.containsKey("bizOrgCode")?par.get("bizOrgCode").toString():null;
 				String bizOrgName =par.containsKey("bizOrgName")?par.get("bizOrgName").toString():null;
@@ -352,6 +354,10 @@ public class ExcelServiceImpl {
 				dto.setSignTimeBIGGER(signTimeBIGGER);
 				dto.setSignTimeLESS(signTimeLESS);
 				dto.setType(type);
+
+
+				OrgUsr orgUsr1 = orgUsrMapper.queryByBizCode(reginParams.getPersonIdentity().getCompanyBizOrgCode());
+				fileName="【"+orgUsr1.getBizOrgName()+"】-【"+date+"】消防人员出勤明细";
 			}
 
 			Page<SignDto> page = new Page<>();
@@ -362,7 +368,8 @@ public class ExcelServiceImpl {
 			signDtos.getRecords().stream().forEach(e->{
 				e.setType(e.getType().equals("0") ? "上班打卡" :"下班打卡" );
 			});
-			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
+
+			ExcelUtil.createTemplate(response, fileName!=null?fileName:excelDto.getFileName(), excelDto.getSheetName(),
 					signDtos.getRecords(), SignDto.class, null, false);
 			break;
 		case "KEYSITE":