Merge branch 'develop_tzs_register_to_0715' of…

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/mapper/AlertCalledMapper.java

@@ -96,6 +96,12 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
             @Param("sortRule") String sortRule,
             @Param("groupCode") String groupCode,
             @Param("ids") List<String> ids);
+    /**
+     * 根据查询条件返回警情记录(大屏应急处理使用)
+     * @param
+     * @return
+     */
+    Page<List<AlertCalledQueryDto>> getAlertCalledRecords(IPage<AlertCalledQueryDto> page, @Param("dto")AlertCalledQueryDto dto);
 
     Map<String, Integer> getTodayEmergencyCount(String regionCode);
 
@@ -138,4 +144,6 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
  Integer getCountNum(String userName, Date startTime, Date endTime, String groupCode);
 
     Map<String, Long> getMyBacklog(String groupCode);
+
+    String getDictName(@Param("id") String id);
 }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -645,6 +645,93 @@
         WHERE alert_status = false
           AND skill_group = #{groupCode}
 	</select>
+    <select id="getDictName" resultType="java.lang.String">
+		SELECT name from cb_data_dictionary where sequence_nbr = #{id} limit 1
+	</select>
+	<select id="getAlertCalledRecords" resultType="java.util.List">
+		SELECT
+		a.sequence_nbr AS sequenceNbr,
+		a.work_order_number AS workOrderNumber,
+		a.rec_user_name AS creator,
+		a.emergency_person AS emergency,
+		a.call_time AS callTime,
+		a.emergency_call AS emergencyCall,
+		a.device_id AS deviceId,
+		ibjui.ADDRESS AS elevatorAddress,
+		CONCAT(a.city,a.district) AS address,
+		a.alarm_type AS alertType,
+		a.alert_source AS alertSource,
+		a.alert_stage AS alertStage,
+		CASE
+		a.alert_status
+		WHEN 0 THEN
+		'未完成'
+		WHEN 1 THEN
+		'完成'
+		ELSE
+		''
+		END AS alertStatus
+		FROM
+		tz_alert_called a
+		LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjoi.CODE96333 = a.device_id
+		LEFT JOIN idx_biz_jg_use_info ibjui ON ibjoi.RECORD = ibjui.RECORD
+		WHERE a.is_delete = 0 and a.father_alert is null
+		and a.skill_group = #{groupCode}
+		<if test="workOrderNumber != null and workOrderNumber != ''">
+			AND a.work_order_number like
+			CONCAT(CONCAT('%',#{workOrderNumber}),'%')
+		</if>
+		<if test="creator != null and creator != ''">
+			AND a.rec_user_name like
+			CONCAT(CONCAT('%',#{creator}),'%')
+		</if>
+		<if test="emergency != null and emergency != ''">
+			AND a.emergency_person like
+			CONCAT(CONCAT('%',#{emergency}),'%')
+		</if>
+		<if test="emergencyTimeStart != null ">
+			and #{emergencyTimeStart} <![CDATA[ <= ]]>
+			a.call_time
+		</if>
+		<if test="emergencyTimeEnd != null ">
+			and a.call_time <![CDATA[ <= ]]>
+			#{emergencyTimeEnd}
+		</if>
+		<if test="emergencyCall != null and emergencyCall != ''">
+			AND a.emergency_call like
+			CONCAT(CONCAT('%',#{emergencyCall}),'%')
+		</if>
+		<if test="deviceId != null and deviceId != ''">
+			AND a.device_id like CONCAT(CONCAT('%',#{deviceId}),'%')
+		</if>
+		<if test="elevatorAddress != null and elevatorAddress != ''">
+			AND ibjui.ADDRESS like
+			CONCAT(CONCAT('%',#{elevatorAddress}),'%')
+		</if>
+		<if test="district != null and district != ''">
+			AND a.district like
+			CONCAT(CONCAT('%',#{district}),'%')
+		</if>
+		<if test="alertType != null and alertType != ''">
+			AND a.alarm_type_code = #{alertType}
+		</if>
+		<if test="alertSource != null and alertSource != ''">
+			AND a.alert_source_code = #{alertSource}
+		</if>
+		<if test="alertStage != null and alertStage != ''">
+			AND a.alert_stage_code = #{alertStage}
+		</if>
+		<if test="alertStatus != null and alertStatus != ''">
+			AND a.alert_status = #{alertStatus}
+		</if>
+		<if test="ids != null and ids.size>0">
+			AND a.sequence_nbr in
+			<foreach collection="ids" item="item" index="index" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+			ORDER BY
+	</select>
 </mapper>
 
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -764,7 +764,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     useInfoMap.put("USE_ADDRESS", useInfo.getAddress());
                     useInfoMap.put("FULL_ADDRESS", useInfo.getAddress());
                 }
-                useInfoMap.put("EQU_STATE", ObjectUtils.isEmpty(useInfo.getEquState()) ? null : EquimentEnum.getName.get(Integer.valueOf(useInfo.getEquState())));
             }
             if (!useInfoMap.isEmpty()) {
                 Map<String, Object> filterMap = useInfoMap.entrySet()

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationTransferServiceImpl.java

@@ -1032,7 +1032,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 //使用场所
                 String usePlace = newPosition.getString("transferUsePlace");
                 //所属监管单位
-                String supervisionUnit = newPosition.getString("transferSupervisionUnit");
+                String supervisionUnit = newPosition.getString("orgBranchCode");
                 //是否西咸
                 String isXixian = newPosition.getString("transferIsXixian");
                 //安全管理员

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationUnitServiceImpl.java

@@ -949,6 +949,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                             Map<String, Object> map1 = new HashMap<>();
                             map1.put("USE_UNIT_CREDIT_CODE", registration.getNewUseUnitCreditCode());
                             map1.put("USE_UNIT_NAME", registration.getNewUseUnitName());
+                            map1.put("REC_DATE", new Date());// 更新时间，设备筛选时排在前面 bug-21476
                             resultMap.put(equipId, map1);
                             tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
                             //修改各类告知列表，置为废弃

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -524,6 +524,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 JgUseRegistrationEq jgUseRegistrationEq = new JgUseRegistrationEq();
                 jgUseRegistrationEq.setEquId(map.get("equipId").toString());
                 jgRelationEquipMapper.update(jgUseRegistrationEq, lambda);
+                // 历史设备登记生成的 编辑时更新使用登记证管理表
+                updateRegistrationManage(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
             } else {
 
                 // 业务管理设备信息保存
@@ -1006,6 +1008,31 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     /**
+     * 更新登记证管理表数据
+     * @param sequenceNbr 使用登记业务表seq
+     */
+    private void updateRegistrationManage(Long sequenceNbr){
+        JgUseRegistration jgUseRegistration = this.baseMapper.selectById(sequenceNbr);
+
+        LambdaQueryWrapper<JgUseRegistrationManage> queryWrapper = new LambdaQueryWrapper<JgUseRegistrationManage>()
+                .eq(JgUseRegistrationManage::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode());
+        JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.getBaseMapper().selectOne(queryWrapper);
+
+        if (!ValidationUtil.isEmpty(jgUseRegistrationManage)){
+            jgUseRegistrationManage.setUseUnitName(jgUseRegistration.getUseUnitName());
+            jgUseRegistrationManage.setApplyNo(jgUseRegistration.getApplyNo());
+            jgUseRegistrationManage.setReceiveOrgName(jgUseRegistration.getReceiveOrgName());
+            jgUseRegistrationManage.setAuditPassDate(jgUseRegistration.getAuditPassDate());
+            jgUseRegistrationManage.setRegDate(jgUseRegistration.getRegDate());
+            jgUseRegistrationManage.setEquUseAddress(jgUseRegistration.getUseAddress());
+            jgUseRegistrationManage.setUseUnitCreditCode(jgUseRegistration.getUseUnitCreditCode());
+            jgUseRegistrationManage.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyCode());
+            jgUseRegistrationManage.setManageType(jgUseRegistration.getManageType());
+            jgUseRegistrationManageService.updateById(jgUseRegistrationManage);
+        }
+    }
+
+    /**
      * 生成登记证数据
      * @param jgUseRegistration 使用登记单
      * @param registerInfo 一码通设备注册信息表
@@ -2746,6 +2773,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 useInfo.setPhone(String.valueOf(map.get("safetyManager")).split("_")[0]);
                 useInfo.setSafetyManager(String.valueOf(map.get("safetyManager")).split("_")[1]);
                 useInfo.setUseDate(String.valueOf(map.get("useDate")));
+                useInfo.setLongitudeLatitude(JSON.toJSONString(map.get("longitudeLatitude")));
+                useInfo.setUsePlace((String) map.get("usePlace"));
+                // 历史平台登记，将设备状态改为在用
+                useInfo.setEquState(EquimentEnum.ZAIYONG.getCode().toString());
                 String usePlace = useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName()  +"/" + useInfo.getStreetName();
                 useInfoMapper.updateById(useInfo);
 
@@ -2755,8 +2786,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
                 // 检验检测【一对多，暂时只取最新一条数据】
                 IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
-                if (ObjectUtils.isEmpty(inspectionDetectionInfo)) {
-                    inspectionDetectionInfo = new IdxBizJgInspectionDetectionInfo();
+                if (ObjectUtils.isEmpty(inspectionDetectionInfo.getSequenceNbr())) {
+                    inspectionDetectionInfo.setRecord((String) map.get("equipId"));
                 }
                 inspectionDetectionInfo.setInspectOrgCode(String.valueOf(map.get("inspectOrgCode")));
                 inspectionDetectionInfo.setInspectOrgName(String.valueOf(map.get("inspectOrgName")));

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -766,13 +766,13 @@ public class JGDPStatisticsServiceImpl {
                 Map<String, Object> map = new HashMap();
                 if (i == 0) {
                     map.put("dataKey", "stop");
-                    map.put("name", "停用");
+                    map.put("value", "停用");
                 } else if (i == 1) {
                     map.put("dataKey", "logout");
-                    map.put("name", "注销");
+                    map.put("value", "注销");
                 } else if (i == 2) {
                     map.put("dataKey", "scrap");
-                    map.put("name", "报废");
+                    map.put("value", "报废");
                 }
                 legendDataList.add(map);
             }