修改bug

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/DataDictionaryController.java

@@ -8,6 +8,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -344,8 +345,11 @@ public class DataDictionaryController extends BaseController {
 		queryWrapper.orderByAsc("sort_num");
 		Collection<DataDictionary> list = null;
 		List<Menu> menus = null;
+
+		ReginParams reginParams = getSelectedOrgInfo();
+		String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
 		if ("YJLDDW".equals(type)) {
-			list = dataDictionaryMapper.getNoInLinkUnit();
+			list = dataDictionaryMapper.getNoInLinkUnit(bizOrgCode);
 			// 数据字典生成树方法 原先通过getCode做主键 现修改为 getSequenceNbr 后期数据字典parent字段保存id 而不要保存code by
 			// kongfm 2021-09-08
 			// 数据字典还原 by kongfm 2021-09-09

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dao/mapper/DataDictionaryMapper.java

@@ -21,7 +21,7 @@ public interface DataDictionaryMapper extends BaseMapper<DataDictionary> {
     * 获取包含联动单位的联动单位树信息
     * @return
     */
-   public List<DataDictionary>  getNoInLinkUnit();
+   public List<DataDictionary>  getNoInLinkUnit(String bizOrgCode);
 
 	/**
 	 * 根据code值查询

amos-boot-biz-common/src/main/resources/mapper/DataDictionaryMapper.xml

@@ -44,6 +44,9 @@ GROUP BY
 		FROM
 		cb_linkage_unit
 		WHERE is_delete = 0
+		<if test="bizOrgCode != null and bizOrgCode != ''">
+		 and	biz_org_code like concat (#{bizOrgCode},'%')
+		</if>
 		GROUP BY
 		emergency_linkage_unit_code
 		) elink ON elink.emergency_linkage_unit_code = cbb.`code`

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

@@ -147,8 +147,7 @@ public class OrgUsrExcelDto extends BaseDto {
 
     @ExcelProperty(value = "出生日期", index = 17)
     @ApiModelProperty(value = "出生日期")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @com.alibaba.excel.annotation.format.DateTimeFormat("yyyy-MM-dd")
     private Date birthdayTime;
 
     @ExplicitConstraint(indexNum = 18, sourceClass = CommonExplicitConstraint.class, method = "getMaritalStatus") //固定下拉内容

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

@@ -48,4 +48,6 @@ public class OrgUsrzhDto  {
     private String managementType;
     @ApiModelProperty(value = "重点单位数量")
     private Integer keySiteCount;
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
 }

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

@@ -33,6 +33,8 @@ public interface DutyPersonShiftMapper extends BaseMapper<DutyPersonShift> {
             @Param("groupCode") String groupCode
     );
 
+    List<Map<String,String>> nowDutyCarPersonNum();
+
     /**
      * 银行日历视图
      *

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

@@ -44,6 +44,60 @@
 		and s.app_Key = #{appKey}
 		GROUP BY s.duty_date) b) as maxShiftNumDay
 	</select>
+
+	<select id="nowDutyCarPersonNum" resultType="java.util.Map">
+		SELECT
+			`a`.`name` AS `name`,
+			a.id,
+			(
+				SELECT
+					count( DISTINCT `cb_duty_person_shift`.`instance_id` ) AS `num`
+				FROM
+					( `cb_duty_shift` LEFT JOIN `cb_duty_person_shift` ON ( ( `cb_duty_person_shift`.`shift_id` = `cb_duty_shift`.`sequence_nbr` ) ) )
+				WHERE
+					(
+							( `cb_duty_person_shift`.`is_delete` = 0 )
+							AND `cb_duty_person_shift`.`instance_id` IN (
+							SELECT
+								`cb_dynamic_form_instance`.`instance_id`
+							FROM
+								`cb_dynamic_form_instance`
+							WHERE
+								(
+										( `cb_dynamic_form_instance`.`group_id` = ( SELECT `cb_dynamic_form_group`.`sequence_nbr` FROM `cb_dynamic_form_group` WHERE ( `cb_dynamic_form_group`.`group_code` = 'dutyCar' ) ) )
+										AND ( `cb_dynamic_form_instance`.`group_code` = 'dutyCar' )
+										AND ( `cb_dynamic_form_instance`.`field_value` = `a`.`id` )
+									)
+						)
+							AND (
+								CONVERT ( date_format( now( ), '%Y-%m-%d %H:%i' ) USING utf8mb3 ) BETWEEN (
+									CASE
+										LEFT ( `cb_duty_shift`.`start_time`, 3 )
+										WHEN '当日:' THEN
+										REPLACE ( `cb_duty_shift`.`start_time`, '当日:', `cb_duty_person_shift`.`duty_date` ) ELSE REPLACE ( `cb_duty_shift`.`start_time`, '次日:', ( `cb_duty_person_shift`.`duty_date` + INTERVAL 1 DAY ) )
+										END
+									)
+									AND (
+									CASE
+										LEFT ( `cb_duty_shift`.`end_time`, 3 )
+										WHEN '当日:' THEN
+										REPLACE ( `cb_duty_shift`.`end_time`, '当日:', `cb_duty_person_shift`.`duty_date` ) ELSE REPLACE ( `cb_duty_shift`.`end_time`, '次日:', ( `cb_duty_person_shift`.`duty_date` + INTERVAL 1 DAY ) )
+										END
+									)
+								)
+						)
+			) AS `num`
+		FROM
+			(
+			 (
+				 `xiy_safety_business_v3.0.1_20100712`.`wl_car` `a`
+					 LEFT JOIN `jc_power_transfer_company_resources` `b` ON ( ( ( `a`.`id` = `b`.`resources_id` ) AND ( `b`.`status` = 'executing' ) ) )
+				 )
+				LEFT JOIN `cb_data_dictionary` `c` ON ( ( ( `c`.`code` = `b`.`car_status` ) AND ( `c`.`type` = 'CARSTATE' ) ) )
+				)
+
+
+	</select>
 	<select id="bankViewData" resultType="java.util.Map">
 		SELECT
 		S1.*,

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

@@ -137,6 +137,12 @@
         <if test="params != null and params.size() > 0">
             where
             jsc.is_delete = 0
+            <if test="params.systemType != null and params.systemType != '' ">
+                and   jsc.system_type is not null
+            </if>
+            <if test="params.systemType == null or params.systemType == '' ">
+                and   jsc.system_type is null
+            </if>
             <foreach collection="params" index="key" item="value" separator="">
                 <choose>
                     <when test="fieldCodes[key] == 'like' and value !=null and value !=''">
@@ -154,9 +160,6 @@
         <if test="params.date != null and params.lift == 'descend'">
         order by endDate desc
         </if>
-        <if test="params.systemType != null and params.systemType != '' ">
-            jsc.system_type is not null
-        </if>
         <if test="params.date != null and params.lift == 'ascend'">
             order by endDate ASC
         </if>

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

@@ -97,33 +97,27 @@
 
 
     <select id="listToSelectById" resultType="Map">
-        SELECT IFNULL(a.personnel_photos, '') personnelPhotos,
-               a.sequence_nbr
-                                              sequenceNbr,
-               IFNULL(a.`name`, '无')          `name`,
-               IFNULL(a.`biz_org_name`, '无')          `bizOrgName`,
-               IFNULL(a.job_title, '无')
-                                              jobTitle,
-               IFNULL(b.administrative_position, '无')
-                                              administrativePosition,
-               IFNULL(c.`name`, '无')          fireTeamName,
-               IFNULL(a.state, '无')           state,
-               IFNULL(b.employee_hierarchy, '无')
-                                              employeeHierarchy,
-               IFNULL(b.areas_expertise, '无') areasExpertise,
-               IFNULL((SELECT NAME FROM  cb_data_dictionary  WHERE CODE = a.gender AND type = 'XB'), a.gender) gender,
-               IFNULL(b.post_qualification, '无')
-                                              postQualification, year ( from_days( datediff( now( ),
-            a.birthday_time))) age
-        FROM cb_firefighters a LEFT JOIN
-            cb_firefighters_post b
-        ON a.sequence_nbr
-            = b.firefighters_id LEFT JOIN
-            cb_fire_team c on
-            c.sequence_nbr=a.fire_team_id
-        WHERE a.is_delete =0
-          and
-            a.sequence_nbr=#{id}
+        SELECT
+            IFNULL( a.personnel_photos, '' ) personnelPhotos,
+            a.sequence_nbr sequenceNbr,
+            IFNULL( a.`name`, '无' ) `name`,
+            IFNULL( a.`biz_org_name`, '无' ) `bizOrgName`,
+            IFNULL( a.job_title, '无' ) jobTitle,
+            IFNULL( b.administrative_position, '无' ) administrativePosition,
+            IFNULL( c.`name`, '无' ) fireTeamName,
+            IFNULL( a.state, (SELECT NAME FROM cb_data_dictionary WHERE CODE = a.state_code AND type = 'RYZT' )) state,
+            IFNULL( b.employee_hierarchy, '无' ) employeeHierarchy,
+            IFNULL( b.areas_expertise, '无' ) areasExpertise,
+            IFNULL( ( SELECT NAME FROM cb_data_dictionary WHERE CODE = a.gender AND type = 'XB' ), a.gender ) gender,
+            IFNULL( b.post_qualification, '无' ) postQualification,
+            YEAR ( from_days( datediff( now( ), a.birthday_time ) ) ) age
+        FROM
+            cb_firefighters a
+            LEFT JOIN cb_firefighters_post b ON a.sequence_nbr = b.firefighters_id
+            LEFT JOIN cb_fire_team c ON c.sequence_nbr = a.fire_team_id
+        WHERE
+            a.is_delete = 0
+          AND a.sequence_nbr =#{id}
     </select>
 
 

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

@@ -381,6 +381,7 @@
        SELECT
 	a.biz_org_name bizOrgName,
 	a.build_name buildName,
+    a.biz_org_code bizOrgCode,
 	a.build_id buildId,
     c.keySiteCount keySiteCount,
 	( SELECT v.biz_org_name  FROM cb_org_usr v WHERE v.sequence_nbr = a.parent_id ) parentName,

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/LinkageUnitController.java

@@ -154,7 +154,7 @@ public class LinkageUnitController extends BaseController {
                 bizOrgCode = orgUsr.getBizOrgCode();
             }
         }
-        if(StringUtils.isNotEmpty(bizOrgCode)){
+        if(StringUtils.isEmpty(bizOrgCode)){
             ReginParams reginParams = getSelectedOrgInfo();
             bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.biz.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
@@ -23,6 +24,7 @@ import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -201,10 +203,23 @@ public class OrgPersonController extends BaseController {
 //        if(redisUtils.get("userList") != null){
 //            return ResponseHelper.buildResponse(redisUtils.get("userList"));
 //        }
-        return ResponseHelper.buildResponse(iOrgUsrService.pagePerson(
+        String type = null;
+        if (requestBody.containsKey("type") && "station".equals(requestBody.get("type"))) {
+            type = "station";
+            requestBody.remove("type");
+        }
+        IPage<Map<String, Object>> mapIPage = iOrgUsrService.pagePerson(
                 requestBody.containsKey("pageNum") ? requestBody.get("pageNum").toString()  :  null ,
                 requestBody.containsKey("pageSize") ? requestBody.get("pageSize").toString()  :  null ,
-                requestBody));
+                requestBody);
+        if (!ObjectUtils.isEmpty(type)) {
+            for (Map<String, Object> record : mapIPage.getRecords()) {
+                if (!record.containsKey("amosOrgId")) {
+                    record.put("amosOrgId", record.get("sequenceNbr"));
+                }
+            }
+        }
+        return ResponseHelper.buildResponse(mapIPage);
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -495,6 +495,7 @@ public class OrgUsrController extends BaseController {
 
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PersonIdentify
 	@RequestMapping(value = "/companyTreeByUserAndTypeToPartol", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据登录人及类型获取公司部门树", notes = "根据登录人及类型获取公司部门树")
 	public ResponseModel<List<OrgMenuDto>> companyTreeByUserAndTypeToPartol() {

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

@@ -136,6 +136,7 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
         Page page = new Page();
         page.setCurrent(current);
         page.setSize(size);
+        params.put("systemType",systemType);
         if (!params.isEmpty()&&params !=null){
            if (!params.get("sort").isEmpty() && params.get("sort") != null){
                String[] sorts = params.get("sort").split(",");

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

@@ -3426,15 +3426,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	@Override
 	public boolean checkCertificatesNumber(String certificatesNumber, Long orgUserId) {
 		List<DynamicFormInstance> list = orgUsrMapper.checkCertificatesNumber(certificatesNumber, orgUserId);
-		 if(!list.isEmpty()){
-           return true;
-		 }else{
-			 if(orgUserId!=null&&list.get(0).getSequenceNbr().longValue()==orgUserId.longValue()){
-				 return true;
-			 }else{
-			 	return false;
-			 }
-		 }
+		return !list.isEmpty();
 	}
 
 	@Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -410,7 +410,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         });
     }
 
-    public static List<EquipmentSpecificAlarmLog> upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey,
+   /* public static List<EquipmentSpecificAlarmLog> upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey,
                                                                    String traceId, IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService, boolean flag) {
         LambdaQueryWrapper<EquipmentSpecificAlarmLog> queryWrapper = new LambdaQueryWrapper();
         queryWrapper.eq(EquipmentSpecificAlarmLog::getIotCode, iotCode);
@@ -475,7 +475,49 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             publishDataToCanvas(indexList);
         }
         return logs;
-    }
+    }*/
+   public static List<EquipmentSpecificAlarmLog> upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey,
+                                                                  String traceId, IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService,
+                                                                  boolean flag) {
+       LambdaQueryWrapper<EquipmentSpecificAlarmLog> queryWrapper = new LambdaQueryWrapper<>();
+       queryWrapper.eq(EquipmentSpecificAlarmLog::getIotCode, iotCode);
+       queryWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey, equipmentSpecificIndexKey);
+       queryWrapper.ne(EquipmentSpecificAlarmLog::getStatus, AlarmStatusEnum.HF.getCode());
+       List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getBaseMapper().selectList(queryWrapper);
+       if(!logs.isEmpty()){
+           EquipmentSpecificAlarmLog log = logs.get(0);
+           EquipmentSpecific specific = equipmentSpecificMapper.selectById(log.getEquipmentSpecificId());
+           Date date = new Date();
+           logs.forEach(x -> {
+               x.setCleanTime(new Date());
+               x.setStatus(AlarmStatusEnum.HF.getCode());
+               if (!flag) {
+                   x.setConfirmType(x.getType());
+                   x.setConfirmTypeName(ConfirmAlamEnum.getTypeByCode(x.getType()));
+                   String equipmentName = StringUtil.isNotEmpty(specific.getCode()) ? specific.getName() + "(" + specific.getCode() + ")" : specific.getName();
+                   if (x.getType().equals(AlarmTypeEnum.PB.getCode())) {
+                       x.setAlarmReason(equipmentName + "频繁故障/误报，将设备报警信息屏蔽。");
+                   } else {
+                       x.setAlarmReason(equipmentName + "引起设备报警");
+                   }
+                   x.setResolveResult(date + "系统收到设备复归（已消除）信号，系统自动处理。");
+                   x.setConfirmUser("");
+                   x.setConfirmUserName("系统自动处理");
+                   x.setConfirmDate(date);
+               }
+               x.setEquipmentSpecificIndexValue(TrueOrFalseEnum.fake.value);
+               if (!StringUtils.isEmpty(traceId)) {
+                   x.setTraceId(traceId);
+               }
+           });
+           equipmentSpecificAlarmLogService.updateBatchById(logs);
+       }
+       if (flag) {
+           List<EquipmentSpecificIndex> indexList = equipmentSpecificIndexService.getEquipmentSpeIndexBySpeIotCode(iotCode);
+           publishDataToCanvas(indexList);
+       }
+       return logs;
+   }
 
     /**
      * 画布数据消息推送

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

@@ -756,7 +756,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 			});
 		}
 		// 按接警时间正序排序
-		allList.sort((e, o) -> comparingByGroupVal(e, o, "recDate"));
+		allList.sort((e, o) -> comparingByGroupVal(o, e, "recDate"));
 		return allList;
 	}
 

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

@@ -407,6 +407,18 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                         }
                     });
                 }
+                if (calledRo.getAlertTypeCode().equals("235") || calledRo.getAlertTypeCode().equals("237") || calledRo.getAlertTypeCode().equals("238") ) {
+                    calledRo.setFireSituation(calledRo.getAlertType());
+                }
+                if (calledRo.getAlertTypeCode().equals("242") ) {
+                    List<AlertFormValueDto> alertFormValueDtos = formValueService.listByCalledId(Long.valueOf(calledRo.getSequenceNbr()));
+                    alertFormValueDtos.forEach(e->{
+                        if (e.getFieldCode().equals("sub")){
+                            calledRo.setFireSituation(e.getFieldValue());
+                        }
+                    });
+                }
+
 
                 alertCalledId = calledRo.getSequenceNbr();
 

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

@@ -832,32 +832,37 @@ public class ExcelServiceImpl {
 				List<DynamicFormInstance> dynamicFormInstancelist = new ArrayList<>();
 
 				dynamicFormColumn.forEach(DynamicFormInitDto -> {
+					if ("birthdayTime".equals(DynamicFormInitDto.getKey())) {
+						DynamicFormInstanceDto formItemDescr = DynamicFormInitDto.getFormItemDescr();
+						formItemDescr.setFieldValue(null);
+						DynamicFormInitDto.setFormItemDescr(formItemDescr);
+					}
 					dynamicFormValue.add(DynamicFormInitDto.getFormItemDescr());
 				});
 				dynamicFormValue.forEach(dynamicFormInstanceDto -> {
 					String key = dynamicFormInstanceDto.getFieldCode();
-					Object value = map.get(key);
-					if (value != null) {
-						dynamicFormInstanceDto.setFieldValue(value.toString());
-					} else {
-						Object o = map.get(key + "@");
-						if (!ObjectUtils.isEmpty(o)) {
-						    if (o.toString().contains("@")) {
-                                String[] certificates = o.toString().split("@");
-                                dynamicFormInstanceDto.setFieldValue(certificates[1]);
-                                dynamicFormInstanceDto.setFieldValueLabel(certificates[0]);
-                            } else {
-								dynamicFormInstanceDto.setFieldValue(o.toString());
-							}
+
+					if (map1.containsKey(key)){
+						String value = map1.get(key).toString();
+						if (value.contains("@")) {
+							String[] certificates = value.split("@");
+							dynamicFormInstanceDto.setFieldValue(certificates[1]);
+							dynamicFormInstanceDto.setFieldValueLabel(certificates[0]);
+						} else {
+							dynamicFormInstanceDto.setFieldValue(value);
 						}
 					}
-					if ("birthdayTime".equals(key) && !ObjectUtils.isEmpty(value)) {
-						SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-						try {
-							String date = ft.format(value);
-							dynamicFormInstanceDto.setFieldValue(date);
-						} catch (Exception e) {
-							logger.error("日期转换失败");
+					if (map.containsKey(key) &&  map.get(key) != null){
+						if ("birthdayTime".equals(key) ) {
+							Date o = (Date) map.get(key);
+							SimpleDateFormat dtf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+							String format = dtf.format(o);
+							try {
+							//	String date = ft.format(o);
+								dynamicFormInstanceDto.setFieldValue(format);
+							} catch (Exception e) {
+								logger.error("日期转换失败");
+							}
 						}
 					}
 
@@ -870,18 +875,19 @@ public class ExcelServiceImpl {
 						dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(dynamicFormInstance.getFieldValue()).getName());
 					}
 					String fieldCode = dynamicFormInstance.getFieldCode();
-
-
-
-					if (map1.containsKey(fieldCode) && fieldCode.contains("Code") ){
-						String[] split = map1.get(fieldCode).toString().split("@");
-						dynamicFormInstance.setFieldValue(split[0]);
-					}
 					if ("certificatesTypeCode".equals(fieldCode)){
 						String[] split = map1.get(fieldCode).toString().split("@");
 						dynamicFormInstance.setFieldValue(split[1]);
 						dynamicFormInstance.setFieldValueLabel(split[0]);}
-
+					if ("residenceDetailsCode".equals(fieldCode) && map1.get("residenceDetails") != null) {
+						String[] residenceDetails = map1.get("residenceDetails").toString().split("@");
+						dynamicFormInstance.setFieldValue(residenceDetails[1]);
+						dynamicFormInstance.setFieldValueLabel(residenceDetails[0]);
+					}
+					if ("nativePlaceCode".equals(fieldCode)&& map1.get("nativePlace") != null){
+						String[] split = map1.get("nativePlace").toString().split("@");
+						dynamicFormInstance.setFieldValue(split[1]);
+						dynamicFormInstance.setFieldValueLabel(split[0]);}
 					if (map1.containsKey(fieldCode.substring(0,fieldCode.length()-4))){
 						dynamicFormInstance.setFieldValueLabel(map1.get(fieldCode.substring(0,fieldCode.length()-4)).toString());
 					}

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

@@ -288,109 +288,16 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                             fireCarDto.setCarStateDesc(FireCarStatusEnum.执勤.getName());
                         }
                     }
+                    List<Map<String, String>> maps = dutyPersonShiftMapper.nowDutyCarPersonNum();
+                    Map<String, String> map = new HashMap<>();
+                    maps.stream().forEach(e->map.put(String.valueOf(e.get("id")),String.valueOf(e.get("num"))) );
 
-                    if (fireCarDto.getId() != null) {
-                        List<Map<String, String>> resultList = new ArrayList<>();
-
-                        String dutyDay = DateUtils.getDateNowShortStr();
-                        Map<String, Object> instanceMap = dutyPersonShiftMapper.getInstanceIdForSpecifyDateAndEquipment(dutyDay,
-                                "dutyCar", fireCarDto.getId());
-
-                        if (instanceMap != null) {
-                            String instanceId = instanceMap.get("instanceIds").toString();
-                            if (StringUtils.isNotBlank(instanceId)) {
-                                String[] instanceIds = instanceId.split(",");
-                                List<Map<String, Object>> dutyList = dutyPersonShiftMapper.getDutyForSpecifyDate(dutyDay);
-                                if (dutyList != null && dutyList.size() > 0) {
-                                    for (Map<String, Object> dutyDetail : dutyList) {
-                                        if (!dutyDetail.containsKey("name")) {
-                                            continue;
-                                        }
-                                        // 获取当前装备ID下的排版数据
-                                        List<Map<String, Object>> specifyDateList = dutyPersonShiftMapper.getPositionStaffDutyForSpecifyDate(dutyDay,
-                                                "dutyCar", instanceIds, dutyDetail.get("name").toString(), null);
-                                        if (specifyDateList == null || specifyDateList.size() < 1 || specifyDateList.get(0) == null) {
-                                            continue;
-                                        }
-                                       
-                                        int num=0;
-                                        LinkedHashMap<String, String> infoMap_1 = new LinkedHashMap<String, String>();
-                                        for (Map<String, Object> specify : specifyDateList) {
-//
-                                            if (specify.containsKey("userName") && specify.get("userName") != null) {
-                                            	
-                                                if (specify.get("userName").toString().contains(",")) {
-                                                    String[] userNames = specify.get("userName").toString().split(",");
-                                                    num = num+ userNames.length;
-                                                    infoMap_1.put(dutyDetail.get("name").toString(), userNames.length + "");
-                                                } else {
-                                                  num = num +1 ;
-                                                    infoMap_1.put(dutyDetail.get("name").toString(), "1");
-                                                }
-                                                resultList.add(infoMap_1);
-                                            }
-                                        }
-                                        fireCarDto.setPersonCount(num);
-                                    }
-                                }
-                            }
-                        }
 
+                    if (fireCarDto.getId() != null) {
+                        if (map.containsKey(fireCarDto.getId())){
 
-                        int num = 0;
-                        String todayTime = DateUtils.getDateNowShortStr();
-                        String beginDate = todayTime;
-                        beginDate = beginDate + " 00:00:00";
-                        String endDate = todayTime;
-                        endDate = endDate + " 23:59:59";
-                        LambdaQueryWrapper<DutyShift> wrapper = new LambdaQueryWrapper<>();
-                        wrapper.eq(BaseEntity::getIsDelete, false);
-                        List<DutyShift> dutyShifts = dutyShiftMapper.selectList(wrapper);
-
-                        String[] dutyShiftName = {" "};
-
-                        dutyShifts.forEach(e -> {
-                            String startTime = e.getStartTime();
-                            Date startDate = null;
-                            Date dateEnd = null;
-                            if (startTime.startsWith("当日:")) {
-                                String resultTime = startTime.replace("当日:", todayTime) + ":00";
-                                startDate = DateUtils.longStr2Date(resultTime);
-                            } else if (startTime.startsWith("次日:")) {
-                                Date dateNow = DateUtils.getDateNow();
-                                Date date = DateUtils.dateAddDays(dateNow, 1);
-                                String s = DateUtils.convertDateToString(date, DateUtils.DATE_PATTERN);
-                                String resultTime = startTime.replace("次日:", s) + ":00";
-                                startDate = DateUtils.longStr2Date(resultTime);
-                            }
-                            String endTime = e.getEndTime();
-                            if (endTime.startsWith("当日:")) {
-                                String resultTime = endTime.replace("当日:", todayTime) + ":00";
-                                dateEnd = DateUtils.longStr2Date(resultTime);
-                            } else if (endTime.startsWith("次日:")) {
-                                Date dateNow = DateUtils.getDateNow();
-                                Date date = DateUtils.dateAddDays(dateNow, 1);
-                                String s = DateUtils.convertDateToString(date, DateUtils.DATE_PATTERN);
-                                String resultTime = endTime.replace("次日:", s) + ":00";
-                                dateEnd = DateUtils.longStr2Date(resultTime);
-                            }
-
-                            if (DateUtils.belongCalendar(DateUtils.getDateNow(), startDate, dateEnd)) {
-                                dutyShiftName[0] = dutyShiftName[0].replace(" ", e.getName());
-                            }
-                        });
-
-                        if (resultList != null) {
-                            resultList.forEach(e -> {
-                                if (e.containsKey(dutyShiftName[0])) {
-                                    String personNum = e.get(dutyShiftName[0]);
-                                    fireCarDto.setPersonCount(Integer.valueOf(personNum));
-                                }
-                            });
-                        } else {
-                            fireCarDto.setPersonCount(num);
+                            fireCarDto.setPersonCount(Integer.valueOf(map.get((fireCarDto.getId()))));
                         }
-
                     }
                     fireCarDtoList.add(fireCarDto);
                 });

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

@@ -78,7 +78,7 @@ public class RuleAlertCalledService {
 
 		// 警情 报送类型
 		alertCalledRo.setAlertWay(alertWay);
-		alertCalledRo.setCallTimeStr(alertCalledVo.getAlertCalled().getCallTime().toString());
+		//alertCalledRo.setCallTimeStr(alertCalledVo.getAlertCalled().getCallTime().toString());
 		alertCalledRo.setReplaceContent(replaceContent);
 		alertCalledRo.setUsIds(usIds);
 
@@ -224,15 +224,15 @@ public class RuleAlertCalledService {
 		}
 
 		if(alertCalled.getAlertTypeCode().equals(AlertStageEnums.HKJY.getCode())) {
-			replaceContent  =  "航班号：".concat(ValidationUtil.isEmpty(alertCalledRo.getFlightNumber()) ? "无": alertCalledRo.getFlightNumber()).concat(
-					"，飞机型号：").concat(ValidationUtil.isEmpty(alertCalledRo.getAircraftModel() )?  "无": alertCalledRo.getAircraftModel()).concat(
-					"，落地时间：").concat(ValidationUtil.isEmpty(alertCalledRo.getLandingTime() ) ? "无" : alertCalledRo.getLandingTime()).concat(
+			replaceContent  =  "航班号:".concat(ValidationUtil.isEmpty(alertCalledRo.getFlightNumber()) ? "无": alertCalledRo.getFlightNumber()).concat(
+					"，飞机型号:").concat(ValidationUtil.isEmpty(alertCalledRo.getAircraftModel() )?  "无": alertCalledRo.getAircraftModel()).concat(
+					"，落地时间:").concat(ValidationUtil.isEmpty(alertCalledRo.getLandingTime() ) ? "无" : alertCalledRo.getLandingTime()).concat(
 					"发生".concat(ValidationUtil.isEmpty(alertCalledRo.getAccidentSituationHkq()) ? "无": alertCalledRo.getAccidentSituationHkq()).concat(
-							"，飞机受损位置：").concat(ValidationUtil.isEmpty(alertCalledRo.getDamageLocation() )?  "无": alertCalledRo.getDamageLocation()).concat(
-							"，燃油量：").concat(ValidationUtil.isEmpty(alertCalledRo.getFuelQuantity() ) ? "无" : alertCalledRo.getFuelQuantity()).concat(
-							"载客量：".concat(ValidationUtil.isEmpty(alertCalledRo.getPassengerCapacity()) ? "无": alertCalledRo.getPassengerCapacity()).concat(
-									"，迫降跑道：").concat(ValidationUtil.isEmpty(alertCalledRo.getForcedLandingTrack() )?  "无": alertCalledRo.getForcedLandingTrack()).concat(
-									"，发展态势：").concat(ValidationUtil.isEmpty(alertCalledRo.getDevelopmentTrend() ) ? "无" : alertCalledRo.getDevelopmentTrend())
+							"，飞机受损位置:").concat(ValidationUtil.isEmpty(alertCalledRo.getDamageLocation() )?  "无": alertCalledRo.getDamageLocation()).concat(
+							"，燃油量:").concat(ValidationUtil.isEmpty(alertCalledRo.getFuelQuantity() ) ? "无" : alertCalledRo.getFuelQuantity()).concat(
+							"载客量:".concat(ValidationUtil.isEmpty(alertCalledRo.getPassengerCapacity()) ? "无": alertCalledRo.getPassengerCapacity()).concat(
+									"，迫降跑道:").concat(ValidationUtil.isEmpty(alertCalledRo.getForcedLandingTrack() )?  "无": alertCalledRo.getForcedLandingTrack()).concat(
+									"，发展态势:").concat(ValidationUtil.isEmpty(alertCalledRo.getDevelopmentTrend() ) ? "无" : alertCalledRo.getDevelopmentTrend())
 					));
 		}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/LatentDangerController.java

@@ -73,9 +73,6 @@ public class LatentDangerController extends AbstractBaseController {
             String companyId = getCompanyId(reginParams);
             String departmentName = getDepartmentName(reginParams);
             RoleBo role = reginParams.getRole();
-            //由于统计隐患需要获取隐患所在公司，按当前登录人所在单位
-
-            latentDangerParam.setBizOrgcode(reginParams.getPersonIdentity().getBizOrgCode());
 
             return iLatentDangerService.saveNormal(latentDangerParam, user.getUserId(),
                     user.getRealName(), deptId, departmentName, companyId, loginOrgCode, role);