Skip to content

A
amos-boot-biz
Commit cedf859e authored by lisong's avatar lisong
Browse files
Options

修改bug

parent 22979784
Show whitespace changes
Inline Side-by-side
Showing with 54 additions and 24 deletions
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/dto/DispatchTaskDto.java
View file @ cedf859e
......@@ -40,7 +40,7 @@ public class DispatchTaskDto extends BaseDto {
private String orgTypeCode;
@ApiModelProperty(value = "响应单位id")
private Long responseOrgId;
private String responseOrgId;
@ApiModelProperty(value = "响应单位名称")
private String responseOrgName;
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/dto/MaintenanceUnitDto.java
View file @ cedf859e
......@@ -96,4 +96,7 @@ public class MaintenanceUnitDto extends BaseDto {
@ApiModelProperty(value = "人员信息")
List<DutyPersonDto> dutyPersonList;
@ApiModelProperty(value = "idx_biz_jg_maintenance_record_info表SEQUENCE_NBR")
private String id;
}
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/entity/DispatchPaper.java
View file @ cedf859e
......@@ -98,7 +98,7 @@ public class DispatchPaper extends BaseEntity {
* 维保单位id 困人救援时为三级响应单位id
*/
@TableField("repair_org_id")
private Long repairOrgId;
private String repairOrgId;
/**
* 维保单位社会信用代码
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/entity/DispatchTask.java
View file @ cedf859e
......@@ -62,7 +62,7 @@ public class DispatchTask extends BaseEntity {
* 响应单位id
*/
@TableField("response_org_id")
private Long responseOrgId;
private String responseOrgId;
/**
* 响应单位名称
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/mapper/ElevatorMapper.java
View file @ cedf859e
......@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDtoNew;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorMessageDto;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorWlInfoDto;
import com.yeejoin.amos.boot.module.elevator.api.entity.Elevator;
import com.yeejoin.amos.boot.module.elevator.api.entity.TzBaseEnterpriseInfo;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
......@@ -63,5 +64,8 @@ public interface ElevatorMapper extends BaseMapper<Elevator> {
List<Map<String, Object>> selectMtByAlertId(String sequenceNbr);
Map<String, Object> selectMainUnitMessage(String sequenceNbr);
Map<String, Object> selectUseUnitByAlertId(String sequenceNbr);
}
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/ElevatorMapper.xml
View file @ cedf859e
......@@ -480,19 +480,18 @@
<select id="selectMtByAlertId" resultType="java.util.Map">
SELECT
tbei.sequence_nbr AS sequenceNbr,
SEQUENCE_NBR AS sequenceNbr,
ME_MASTER AS userName,
EMERGENCYCALL AS phone,
tbei.address AS address,
tbei.use_unit AS unitName,
tbei.use_code AS useCode
'' AS address,
ME_UNIT_NAME AS unitName,
ME_UNIT_CREDIT_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
where
ibjmri.RECORD = #{sequenceNbr}
order by ibjmri.REC_DATE
limit 2
order by ibjmri.INFORM_START desc
limit 1
</select>
<select id="selectUseUnitByAlertId" resultType="java.util.Map">
......@@ -528,4 +527,19 @@
WHERE jri.EQU_LIST = '3000'
and jui.ADDRESS like concat('%', #{address}, '%') and joi.CODE96333 is not null
</select>
<select id="selectMainUnitMessage"
resultType="java.util.Map">
SELECT
SEQUENCE_NBR AS sequenceNbr,
ME_MASTER AS userName,
EMERGENCYCALL AS phone,
'' AS address,
ME_UNIT_NAME AS unitName,
ME_UNIT_CREDIT_CODE AS useCode
FROM
idx_biz_jg_maintenance_record_info ibjmri
where
ibjmri.SEQUENCE_NBR = #{sequenceNbr}
</select>
</mapper>
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
View file @ cedf859e
......@@ -390,10 +390,10 @@ public class AlertCalledController extends BaseController {
setQueryWrapper(alertCalledQueryWrapper, alertCalled, sort);
// 添加接警开始时间的查询条件
if (alertCalledDto.getCallTimeStart() != null) {
alertCalledQueryWrapper.ge("call_time_start", alertCalledDto.getCallTimeStart());
}
// // 添加接警开始时间的查询条件
// if (alertCalledDto.getCallTimeStart() != null) {
// alertCalledQueryWrapper.ge("call_time_start", alertCalledDto.getCallTimeStart());
// }
if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
pageBean = new Page<>(0, Long.MAX_VALUE);
......
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
View file @ cedf859e
......@@ -395,13 +395,14 @@ 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"))));
maintenanceUnitVo.setId(ObjectUtils.isEmpty(list.get(0).get("sequenceNbr")) ? null : String.valueOf(list.get(0).get("sequenceNbr")));
maintenanceUnitVo.setSocialCreditCode(ObjectUtils.isEmpty(list.get(0).get("useCode")) ? null : String.valueOf(list.get(0).get("useCode")));
List<DutyPersonDto> dutyPersonList = new ArrayList<DutyPersonDto>();
DutyPersonDto principal = new DutyPersonDto();
principal.setDeptName("主要负责人1");
principal.setPhone(String.valueOf(list.get(0).get("phone")));
principal.setPhone(ObjectUtils.isEmpty(list.get(0).get("phone")) ? null :String.valueOf(list.get(0).get("phone")));
principal.setUserId(null);
principal.setUserName(String.valueOf(list.get(0).get("userName")));
principal.setUserName(ObjectUtils.isEmpty(list.get(0).get("userName")) ? null : String.valueOf(list.get(0).get("userName")));
dutyPersonList.add(principal);
DutyPersonDto manager = new DutyPersonDto();
manager.setDeptName("主要负责人2");
......
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/DispatchTaskServiceImpl.java
View file @ cedf859e
......@@ -33,6 +33,7 @@ import com.yeejoin.amos.boot.module.elevator.api.enums.AlertStageEnums;
import com.yeejoin.amos.boot.module.elevator.api.enums.DispatchPaperEnums;
import com.yeejoin.amos.boot.module.elevator.api.enums.TzsCommonParam;
import com.yeejoin.amos.boot.module.elevator.api.mapper.DispatchTaskMapper;
import com.yeejoin.amos.boot.module.elevator.api.mapper.ElevatorMapper;
import com.yeejoin.amos.boot.module.elevator.api.service.IDispatchTaskService;
import com.yeejoin.amos.boot.module.elevator.api.service.IRescueStationService;
import com.yeejoin.amos.boot.module.elevator.api.service.ITzBaseEnterpriseInfoService;
......@@ -112,6 +113,8 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
@Autowired
private EmqKeeper emqKeeper;
@Autowired
private ElevatorMapper elevatorMapper;
@Autowired
ISourceFileService sourceFileService;
......@@ -841,14 +844,19 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
}
break;
case "repairUnit":
maintenanceUnit = enterpriseInfoService.getById(dispatchTask.getResponseOrgId());
dispatchPaper.setRepairOrgId(maintenanceUnit.getSequenceNbr());
Map<String, Object> unitMessage = elevatorMapper.selectMainUnitMessage(dispatchTask.getResponseOrgId());
dispatchPaper.setRepairOrgId(String.valueOf(unitMessage.get("sequenceNbr")));
// maintenanceUnit = enterpriseInfoService.getById(dispatchTask.getResponseOrgId());
// dispatchPaper.setRepairOrgId(maintenanceUnit.getSequenceNbr());
dispatchPaper.setRepairOrgTaskId(dispatchTask.getSequenceNbr());
break;
case "levelOneUnit":
maintenanceUnit = enterpriseInfoService.getById(dispatchTask.getResponseOrgId());
String socialCreditCode = maintenanceUnit.getUseCode();
dispatchPaper.setRepairOrgId(maintenanceUnit.getSequenceNbr());
Map<String, Object> unitMessageOne = elevatorMapper.selectMainUnitMessage(dispatchTask.getResponseOrgId());
dispatchPaper.setRepairOrgId(String.valueOf(unitMessageOne.get("sequenceNbr")));
// maintenanceUnit = enterpriseInfoService.getById(dispatchTask.getResponseOrgId());
// String socialCreditCode = maintenanceUnit.getUseCode();useCode
String socialCreditCode = String.valueOf(unitMessageOne.get("useCode"));
// dispatchPaper.setRepairOrgId(maintenanceUnit.getSequenceNbr());
dispatchPaper.setRepairOrgTaskId(dispatchTask.getSequenceNbr());
// 修改动态字段
dynamicFormAlert.stream().forEach(alertFormValue -> {
......@@ -870,7 +878,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
break;
case "levelTwoUnit":
RescueStation rescueStation = iRescueStationService.getById(dispatchTask.getResponseOrgId());
dispatchPaper.setRepairOrgId(rescueStation.getSequenceNbr());
dispatchPaper.setRepairOrgId(String.valueOf(rescueStation.getSequenceNbr()));
dispatchPaper.setRepairOrgTaskId(dispatchTask.getSequenceNbr());
// 修改动态字段
dynamicFormAlert.stream().forEach(alertFormValue -> {
......
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/RescueProcessServiceImpl.java
View file @ cedf859e
......@@ -148,7 +148,7 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
if (dispatchPaper.getRepairOrgId() != null) { // 已经派遣过调派
throw new BadRequest("已经派遣过其他力量调派");
} else {
dispatchPaper.setRepairOrgId(-1l);
dispatchPaper.setRepairOrgId("-1");
dispatchPaper.setRepairOrgCreditCode("119");
dispatchPaper.setRepairOrgTaskId(dispatchTask.getSequenceNbr());
// 修改动态字段
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment