Merge branch 'develop_tzs_96333' of http://39.98.45.134:8090/moa/amos-boot-biz…

.gitignore

@@ -6,3 +6,4 @@ target/
 /org.eclipse
 .settings
 log/
+amos-boot-system-tzs/.idea/

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

@@ -130,7 +130,7 @@ public class AlertCalledDto  extends BaseDto {
     private String useSiteCategory;
 
     @ApiModelProperty(value = "电梯使用状态")
-    private Integer useStatus;
+    private String useStatus;
 
     // 废弃
     @ApiModelProperty(value = "警情地址")

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 警情查询DTO
@@ -54,11 +55,11 @@ public class AlertCalledQueryDto {
    @ApiModelProperty(value = "电梯地址")
    private String elevatorAddress;
 
-   @ExcelProperty(value = "所属区域", index = 7)
+   @ExcelIgnore
    @ApiModelProperty(value = "所属区域")
    private String district;
 
-   @ExcelIgnore
+   @ExcelProperty(value = "所属区域", index = 7)
    @ApiModelProperty(value = "市+区")
    private String address;
 
@@ -90,4 +91,6 @@ public class AlertCalledQueryDto {
    @ApiModelProperty(value = "ID")
    private Long sequenceNbr;
 
+   @ExcelIgnore
+   List<String> ids;
 }

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

@@ -30,11 +30,11 @@ public class BaseEnterpriseInfoDto extends BaseDto {
 
         @ApiModelProperty(value = "统一社会信用代码")
         @TableField("use_code")
-        private String socialCreditCode;
+        private String useCode;
 
         @ApiModelProperty(value = "维护保养单位名称")
-        @TableField("supervise_org_name")
-        private String unitName;
+        @TableField("use_unit")
+        private String useUnit;
 
         @ApiModelProperty(value = "省份")
         @TableField("province")
@@ -49,7 +49,7 @@ public class BaseEnterpriseInfoDto extends BaseDto {
         private String district;
 
         @ApiModelProperty(value = "区域代码")
-        @TableField("district")
+        @TableField("supervise_code")
         private String regionCode;
 
         @ApiModelProperty(value = "地址(详细地址，包括道路、门牌号码)")

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

@@ -111,7 +111,7 @@ public class ElevatorDto extends BaseDto {
     private String dragModeName;
 
     @ApiModelProperty(value = "电梯使用状态")
-    private Integer useStatus;
+    private String useStatus;
 
     @ApiModelProperty(value = "电梯使用状态Str")
     private String useStatusStr;

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

@@ -20,10 +20,10 @@ import java.util.List;
 public class EnterpriseInfoExportDto  {
 
     @ExcelProperty(value = "统一社会信用代码", index = 1)
-    private String socialCreditCode;
+    private String useCode;
 
     @ExcelProperty(value = "单位名称", index = 0)
-    private String unitName;
+    private String useUnit;
 
     @ExcelProperty(value = "所属区域", index = 2)
     private String district;

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

@@ -19,7 +19,7 @@ public class SpecialEquipmentDto {
 
     @ExcelIgnore
     @ApiModelProperty(value = "主键ID")
-    protected Long sequenceNbr;
+    protected String sequenceNbr;
 
     @ApiModelProperty(value = "电梯应急救援识别码")
     private Integer rescueCode;

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

@@ -26,11 +26,11 @@ public class EnterpriseInfo extends BaseEntity {
 
     @ApiModelProperty(value = "统一社会信用代码")
     @TableField("use_code")
-    private String socialCreditCode;
+    private String useCode;
 
     @ApiModelProperty(value = "维护保养单位名称")
     @TableField("use_unit")
-    private String unitName;
+    private String useUnit;
 
     @ApiModelProperty(value = "省份")
     @TableField("province")
@@ -45,7 +45,7 @@ public class EnterpriseInfo extends BaseEntity {
     private String district;
 
     @ApiModelProperty(value = "区域代码")
-    @TableField("district")
+    @TableField("supervise_code")
     private String regionCode;
 
     @ApiModelProperty(value = "地址(详细地址，包括道路、门牌号码)")

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

@@ -72,7 +72,8 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
             @Param("alertStatus") String alertStatus,
             @Param("sortParam") String sortParam,
             @Param("sortRule") String sortRule,
-            @Param("userIds") Set<String> userIds);
+            @Param("userIds") Set<String> userIds,
+            @Param("ids") List<String> ids);
 
     Map<String, Integer> getTodayEmergencyCount(String regionCode);
     

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

@@ -52,7 +52,8 @@ public interface IAlertCalledService {
                                                        String alertStage,
                                                        String alertStatus,
                                                        String sortParam,
-                                                       String sortRule);
+                                                       String sortRule,
+                                                       List<String> ids);
 
     /**
      * 更新警情阶段信息

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

@@ -257,6 +257,12 @@
 				#{item}
 			</foreach>
 		</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>
 		<if test="sortParam != null and sortParam != '' and sortRule != null and sortRule != ''    ">
 			ORDER BY  ${sortParam}  ${sortRule}
 		</if>

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

@@ -110,7 +110,7 @@
         LEFT JOIN idx_biz_jg_register_info jri on jui.RECORD = jri.RECORD
         LEFT JOIN idx_biz_jg_maintenance_record_info mri on jui.RECORD = mri.RECORD
         <where>
-             jri.EQU_LIST = '3000'
+             jri.EQU_LIST = '3000'  AND joi.CLAIM_STATUS = '已认领' and  jui.RECORD is not null
             <if test="dto.regionCode != null and dto.regionCode != ''">
                 and (jui.PROVINCE = #{dto.regionCode} or jui.CITY = #{dto.regionCode} or jui.COUNTY = #{dto.regionCode}
                 )
@@ -133,7 +133,8 @@
             <if test="dto.useUnit != null and dto.useUnit != ''">
                 and jui.USE_UNIT_NAME like concat('%',#{dto.useUnit},'%')
             </if>
-
+            GROUP BY
+            joi.RECORD
         </where>
     </select>
 <!--    <select id="selectExportDataNew" resultType="com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDtoNew">-->
@@ -398,7 +399,7 @@
         LEFT JOIN idx_biz_jg_register_info jri on jui.RECORD = jri.RECORD
         LEFT JOIN idx_biz_jg_maintenance_record_info mri on jui.RECORD = mri.RECORD
         <where>
-            jri.EQU_LIST = '3000'
+            jri.EQU_LIST = '3000'  AND joi.CLAIM_STATUS = '已认领' and  jui.RECORD is not null
             <if test="dto.regionCode != null and dto.regionCode != ''">
                 and (jui.PROVINCE = #{dto.regionCode} or jui.CITY = #{dto.regionCode} or jui.COUNTY = #{dto.regionCode}
                 )
@@ -428,6 +429,8 @@
 
                     </if>
         </where>
+        GROUP BY
+        joi.RECORD
     </select>
 
     <select id="selectElevatorEsList" resultType="java.util.Map">
@@ -468,11 +471,12 @@
 
     <select id="selectMtByAlertId" resultType="java.util.Map">
         SELECT
+            tbei.sequence_nbr AS sequenceNbr,
             ME_MASTER AS userName,
             EMERGENCYCALL AS phone,
             tbei.address AS address,
             tbei.use_unit AS unitName,
-            ibjui."USE_UNIT_CREDIT_CODE" AS useCode
+            tbei.use_code AS useCode
         FROM
             idx_biz_jg_maintenance_record_info ibjmri
                 LEFT JOIN tz_base_enterprise_info tbei ON ibjmri."ME_UNIT_CREDIT_CODE" = tbei.use_code

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/AlertCalledController.java

@@ -195,7 +195,7 @@ public class AlertCalledController extends BaseController {
 		alertCalledDto.setAddress(elevator.getAddress());
 		alertCalledDto.setRegistrationCode(elevator.getRegisterCode());
 		alertCalledDto.setDeviceId(String.valueOf(elevator.getRescueCode()));
-		alertCalledDto.setUseStatus(elevator.getUseStatus());
+		alertCalledDto.setUseStatus(String.valueOf(elevator.getUseStatus()));
 		alertCalledDto.setUseSiteCategory(elevator.getUseSiteCategory());
 		alertCalledDto.setAlarmType(AlertStageEnums.getEnumById(alertCalledDto.getAlarmTypeCode()).getValue());
 		alertCalledDto.setEquipmentClassification("电梯");
@@ -506,7 +506,7 @@ public class AlertCalledController extends BaseController {
 				alertCalledQueryDto.getWorkOrderNumber(),alertCalledQueryDto.getCreator(),alertCalledQueryDto.getEmergency(),alertCalledQueryDto.getEmergencyTimeStart(),
 				alertCalledQueryDto.getEmergencyTimeEnd(),alertCalledQueryDto.getEmergencyCall(),alertCalledQueryDto.getDeviceId(),alertCalledQueryDto.getElevatorAddress(),
 				alertCalledQueryDto.getDistrict(),alertCalledQueryDto.getAlertType(),alertCalledQueryDto.getAlertSource(),alertCalledQueryDto.getAlertStage(),alertCalledQueryDto.getAlertStatus(),
-				sortParam,sortRule);
+				sortParam,sortRule, null);
 		Page<AlertCalledQueryDto> result = new Page<AlertCalledQueryDto>(alertCalledQueryDto.getPageNum(),
 				alertCalledQueryDto.getPageSize());
 		long totle = pageBean.getTotal();
@@ -541,7 +541,7 @@ public class AlertCalledController extends BaseController {
 				alertCalledQueryDto.getWorkOrderNumber(),alertCalledQueryDto.getCreator(),alertCalledQueryDto.getEmergency(),alertCalledQueryDto.getEmergencyTimeStart(),
 				alertCalledQueryDto.getEmergencyTimeEnd(),alertCalledQueryDto.getEmergencyCall(),alertCalledQueryDto.getDeviceId(),alertCalledQueryDto.getElevatorAddress(),
 				alertCalledQueryDto.getDistrict(),alertCalledQueryDto.getAlertType(),alertCalledQueryDto.getAlertSource(),alertCalledQueryDto.getAlertStage(),alertCalledQueryDto.getAlertStatus(),
-				sortParam,sortRule);
+				sortParam,sortRule, alertCalledQueryDto.getIds());
 
 		List<AlertCalledQueryDto> list = pageBean.getRecords();
 		String fileName = "处置记录" + System.currentTimeMillis();

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/MaintenanceUnitController.java

@@ -251,7 +251,7 @@ public class MaintenanceUnitController extends BaseController {
                 Object o = field.get(enterpriseInfo);
                 if (o != null) {
                     String name = NameUtils.camel2Underline(field.getName());
-                    if ("city".equalsIgnoreCase(name) || "district".equalsIgnoreCase(name) || "qualification_level".equalsIgnoreCase(name)) {
+                    if ("city".equalsIgnoreCase(name) ) {
                         String fileValue = (String) o;
                         enterpriseInfoQueryWrapper.eq(name, fileValue);
                     } else if ("credit_level".equalsIgnoreCase(name)) {
@@ -264,7 +264,7 @@ public class MaintenanceUnitController extends BaseController {
                             // 此处由于写接口时表数据还未进行整理，所以此处先默认用文字做查询
                             enterpriseInfoQueryWrapper.like(name, "使用单位");
                         } else {
-                            enterpriseInfoQueryWrapper.notLike(name, "使用单位");
+                            enterpriseInfoQueryWrapper.like(name, "维保单位");
                         }
                     } else {
                         String fileValue = (String) o;
@@ -301,7 +301,7 @@ public class MaintenanceUnitController extends BaseController {
                 Object o = field.get(enterpriseInfo);
                 if (o != null) {
                     String name = NameUtils.camel2Underline(field.getName());
-                    if ("city".equalsIgnoreCase(name) || "district".equalsIgnoreCase(name) || "qualification_level".equalsIgnoreCase(name)) {
+                    if ("city".equalsIgnoreCase(name) ) {
                         String fileValue = (String) o;
                         enterpriseInfoQueryWrapper.eq(name, fileValue);
                     } else if ("credit_level".equalsIgnoreCase(name)) {
@@ -314,7 +314,7 @@ public class MaintenanceUnitController extends BaseController {
                             // 此处由于写接口时表数据还未进行整理，所以此处先默认用文字做查询
                             enterpriseInfoQueryWrapper.like(name, "使用单位");
                         } else {
-                            enterpriseInfoQueryWrapper.notLike(name, "使用单位");
+                            enterpriseInfoQueryWrapper.like(name, "维保单位");
                         }
                     } else {
                         String fileValue = (String) o;
@@ -380,6 +380,7 @@ public class MaintenanceUnitController extends BaseController {
         MaintenanceUnitDto maintenanceUnitVo = new MaintenanceUnitDto();
         maintenanceUnitVo.setUnitName(ObjectUtils.isEmpty(list.get(0).get("unitName")) ? null :String.valueOf(list.get(0).get("unitName")));
         maintenanceUnitVo.setAddress(ObjectUtils.isEmpty(list.get(0).get("address")) ? null :String.valueOf(list.get(0).get("address")));
+        maintenanceUnitVo.setSequenceNbr(ObjectUtils.isEmpty(list.get(0).get("sequenceNbr")) ? null : Long.valueOf(String.valueOf(list.get(0).get("sequenceNbr"))));
         List<DutyPersonDto> dutyPersonList = new ArrayList<DutyPersonDto>();
         DutyPersonDto principal = new DutyPersonDto();
         principal.setDeptName("主要负责人1");

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertCalledServiceImpl.java

@@ -165,7 +165,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                 alertCalledDto.setProvince(String.valueOf(map.get("province")));
                 alertCalledDto.setCity(String.valueOf(map.get("city")));
                 alertCalledDto.setDistrict(String.valueOf(map.get("district")));
-                alertCalledDto.setUseStatus(Integer.valueOf(String.valueOf(map.get("useStatus"))));
+                alertCalledDto.setUseStatus(String.valueOf(map.get("useStatus")));
                 alertCalledDto.setUseSiteCategory(String.valueOf(map.get("useSiteCategory")));
                 alertCalledDto.setUseUnit(String.valueOf(map.get("useUnit")));
                 alertCalledDto.setRegionCode(String.valueOf(map.get("regionCode")));
@@ -244,16 +244,16 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
             alertCalledDto.setProvince(elevator.getProvince());
             alertCalledDto.setCity(elevator.getCity());
             alertCalledDto.setDistrict(elevator.getDistrict());
-            alertCalledDto.setUseStatus(elevator.getUseStatus());
+            alertCalledDto.setUseStatus(String.valueOf(elevator.getUseStatus()));
             alertCalledDto.setUseSiteCategory(elevator.getUseSiteCategory());
             alertCalledDto.setUseUnit(elevator.getUseUnit());
             alertCalledDto.setRegionCode(elevator.getRegionCode());
         }
         String voiceRecord = "";
-        VoiceRecordFile temp = voiceRecordFileServiceImpl.getOne(new LambdaQueryWrapper<VoiceRecordFile>().eq(VoiceRecordFile::getAlertId,id).eq(VoiceRecordFile::getAlertStageCode,"860").orderByAsc(VoiceRecordFile::getRecDate));
-        if(temp != null) {
-            voiceRecord = temp.getFilePath();
-        }
+//        VoiceRecordFile temp = voiceRecordFileServiceImpl.getOne(new LambdaQueryWrapper<VoiceRecordFile>().eq(VoiceRecordFile::getAlertId,id).eq(VoiceRecordFile::getAlertStageCode,"860").orderByAsc(VoiceRecordFile::getRecDate));
+//        if(temp != null) {
+//            voiceRecord = temp.getFilePath();
+//        }
         AlertCalledFormDto alertCalledFormVo = new AlertCalledFormDto(alertCalledDto, formValue,voiceRecord);
         return alertCalledFormVo;
     }
@@ -274,7 +274,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                                                               String alertStage,
                                                               String alertStatus,
                                                               String sortParam,
-                                                              String sortRule
+                                                              String sortRule,
+                                                              List<String> ids
                                                               ) {
         //获取当前登陆人所在单位的下的所有接警人员的userId
         Set<String> userIds = new HashSet<>();
@@ -292,7 +293,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         Page<List<AlertCalledQueryDto>>list = alertCalledMapper.queryAlertListByQueryDto(page,
                 workOrderNumber,creator,emergency,emergencyTimeStart,
                 emergencyTimeEnd,emergencyCall,deviceId,elevatorAddress,district,alertType,
-                alertSource,alertStage,alertStatus,sortParam,sortRule,userIds);
+                alertSource,alertStage,alertStatus,sortParam,sortRule,userIds,ids);
         Page<AlertCalledQueryDto> page1 = new Page<>();
         List<AlertCalledQueryDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(list.getRecords()),AlertCalledQueryDto.class);
         page1.setCurrent(page.getCurrent());

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/DispatchPaperServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.elevator.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
@@ -179,7 +180,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         Map<String,Object> map  = elevatorServiceImpl.selectByAlertId(alertId);
         if(!ObjectUtils.isEmpty(map.get("sequenceNbr"))) {
             List<Map<String,Object>> mapList = elevatorMapper.selectMtByAlertId(String.valueOf(map.get("sequenceNbr")));
-            if(!ObjectUtils.isEmpty(mapList)){
+            if(!ObjectUtils.isEmpty(mapList) && CollectionUtils.isEmpty(mapList)){
                 dispatchPaper.setRepairOrgCreditCode(String.valueOf(mapList.get(0).get("useCode")));
             }
         }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/ESElevatorServiceImpl.java

 package com.yeejoin.amos.boot.module.elevator.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -450,7 +451,7 @@ public class ESElevatorServiceImpl {
 
         if(!ValidationUtil.isEmpty(keyword)) {
             BoolQueryBuilder qb0 = QueryBuilders.boolQuery().
-                    must(QueryBuilders.termQuery("rescueCode", keyword));
+                    must(QueryBuilders.matchQuery("rescueCode.keyword", keyword));
             boolMust.should(qb0);
             BoolQueryBuilder qb1 = QueryBuilders.boolQuery().
                     must(QueryBuilders.matchQuery("address", keyword));
@@ -486,6 +487,7 @@ public class ESElevatorServiceImpl {
         catch (Exception e)
         {
             // TODO: handle exception
+            e.printStackTrace();
         }
         result.setRecords(list);
         result.setTotal(total);

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/ElevatorServiceImpl.java

@@ -155,7 +155,7 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
         if(useSiteCategory != null) {
             elevatorDto.setUseSiteCategoryName(useSiteCategory.getName());
         }
-        if(elevatorDto.getUseStatus() == 1) {
+        if("1".equals(elevatorDto.getUseStatus())) {
             elevatorDto.setUseStatusStr("在用");
         } else {
             elevatorDto.setUseStatusStr("停用");