Commit 43e2e535 authored by 韩桐桐's avatar 韩桐桐

feat(jg):列表数据导出

parent 11bf1039
package com.yeejoin.amos.boot.module.jg.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationNameDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationName;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.ChangeRegistrationNameVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -32,5 +33,7 @@ public interface JgChangeRegistrationNameMapper extends BaseMapper<JgChangeRegis
@Param("companyCode") String companyCode,
@Param("currentUserId") String exeUserId);
List<ChangeRegistrationNameVo> queryChangeRegistrationNameInIds(@Param("ids") List<String> ids);
List<CompanyEquipCountDto> queryForFlowingEquipList();
}
package com.yeejoin.amos.boot.module.jg.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.ChangeRegistrationReformVo;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import java.util.List;
import java.util.Map;
......@@ -27,6 +26,8 @@ public interface JgChangeRegistrationReformMapper extends BaseMapper<JgChangeReg
@Param("roleIds") List<String> roleIds,
@Param("currentUserId")String currentUserId);
List<ChangeRegistrationReformVo> queryChangeRegistrationReformInIds(@Param("ids") List<String> ids);
Map<String, Object> getDetail(@Param("id")String id);
Map<String, Object> getInspectDetail(@Param("id")String id);
......
package com.yeejoin.amos.boot.module.jg.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationTransferDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransfer;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.ChangeRegistrationTransferVo;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
......@@ -27,6 +28,8 @@ public interface JgChangeRegistrationTransferMapper extends BaseMapper<JgChangeR
@Param("type") String type,
@Param("currentUserId")String currentUserId);
List<ChangeRegistrationTransferVo> queryChangeRegistrationTransferInIds(@Param("ids") List<String> ids);
@Select("select name from tz_equipment_category where code=#{code}")
String getEquiplistNameByEquiplist(String code);
......
......@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.ChangeRegistrationUnitVo;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
......@@ -35,6 +36,8 @@ public interface JgChangeRegistrationUnitMapper extends CustomBaseMapper<JgChang
@Param("roleIds") List<String> roleIds,
@Param("currentUserId") String currentUserId);
List<ChangeRegistrationUnitVo> queryChangeRegistrationUnitInIds(@Param("ids") List<String> ids);
/**
* 根据安装告知编号查询设备、设计、制造等信息
*
......
package com.yeejoin.amos.boot.module.jg.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeVehicleRegistrationUnitDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeVehicleRegistrationUnit;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.ChangeVehicleRegistrationUnitVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -27,5 +28,7 @@ public interface JgChangeVehicleRegistrationUnitMapper extends BaseMapper<JgChan
@Param("currentUserId") String currentUserId,
@Param("roleIds") List<String> roleIds);
List<ChangeVehicleRegistrationUnitVo> queryChangeVehicleRegistrationUnitInIds(@Param("ids") List<String> ids);
List<CompanyEquipCountDto> queryForFlowingEquipList();
}
package com.yeejoin.amos.boot.module.jg.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
import com.yeejoin.amos.boot.module.jg.api.dto.EquipBizCountDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgEnableDisableDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgEnableDisable;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.EnableDisableVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -27,6 +28,8 @@ public interface JgEnableDisableMapper extends BaseMapper<JgEnableDisable> {
@Param("type") String type,
@Param("userId") String userId);
List<EnableDisableVo> queryEnableDisableInIds(@Param("ids") List<String> ids);
Map<String, Object> getDetail(@Param("sequenceNbr") Long sequenceNbr);
List<EquipBizCountDto> queryStoppedDeviceStaticListData(DPFilterParamDto dpFilterParamDto);
......
......@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.EquipTransferVo;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
......@@ -23,6 +24,8 @@ public interface JgEquipTransferMapper extends CustomBaseMapper<JgEquipTransfer>
@Param("param") JgEquipTransferDto model,
@Param("currentUserId") String currentUserId);
List<EquipTransferVo> queryEquipTransferInIds(@Param("ids") List<String> ids);
@MapKey("sequenceNbr")
List<Map<String, Object>> queryEquipInformation(Long sequenceNbr);
......
......@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.InstallationVo;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
......@@ -42,4 +43,5 @@ public interface JgInstallationNoticeMapper extends CustomBaseMapper<JgInstallat
List<CompanyEquipCountDto> queryForFlowingEquipList();
List<InstallationVo> queryInstallationInIds(@Param("ids") List<String> ids);
}
......@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.MaintainVo;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
......@@ -46,4 +47,6 @@ public interface JgMaintainNoticeMapper extends CustomBaseMapper<JgMaintainNotic
Map<String, Object> getEquipInfoByRecord(String record);
List<CompanyEquipCountDto> queryForFlowingEquipList();
List<MaintainVo> queryMaintainInIds(@Param("ids") List<String> ids);
}
......@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.MaintenanceVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -33,4 +34,6 @@ public interface JgMaintenanceContractMapper extends BaseMapper<JgMaintenanceCon
List<Map<String, Object>> selectEquipList(@Param("id") Long id);
List<CompanyEquipCountDto> queryForFlowingEquipList();
List<MaintenanceVo> queryMaintenanceInIds(@Param("ids") List<String> ids);
}
......@@ -5,7 +5,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import org.apache.ibatis.annotations.MapKey;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.ReformVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -38,4 +38,6 @@ public interface JgReformNoticeMapper extends CustomBaseMapper<JgReformNotice> {
void updatePromoter(@Param("id") Long id);
List<CompanyEquipCountDto> queryForFlowingEquipList();
List<ReformVo> queryReformInIds(@Param("ids") List<String> ids);
}
......@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.EquipBizCountDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancel;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.ScrapCancelVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -29,6 +30,8 @@ public interface JgScrapCancelMapper extends BaseMapper<JgScrapCancel> {
@Param("currentUserId") String currentUserId
);
List<ScrapCancelVo> queryScrapCancelInIds(@Param("ids") List<String> ids);
Map<String, Object> getDetail(@Param("id") String id);
Map<String, Object> getInspectDetail(@Param("id") String id);
......
......@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.TransferVo;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
......@@ -29,4 +30,6 @@ public interface JgTransferNoticeMapper extends CustomBaseMapper<JgTransferNotic
List<Map<String, Object>> queryEquipInformation(@Param("sequenceNbr") long sequenceNbr);
List<CompanyEquipCountDto> queryForFlowingEquipList();
List<TransferVo> queryTransferInIds(@Param("ids") List<String> ids);
}
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.CertificateVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -30,4 +31,5 @@ public interface JgUseRegistrationManageMapper extends BaseMapper<JgUseRegistrat
@Param("dto") JgUseRegistrationManageDto dto,
@Param("orgCode") String orgCode);
List<CertificateVo> queryCertificateInIds(@Param("ids") List<String> ids);
}
......@@ -8,8 +8,8 @@ import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
import com.yeejoin.amos.boot.module.jg.api.dto.EquipBizCountDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
import com.yeejoin.amos.boot.module.jg.api.vo.ElevatorModelVo;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.RegistrationVo;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
......@@ -31,6 +31,8 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
@Param("dto") JgUseRegistrationDto dto,
@Param("roleIds") List<String> roleIds);
List<RegistrationVo> queryRegistrationInIds(@Param("ids") List<String> ids);
Map<String, Object> getDetail(@Param("id") String id);
Map<String, Object> getSupervisionInfoDetail(@Param("id") String id);
......
......@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgVehicleInformationDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformation;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.VehicleInformationVo;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
......@@ -27,6 +28,8 @@ public interface JgVehicleInformationMapper extends BaseMapper<JgVehicleInformat
@Param("dto") JgVehicleInformationDto dto ,
@Param("roleIds") List<String> roleIds);
List<VehicleInformationVo> queryVehicleInformationInIds(@Param("ids") List<String> ids);
@MapKey("sequenceNbr")
JgVehicleInformationDto queryBySequenceNbr(@Param("sequenceNbr") Long sequenceNbr);
......
package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 登记证
*/
@Data
public class CertificateVo {
@ExcelProperty(value = "使用登记证编号", index = 0)
String useRegistrationCode;
@ExcelProperty(value = "登记类型", index = 1)
String regType;
@ExcelProperty(value = "使用单位", index = 2)
String useUnitName;
@ExcelProperty(value = "使用单位地址", index = 3)
String useUnitAddress;
@ExcelProperty(value = "登记机关", index = 4)
String receiveOrgName;
@ExcelProperty(value = "设备种类", index = 5)
String equList;
@ExcelProperty(value = "设备类别", index = 6)
String equCategory;
@ExcelProperty(value = "设备品种", index = 7)
String equDefine;
@ExcelProperty(value = "设备使用地址", index = 8)
String equUseAddress;
@ExcelProperty(value = "使用登记证状态", index = 9)
String certificateStatus;
@ExcelProperty(value = "办理日期", index = 10)
String auditPassDate;
}
package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 更名变更
*/
@Data
public class ChangeRegistrationNameVo {
@ExcelProperty(value = "申请单号", index = 0)
String applyNo;
@ExcelProperty(value = "使用登记证编号", index = 1)
String certificateCodes;
@ExcelProperty(value = "申请日期", index = 2)
String createDate;
@ExcelProperty(value = "原使用单位名称", index = 3)
String useUnitName;
@ExcelProperty(value = "使用单位名称", index = 4)
String newUseUnitName;
@ExcelProperty(value = "接收机构", index = 5)
String receiveOrgName;
@ExcelProperty(value = "办理状态", index = 6)
String auditStatus;
@ExcelProperty(value = "办理日期", index = 7)
String auditPassDate;
}
package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 改造登记
*/
@Data
public class ChangeRegistrationReformVo {
@ExcelProperty(value = "申请单号", index = 0)
String applyNo;
@ExcelProperty(value = "申请日期", index = 1)
String createDate;
@ExcelProperty(value = "设备种类", index = 2)
String equList;
@ExcelProperty(value = "设备类别", index = 3)
String equCategory;
@ExcelProperty(value = "设备品种", index = 4)
String equDefine;
@ExcelProperty(value = "设备代码", index = 5)
String equCode;
@ExcelProperty(value = "使用登记证编号", index = 6)
String useRegistrationCode;
@ExcelProperty(value = "96333识别码", index = 7)
String code96333;
@ExcelProperty(value = "监管码", index = 8)
String supervisoryCode;
@ExcelProperty(value = "设备地址", index = 9)
String place;
@ExcelProperty(value = "详细地址", index = 10)
String detailedAddress;
@ExcelProperty(value = "使用单位", index = 11)
String useUnitName;
@ExcelProperty(value = "接收机构", index = 12)
String receiveOrgName;
@ExcelProperty(value = "作废原因", index = 13)
String cancelReason;
@ExcelProperty(value = "办理状态", index = 14)
String status;
@ExcelProperty(value = "办理日期", index = 15)
String auditPassDate;
}
package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 移装变更
*/
@Data
public class ChangeRegistrationTransferVo {
@ExcelProperty(value = "申请单号", index = 0)
String applyNo;
@ExcelProperty(value = "申请日期", index = 1)
String createDate;
@ExcelProperty(value = "使用单位", index = 2)
String useUnitName;
@ExcelProperty(value = "设备种类", index = 3)
String equList;
@ExcelProperty(value = "接收机构", index = 4)
String receiveOrgName;
@ExcelProperty(value = "办理状态", index = 5)
String status;
@ExcelProperty(value = "办理日期", index = 6)
String recDate;
}
package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 单位变更
*/
@Data
public class ChangeRegistrationUnitVo {
@ExcelProperty(value = "申请编号", index = 0)
String applyNo;
@ExcelProperty(value = "申请日期", index = 1)
String createDate;
@ExcelProperty(value = "使用登记证编号", index = 2)
String useRegistCode;
@ExcelProperty(value = "使用单位", index = 3)
String newUseUnitName;
@ExcelProperty(value = "原使用单位", index = 4)
String useUnitName;
@ExcelProperty(value = "设备种类", index = 5)
String equList;
@ExcelProperty(value = "登记机关", index = 6)
String receiveOrgName;
@ExcelProperty(value = "办理状态", index = 7)
String status;
@ExcelProperty(value = "办理日期", index = 8)
String auditPassDate;
}
package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 车用气瓶变更
*/
@Data
public class ChangeVehicleRegistrationUnitVo {
@ExcelProperty(value = "申请编号", index = 0)
String applyNo;
@ExcelProperty(value = "申请日期", index = 1)
String createDate;
@ExcelProperty(value = "使用登记证编号", index = 2)
String useRegistCode;
@ExcelProperty(value = "使用单位", index = 3)
String newUseUnitName;
@ExcelProperty(value = "原使用单位", index = 4)
String useUnitName;
@ExcelProperty(value = "原车牌号", index = 5)
String carNumber;
@ExcelProperty(value = "新车牌号", index = 6)
String newCarNumber;
@ExcelProperty(value = "登记机关", index = 7)
String receiveOrgName;
@ExcelProperty(value = "办理状态", index = 8)
String status;
@ExcelProperty(value = "办理日期", index = 9)
String auditPassDate;
}
package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 启用停用
*/
@Data
public class EnableDisableVo {
@ExcelProperty(value = "申请类型", index = 0)
String applyType;
@ExcelProperty(value = "申请单号", index = 1)
String applyNo;
@ExcelProperty(value = "申请日期", index = 2)
String createDate;
@ExcelProperty(value = "设备种类", index = 3)
String equListName;
@ExcelProperty(value = "使用登记证编号", index = 4)
String useRegistrationCode;
@ExcelProperty(value = "接收机构", index = 5)
String receiveOrgName;
@ExcelProperty(value = "办理状态", index = 6)
String auditStatus;
@ExcelProperty(value = "办理日期", index = 7)
String auditPassDate;
}
package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 设备移交
*/
@Data
public class EquipTransferVo {
@ExcelProperty(value = "申请单号", index = 0)
String applyNo;
@ExcelProperty(value = "申请日期", index = 1)
String createDate;
@ExcelProperty(value = "设备种类", index = 2)
String equList;
@ExcelProperty(value = "设备类别", index = 3)
String equCategory;
@ExcelProperty(value = "设备品种", index = 4)
String equDefine;
@ExcelProperty(value = "设备代码", index = 5)
String equCode;
@ExcelProperty(value = "使用登记证编号", index = 6)
String useOrgCode;
@ExcelProperty(value = "96333码", index = 7)
String code96333;
@ExcelProperty(value = "监管码", index = 8)
String supervisoryCode;
@ExcelProperty(value = "设备地址", index = 9)
String equAddress;
@ExcelProperty(value = "详细地址", index = 10)
String detailedAddress;
@ExcelProperty(value = "施工单位", index = 11)
String installUnitName;
@ExcelProperty(value = "办理状态", index = 12)
String applyStatus;
@ExcelProperty(value = "办理日期", index = 13)
String acceptDate;
}
package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 安装告知
*/
@Data
public class InstallationVo {
@ExcelProperty(value = "申请单号", index = 0)
String applyNo;
@ExcelProperty(value = "申请日期", index = 1)
String createDate;
@ExcelProperty(value = "施工日期", index = 2)
String installStartDate;
@ExcelProperty(value = "设备种类", index = 3)
String equListName;
@ExcelProperty(value = "设备类别", index = 4)
String equList;
@ExcelProperty(value = "使用单位", index = 5)
String useUnitName;
@ExcelProperty(value = "安改维单位", index = 6)
String installUnitName;
@ExcelProperty(value = "接收机构", index = 7)
String receiveOrgName;
@ExcelProperty(value = "作废原因", index = 8)
String cancelReason;
@ExcelProperty(value = "办理日期", index = 9)
String handleDate;
@ExcelProperty(value = "办理状态", index = 10)
String noticeStatus;
}
package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 维修告知
*/
@Data
public class MaintainVo {
@ExcelProperty(value = "子业务类型", index = 0)
String maintainType;
@ExcelProperty(value = "申请单号", index = 1)
String applyNo;
@ExcelProperty(value = "申请日期", index = 2)
String createDate;
@ExcelProperty(value = "施工日期", index = 3)
String planDate;
@ExcelProperty(value = "设备种类", index = 4)
String equListName;
@ExcelProperty(value = "设备类别", index = 5)
String equCategoryName;
@ExcelProperty(value = "使用单位", index = 6)
String useUnitName;
@ExcelProperty(value = "安改维单位", index = 7)
String installUnitName;
@ExcelProperty(value = "接收机构", index = 8)
String receiveOrgName;
@ExcelProperty(value = "作废原因", index = 9)
String cancelReason;
@ExcelProperty(value = "办理日期", index = 10)
String acceptDate;
@ExcelProperty(value = "办理状态", index = 11)
String noticeStatus;
}
package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 维保备案
*/
@Data
public class MaintenanceVo {
@ExcelProperty(value = "申请单号", index = 0)
String applyNo;
@ExcelProperty(value = "申请日期", index = 1)
String createDate;
@ExcelProperty(value = "设备数量", index = 2)
String equNum;
@ExcelProperty(value = "合同开始日期-合同结束日期", index = 3)
String informStartAndEnd;
@ExcelProperty(value = "使用单位", index = 4)
String useUnitName;
@ExcelProperty(value = "安改维单位", index = 5)
String maintenanceUnitName;
@ExcelProperty(value = "接收机构", index = 6)
String receiveOrgName;
@ExcelProperty(value = "作废原因", index = 7)
String cancelReason;
@ExcelProperty(value = "办理状态", index = 8)
String status;
@ExcelProperty(value = "办理日期", index = 9)
String applyDate;
}
\ No newline at end of file
package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 已纳管设备
*/
@Data
public class ManageEquipmentVo {
@ExcelProperty(value = "设备来源", index = 0)
String DATA_SOURCE_NAME;
@ExcelProperty(value = "设备种类", index = 1)
String EQU_LIST;
@ExcelProperty(value = "设备类别", index = 2)
String EQU_CATEGORY;
@ExcelProperty(value = "设备品种", index = 3)
String EQU_DEFINE;
@ExcelProperty(value = "设备名称", index = 4)
String PRODUCT_NAME;
@ExcelProperty(value = "设备代码", index = 5)
String EQU_CODE;
@ExcelProperty(value = "出厂编号/产品编码", index = 6)
String FACTORY_NUM;
@ExcelProperty(value = "制造单位", index = 7)
String PRODUCE_UNIT_NAME;
}
package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 改造告知
*/
@Data
public class ReformVo {
@ExcelProperty(value = "申请单号", index = 0)
String applyNo;
@ExcelProperty(value = "申请日期", index = 1)
String createDate;
@ExcelProperty(value = "施工日期", index = 2)
String planDate;
@ExcelProperty(value = "设备种类", index = 3)
String equListName;
@ExcelProperty(value = "设备类别", index = 4)
String equCategoryName;
@ExcelProperty(value = "使用单位", index = 5)
String useUnitName;
@ExcelProperty(value = "安改维单位", index = 6)
String installUnitName;
@ExcelProperty(value = "接收机构", index = 7)
String receiveOrgName;
@ExcelProperty(value = "作废原因", index = 8)
String cancelReason;
@ExcelProperty(value = "办理状态", index = 9)
String noticeStatus;
@ExcelProperty(value = "办理日期", index = 10)
String acceptDate;
}
package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 使用登记
*/
@Data
public class RegistrationVo {
@ExcelProperty(value = "申请单号", index = 0)
String applyNo;
@ExcelProperty(value = "申请日期", index = 1)
String createDate;
@ExcelProperty(value = "设备种类", index = 2)
String equListName;
@ExcelProperty(value = "设备类别", index = 3)
String equCategory;
@ExcelProperty(value = "设备品种", index = 4)
String equDefine;
@ExcelProperty(value = "设备代码", index = 5)
String equCode;
@ExcelProperty(value = "使用登记证编号", index = 6)
String useRegistrationCode;
@ExcelProperty(value = "96333识别码", index = 7)
String code96333;
@ExcelProperty(value = "监管码", index = 8)
String supervisoryCode;
@ExcelProperty(value = "设备地址", index = 9)
String fullAddress;
@ExcelProperty(value = "详细地址", index = 10)
String detailedAddress;
@ExcelProperty(value = "使用单位", index = 11)
String useUnitName;
@ExcelProperty(value = "接收机构", index = 12)
String receiveOrgName;
@ExcelProperty(value = "属地监管部门", index = 13)
String orgBranchName;
@ExcelProperty(value = "作废原因", index = 14)
String cancelReason;
@ExcelProperty(value = "办理状态", index = 15)
String status;
@ExcelProperty(value = "办理日期", index = 16)
String auditPassDate;
}
package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 注销报废
*/
@Data
public class ScrapCancelVo {
@ExcelProperty(value = "申请单号", index = 0)
String applyNo;
@ExcelProperty(value = "申请日期", index = 1)
String createDate;
@ExcelProperty(value = "设备种类", index = 2)
String equListName;
@ExcelProperty(value = "使用登记证编号", index = 3)
String useRegistrationCode;
@ExcelProperty(value = "使用单位", index = 4)
String useUnitName;
@ExcelProperty(value = "接收机构", index = 5)
String receiveOrgName;
@ExcelProperty(value = "注销类型", index = 6)
String cancelType;
@ExcelProperty(value = "办理状态", index = 7)
String auditStatus;
@ExcelProperty(value = "办理日期", index = 8)
String auditPassDate;
@ExcelIgnore
@ApiModelProperty(value = "设备种类code")
private String equListCode;
}
package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 移装告知
*/
@Data
public class TransferVo {
@ExcelProperty(value = "子业务类型", index = 0)
String transferType;
@ExcelProperty(value = "申请单号", index = 1)
String applyNo;
@ExcelProperty(value = "申请日期", index = 2)
String createDate;
@ExcelProperty(value = "设备种类", index = 3)
String equList;
@ExcelProperty(value = "设备类别", index = 4)
String equCategory;
@ExcelProperty(value = "使用单位", index = 5)
String useUnitName;
@ExcelProperty(value = "安改维单位", index = 6)
String installUnitName;
@ExcelProperty(value = "接收机构", index = 7)
String receiveOrgName;
@ExcelProperty(value = "办理状态", index = 8)
String noticeStatus;
@ExcelProperty(value = "办理日期", index = 9)
String handleDate;
}
package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 未纳管设备
*/
@Data
public class UnregulatedEquipVo {
@ExcelProperty(value = "设备来源", index = 0)
String DATA_SOURCE_NAME;
@ExcelProperty(value = "设备种类", index = 1)
String EQU_LIST;
@ExcelProperty(value = "设备类别", index = 2)
String EQU_CATEGORY;
@ExcelProperty(value = "设备品种", index = 3)
String EQU_DEFINE;
@ExcelProperty(value = "设备名称", index = 4)
String PRODUCT_NAME;
@ExcelProperty(value = "设备代码", index = 5)
String EQU_CODE;
@ExcelProperty(value = "出厂编号/产品编码", index = 6)
String FACTORY_NUM;
@ExcelProperty(value = "制造单位", index = 7)
String PRODUCE_UNIT_NAME;
}
package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 车气登记
*/
@Data
public class VehicleInformationVo {
@ExcelProperty(value = "申请单号", index = 0)
String applyNo;
@ExcelProperty(value = "申请日期", index = 1)
String createDate;
@ExcelProperty(value = "使用单位名称", index = 2)
String useUnitName;
@ExcelProperty(value = "接收机构", index = 3)
String receiveOrgName;
@ExcelProperty(value = "检验单位", index = 4)
String inspectUnitName;
@ExcelProperty(value = "安装单位名称", index = 5)
String installUnitName;
@ExcelProperty(value = "使用登记编号", index = 6)
String useRegistrationCode;
@ExcelProperty(value = "车牌号", index = 7)
String carNumber;
@ExcelProperty(value = "气瓶数量", index = 8)
String gasNum;
@ExcelProperty(value = "作废原因", index = 9)
String cancelReason;
@ExcelProperty(value = "办理状态", index = 10)
String status;
@ExcelProperty(value = "办理日期", index = 11)
String auditPassDate;
}
......@@ -17,28 +17,32 @@
where name_change_registration_id = #{changeRegistrationId}
</delete>
<select id="getListPage" resultType="java.util.Map">
<sql id="page_list">
select ur.sequence_nbr as sequenceNbr,
ur.instance_id as instanceId,
ur.audit_status as auditStatus,
ur.apply_no as applyNo,
DATE_FORMAT(ur.rec_date,'%Y-%m-%d') as recDate,
DATE_FORMAT(ur.create_date,'%Y-%m-%d') as createDate,
DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
ur.receive_org_code as receiveOrgCode,
ur.receive_org_name as receiveOrgName,
ur.receive_company_code as receiveCompanyCode,
ur.use_unit_name as useUnitName,
ur.new_use_unit_name AS newUseUnitName,
ur.promoter,
ur.create_user_id as createUserId,
ur.next_executor_ids as nextExecutorIds,
ur.next_execute_user_ids as nextExecuteUserIds,
ur.next_task_id as nextTaskId,
(select group_concat(use_registration_code) from (SELECT use_registration_code from tzs_jg_use_registration_manage where sequence_nbr in (SELECT
certificate_seq from tzs_jg_change_registration_name_eq where name_change_registration_id = ur.sequence_nbr )order by rec_date desc)) as
certificateCodes
ur.instance_id as instanceId,
ur.audit_status as auditStatus,
ur.apply_no as applyNo,
DATE_FORMAT(ur.rec_date,'%Y-%m-%d') as recDate,
DATE_FORMAT(ur.create_date,'%Y-%m-%d') as createDate,
DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
ur.receive_org_code as receiveOrgCode,
ur.receive_org_name as receiveOrgName,
ur.receive_company_code as receiveCompanyCode,
ur.use_unit_name as useUnitName,
ur.new_use_unit_name AS newUseUnitName,
ur.promoter,
ur.create_user_id as createUserId,
ur.next_executor_ids as nextExecutorIds,
ur.next_execute_user_ids as nextExecuteUserIds,
ur.next_task_id as nextTaskId,
(select group_concat(use_registration_code) from (SELECT use_registration_code from tzs_jg_use_registration_manage where sequence_nbr in (SELECT
certificate_seq from tzs_jg_change_registration_name_eq where name_change_registration_id = ur.sequence_nbr )order by rec_date desc)) as
certificateCodes
from tzs_jg_change_registration_name ur
</sql>
<select id="getListPage" resultType="java.util.Map">
<include refid="page_list"/>
<where>
and ur.is_delete = 0
<if test="dto.auditStatus != null and dto.auditStatus != ''">
......@@ -81,6 +85,21 @@
ur.create_date DESC, ur.apply_no DESC
</select>
<select id="queryChangeRegistrationNameInIds" resultType="com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.ChangeRegistrationNameVo">
<include refid="page_list"/>
<where>
<if test='ids != null'>
and ur.sequence_nbr in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
order by
ur.create_date DESC, ur.apply_no DESC
</select>
<delete id="deleteHistoryInfoById">
delete
from tzs_jg_registration_history
......
......@@ -6,41 +6,44 @@
where sequence_nbr = #{id}
</update>
<select id="getListPage" resultType="java.util.Map">
<sql id="page_list">
select ur.sequence_nbr as sequenceNbr,
ur.audit_status as auditStatus,
ur.use_unit_name as useUnitName,
ur.use_registration_code as useRegistrationCode,
ur.status,
ur.receive_org_name as receiveOrgName,
DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate,
DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
DATE_FORMAT(ur.create_date,'%Y-%m-%d') as createDate,
(SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
jri.PRODUCT_NAME as productName,
jri.EQU_CODE as equCode,
use.USE_INNER_CODE as innerCode,
concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME,use.STREET_NAME) as place,
use."ADDRESS" as detailedAddress,
ifnull(ur.instance_id, '') as instanceId,
re.equ_id as equipId,
ur.apply_no as applyNo,
ifnull(ur.next_executor_ids,'') as nextExecutorIds,
ur.promoter,
ur.supervisory_code as supervisoryCode,
ur.next_execute_user_ids as nextExecuteUserIds,
ur.next_task_id as nextTaskId,
ur.create_user_id as createUserId,
oi.CODE96333 as code96333,
ur.cancel_reason as cancelReason,
(SELECT name from tz_equipment_category ec WHERE ec.code = jri.EQU_LIST) AS equList,
(select name from tz_equipment_category ec WHERE ec.code = jri.EQU_DEFINE) AS equDefine
ur.audit_status as auditStatus,
ur.use_unit_name as useUnitName,
ur.use_registration_code as useRegistrationCode,
ur.status,
ur.receive_org_name as receiveOrgName,
DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate,
DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
DATE_FORMAT(ur.create_date,'%Y-%m-%d') as createDate,
(SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
jri.PRODUCT_NAME as productName,
jri.EQU_CODE as equCode,
use.USE_INNER_CODE as innerCode,
concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME,use.STREET_NAME) as place,
use."ADDRESS" as detailedAddress,
ifnull(ur.instance_id, '') as instanceId,
re.equ_id as equipId,
ur.apply_no as applyNo,
ifnull(ur.next_executor_ids,'') as nextExecutorIds,
ur.promoter,
ur.supervisory_code as supervisoryCode,
ur.next_execute_user_ids as nextExecuteUserIds,
ur.next_task_id as nextTaskId,
ur.create_user_id as createUserId,
oi.CODE96333 as code96333,
ur.cancel_reason as cancelReason,
(SELECT name from tz_equipment_category ec WHERE ec.code = jri.EQU_LIST) AS equList,
(select name from tz_equipment_category ec WHERE ec.code = jri.EQU_DEFINE) AS equDefine
from tzs_jg_change_registration_reform ur
LEFT JOIN tzs_jg_change_registration_reform_eq re on ur.sequence_nbr = re.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info jri on jri.RECORD = re.equ_id
LEFT JOIN idx_biz_jg_use_info use on use.RECORD = re.equ_id
LEFT JOIN idx_biz_jg_other_info oi ON oi.RECORD = re.equ_id
LEFT JOIN tzs_jg_change_registration_reform_eq re on ur.sequence_nbr = re.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info jri on jri.RECORD = re.equ_id
LEFT JOIN idx_biz_jg_use_info use on use.RECORD = re.equ_id
LEFT JOIN idx_biz_jg_other_info oi ON oi.RECORD = re.equ_id
</sql>
<select id="getListPage" resultType="java.util.Map">
<include refid="page_list"/>
<where>
and ur.is_delete = 0
<if test="dto.auditStatus != null and dto.auditStatus != ''">
......@@ -109,6 +112,21 @@
</if>
ur.create_date DESC, ur.apply_no DESC
</select>
<select id="queryChangeRegistrationReformInIds" resultType="com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.ChangeRegistrationReformVo">
<include refid="page_list"/>
<where>
<if test='ids != null'>
and ur.sequence_nbr in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
order by
ur.create_date DESC, ur.apply_no DESC
</select>
<select id="getDetail" resultType="java.util.Map">
SELECT jri.EQU_CODE as equCode,
jri.EQU_CATEGORY as equCategory,
......
......@@ -7,41 +7,44 @@
where sequence_nbr = #{id}
</update>
<select id="getListPage" resultType="java.util.Map">
<sql id="page_list">
WITH crteq_limited AS (
SELECT
*,
ROW_NUMBER() OVER (PARTITION BY equip_transfer_id ORDER BY rec_date desc) as rn
FROM tzs_jg_change_registration_transfer_eq
SELECT
*,
ROW_NUMBER() OVER (PARTITION BY equip_transfer_id ORDER BY rec_date desc) as rn
FROM tzs_jg_change_registration_transfer_eq
)
select
crt.sequence_nbr as sequenceNbr,
crt.audit_status as auditStatus,
DATE_FORMAT(crt.reg_date,'%Y-%m-%d') as regDate,
DATE_FORMAT(crt.create_date,'%Y-%m-%d') as createDate,
crt.status,
crt.receive_org_name as receiveOrgName,
crt.apply_no as applyNo,
crt.next_executor_ids AS nextExecutorIds,
crt.promoter,
DATE_FORMAT(crt.rec_date,'%Y-%m-%d') as recDate,
crt.instance_id as instanceId,
crt.use_registration_code as useRegistrationCode,
crt.next_execute_user_ids as nextExecuteUserIds,
crt.create_user_id as createUserId,
crt.next_task_id as nextTaskId,
crt.full_address as fullAddress,
use.USE_UNIT_NAME as useUnitName,
jri.PRODUCT_NAME as productName,
jri.EQU_CODE as equCode,
concat(use."PROVINCE_NAME", '', use."CITY_NAME", '', use."COUNTY_NAME", '', use."STREET_NAME") as allAddress,
(SELECT name from tz_equipment_category WHERE code = jri.EQU_LIST) AS equList,
(SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
(SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as equDefine
crt.sequence_nbr as sequenceNbr,
crt.audit_status as auditStatus,
DATE_FORMAT(crt.reg_date,'%Y-%m-%d') as regDate,
DATE_FORMAT(crt.create_date,'%Y-%m-%d') as createDate,
crt.status,
crt.receive_org_name as receiveOrgName,
crt.apply_no as applyNo,
crt.next_executor_ids AS nextExecutorIds,
crt.promoter,
DATE_FORMAT(crt.rec_date,'%Y-%m-%d') as recDate,
crt.instance_id as instanceId,
crt.use_registration_code as useRegistrationCode,
crt.next_execute_user_ids as nextExecuteUserIds,
crt.create_user_id as createUserId,
crt.next_task_id as nextTaskId,
crt.full_address as fullAddress,
use.USE_UNIT_NAME as useUnitName,
jri.PRODUCT_NAME as productName,
jri.EQU_CODE as equCode,
concat(use."PROVINCE_NAME", '', use."CITY_NAME", '', use."COUNTY_NAME", '', use."STREET_NAME") as allAddress,
(SELECT name from tz_equipment_category WHERE code = jri.EQU_LIST) AS equList,
(SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
(SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as equDefine
from tzs_jg_change_registration_transfer crt
LEFT JOIN crteq_limited crteq ON crt.sequence_nbr = crteq.equip_transfer_id AND crteq.rn = 1
LEFT JOIN idx_biz_jg_register_info jri on crteq.equ_id = jri.RECORD
LEFT JOIN idx_biz_jg_use_info use on crteq.equ_id = use.RECORD
LEFT JOIN crteq_limited crteq ON crt.sequence_nbr = crteq.equip_transfer_id AND crteq.rn = 1
LEFT JOIN idx_biz_jg_register_info jri on crteq.equ_id = jri.RECORD
LEFT JOIN idx_biz_jg_use_info use on crteq.equ_id = use.RECORD
</sql>
<select id="getListPage" resultType="java.util.Map">
<include refid="page_list"/>
<where>
and crt.is_delete = 0
<if test="dto.equCategory != null and dto.equCategory != ''">
......@@ -111,6 +114,21 @@
</if>
crt.create_date DESC, crt.apply_no DESC
</select>
<select id="queryChangeRegistrationTransferInIds" resultType="com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.ChangeRegistrationTransferVo">
<include refid="page_list"/>
<where>
<if test='ids != null'>
and crt.sequence_nbr in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
order by
crt.create_date DESC, crt.apply_no DESC
</select>
<select id="queryForFlowingEquipList" resultType="java.lang.String">
select change_data
from tzs_jg_registration_history his,
......
......@@ -70,6 +70,23 @@
isn.create_date DESC, isn.apply_no DESC
</select>
<select id="queryChangeRegistrationUnitInIds" resultType="com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.ChangeRegistrationUnitVo">
select
isn.*
FROM
tzs_jg_change_registration_unit isn
<where>
<if test='ids != null'>
and isn.sequence_nbr in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
ORDER BY
isn.create_date DESC, isn.apply_no DESC
</select>
<select id="queryEquipInformation" resultType="java.util.Map">
select
isn.sequence_nbr AS sequenceNbr,
......
......@@ -37,32 +37,35 @@
</foreach>
</select>
<select id="getPage"
resultType="java.util.Map">
<sql id="page_list">
select
cru.sequence_nbr as sequenceNbr,
cru.change_type as changeType,
cru.apply_no as applyNo,
date_format(cru.apply_date,'%Y-%m-%d') as applyDate,
date_format(cru.create_date,'%Y-%m-%d') as createDate,
date_format(cru.audit_pass_date,'%Y-%m-%d') as auditPassDate,
cru.receive_org_name as receiveOrgName,
cru.receive_org_code as receiveOrgCode,
cru.use_unit_name as useUnitName,
cru.new_use_unit_name as newUseUnitName,
cru.transfer_to_user_ids as transferToUserIds,
cru.car_number as carNumber,
COALESCE(cru.new_car_number, cru.car_number) as newCarNumber,
cru.next_execute_user_ids as nextExecuteUserIds,
cru.next_task_id as nextTaskId,
cru.use_regist_code as useRegistCode,
cru.status,
cru.instance_status as instanceStatus,
cru.promoter,
cru.next_executor_ids as nextExecutorIds,
cru.instance_id as instanceId,
cru.create_user_id as createUserId
cru.sequence_nbr as sequenceNbr,
cru.change_type as changeType,
cru.apply_no as applyNo,
date_format(cru.apply_date,'%Y-%m-%d') as applyDate,
date_format(cru.create_date,'%Y-%m-%d') as createDate,
date_format(cru.audit_pass_date,'%Y-%m-%d') as auditPassDate,
cru.receive_org_name as receiveOrgName,
cru.receive_org_code as receiveOrgCode,
cru.use_unit_name as useUnitName,
cru.new_use_unit_name as newUseUnitName,
cru.transfer_to_user_ids as transferToUserIds,
cru.car_number as carNumber,
COALESCE(cru.new_car_number, cru.car_number) as newCarNumber,
cru.next_execute_user_ids as nextExecuteUserIds,
cru.next_task_id as nextTaskId,
cru.use_regist_code as useRegistCode,
cru.status,
cru.instance_status as instanceStatus,
cru.promoter,
cru.next_executor_ids as nextExecutorIds,
cru.instance_id as instanceId,
cru.create_user_id as createUserId
from tzs_jg_change_vehicle_registration_unit cru
</sql>
<select id="getPage"
resultType="java.util.Map">
<include refid="page_list"/>
<where>
<if test="dto.applyNo != null and dto.applyNo != ''">
and cru.apply_no like concat('%', #{dto.applyNo}, '%')
......@@ -101,6 +104,19 @@
order by cru.create_date DESC, cru.apply_no DESC
</select>
<select id="queryChangeVehicleRegistrationUnitInIds" resultType="com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.ChangeVehicleRegistrationUnitVo">
<include refid="page_list"/>
<where>
<if test='ids != null'>
and cru.sequence_nbr in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
order by cru.create_date DESC, cru.apply_no DESC
</select>
<select id="queryForFlowingEquipList" resultType="com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto">
select a.use_unit_credit_code as companyCode,
group_concat(b.equ_id) as records
......
......@@ -2,29 +2,32 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgEnableDisableMapper">
<select id="pageList" resultType="java.util.Map">
<sql id="page_list">
SELECT
CASE
when jed.apply_type = 'SB_TY' then '设备停用'
else '设备启用' end as applyType,
jed.sequence_nbr as sequenceNbr,
jed.apply_no as applyNo,
jed.equ_list_code as equListCode,
jed.equ_list_name as equListName,
date_format(jed.apply_date, '%Y-%m-%d') as applyDate,
date_format(jed.create_date, '%Y-%m-%d') as createDate,
date_format(jed.audit_pass_date, '%Y-%m-%d') as auditPassDate,
jed.receive_org_name as receiveOrgName,
jed.use_registration_code as useRegistrationCode,
jed.audit_status as auditStatus,
jed.instance_id as instanceId,
jed.execute_sequence as executeSequence,
jed.next_executor_ids as nextExecutorIds,
jed.promoter,
jed.next_execute_user_ids as nextExecuteUserIds,
jed.create_user_id as createUserId,
jed.next_task_id as nextTaskId
jed.sequence_nbr as sequenceNbr,
jed.apply_no as applyNo,
jed.equ_list_code as equListCode,
jed.equ_list_name as equListName,
date_format(jed.apply_date, '%Y-%m-%d') as applyDate,
date_format(jed.create_date, '%Y-%m-%d') as createDate,
date_format(jed.audit_pass_date, '%Y-%m-%d') as auditPassDate,
jed.receive_org_name as receiveOrgName,
jed.use_registration_code as useRegistrationCode,
jed.audit_status as auditStatus,
jed.instance_id as instanceId,
jed.execute_sequence as executeSequence,
jed.next_executor_ids as nextExecutorIds,
jed.promoter,
jed.next_execute_user_ids as nextExecuteUserIds,
jed.create_user_id as createUserId,
jed.next_task_id as nextTaskId
FROM tzs_jg_enable_disable jed
</sql>
<select id="pageList" resultType="java.util.Map">
<include refid="page_list"/>
<where>
jed.is_delete = 0
<if test="dto.applyNo != null and dto.applyNo != '' ">
......@@ -65,6 +68,22 @@
</if>
jed.create_date DESC, jed.apply_no DESC
</select>
<select id="queryEnableDisableInIds"
resultType="com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.EnableDisableVo">
<include refid="page_list"/>
<where>
<if test='ids != null'>
and jed.sequence_nbr in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
order by
jed.create_date DESC, jed.apply_no DESC
</select>
<select id="getDetail" resultType="java.util.Map">
SELECT jed.sequence_nbr as sequenceNbr,
concat(jed.receive_company_code, '_', jed.receive_org_name) as receiveOrgCode,
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferMapper">
<select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto">
select
<sql id="page_list">
select
jet.sequence_nbr AS sequenceNbr,
jet.apply_no AS applyNo,
jet.use_unit_credit_code AS useUnitCreditCode,
......@@ -58,17 +58,20 @@
jet.next_task_id as nextTaskId,
oi.SUPERVISORY_CODE AS supervisoryCode,
oi.CODE96333 as code96333,
(select name from tz_equipment_category tec1 where tec1.code = ri."EQU_LIST") AS equList,
(select name from tz_equipment_category tec2 where tec2.code = ri."EQU_CATEGORY") AS equCategory,
(select name from tz_equipment_category tec3 where tec3.code = ri."EQU_DEFINE") AS equDefine
(select name from tz_equipment_category tec1 where tec1.code = ri."EQU_LIST") AS equList,
(select name from tz_equipment_category tec2 where tec2.code = ri."EQU_CATEGORY") AS equCategory,
(select name from tz_equipment_category tec3 where tec3.code = ri."EQU_DEFINE") AS equDefine
FROM
tzs_jg_equip_transfer jet
LEFT JOIN tzs_jg_equip_transfer_eq ete ON ete.equip_transfer_id = jet.sequence_nbr
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = ete.equ_id
LEFT JOIN idx_biz_jg_design_info di ON di.record = ete.equ_id
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = ete.equ_id
LEFT JOIN idx_biz_jg_use_info ui ON ui.record = ete.equ_id
LEFT JOIN idx_biz_jg_other_info oi ON oi.RECORD = ete.equ_id
LEFT JOIN tzs_jg_equip_transfer_eq ete ON ete.equip_transfer_id = jet.sequence_nbr
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = ete.equ_id
LEFT JOIN idx_biz_jg_design_info di ON di.record = ete.equ_id
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = ete.equ_id
LEFT JOIN idx_biz_jg_use_info ui ON ui.record = ete.equ_id
LEFT JOIN idx_biz_jg_other_info oi ON oi.RECORD = ete.equ_id
</sql>
<select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto">
<include refid="page_list"/>
<where>
jet.is_delete = false
<if test="param != null ">
......@@ -148,6 +151,21 @@
</if>
jet.apply_date DESC
</select>
<select id="queryEquipTransferInIds" resultType="com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.EquipTransferVo">
<include refid="page_list"/>
<where>
<if test='ids != null'>
and jet.sequence_nbr in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
ORDER BY
jet.apply_date DESC
</select>
<select id="queryEquipInformation" resultType="java.util.Map">
select
jet.sequence_nbr AS sequenceNbr,
......
......@@ -2,36 +2,40 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeMapper">
<select id="queryForPage" resultType="java.util.Map">
<sql id="page_list">
select
isn.sequence_nbr AS sequenceNbr,
isn.apply_no AS applyNo,
isn.supervisory_code AS supervisoryCode,
DATE_FORMAT(isn.notice_date,'%Y-%m-%d') AS noticeDate,
isn.use_unit_name AS useUnitName,
isn.receive_org_name AS receiveOrgName,
isn.region_no AS regionNo,
DATE_FORMAT(isn.install_start_date,'%Y-%m-%d') AS installStartDate,
DATE_FORMAT(isn.create_date,'%Y-%m-%d') AS createDate,
isn.address AS address,
isn.notice_status AS noticeStatus,
isn.install_unit_name AS installUnitName,
isn.province_name AS provinceName,
isn.city_name AS cityName,
isn.county_name AS countyName,
isn.instance_id AS instanceId,
isn.inform_number AS informNumber,
isn.promoter,
isn.next_execute_ids AS nextExecuteIds,
isn.instance_status AS instanceStatus,
DATE_FORMAT(isn.handle_date,'%Y-%m-%d') AS handleDate,
isn.notice_report_url AS noticeReportUrl,
isn.create_user_id as createUserId,
isn.next_task_id AS nextTaskId,
isn.next_execute_user_ids as nextExecuteUserIds,
(SELECT name from tz_equipment_category where code = isn.equ_list_code) AS equListName,
(SELECT name from tz_equipment_category where code = isn.equ_category_code) AS equList,
isn.cancel_reason as cancelReason
isn.sequence_nbr AS sequenceNbr,
isn.apply_no AS applyNo,
isn.supervisory_code AS supervisoryCode,
DATE_FORMAT(isn.notice_date,'%Y-%m-%d') AS noticeDate,
isn.use_unit_name AS useUnitName,
isn.receive_org_name AS receiveOrgName,
isn.region_no AS regionNo,
DATE_FORMAT(isn.install_start_date,'%Y-%m-%d') AS installStartDate,
DATE_FORMAT(isn.create_date,'%Y-%m-%d') AS createDate,
isn.address AS address,
isn.notice_status AS noticeStatus,
isn.install_unit_name AS installUnitName,
isn.province_name AS provinceName,
isn.city_name AS cityName,
isn.county_name AS countyName,
isn.instance_id AS instanceId,
isn.inform_number AS informNumber,
isn.promoter,
isn.next_execute_ids AS nextExecuteIds,
isn.instance_status AS instanceStatus,
DATE_FORMAT(isn.handle_date,'%Y-%m-%d') AS handleDate,
isn.notice_report_url AS noticeReportUrl,
isn.create_user_id as createUserId,
isn.next_task_id AS nextTaskId,
isn.next_execute_user_ids as nextExecuteUserIds,
(SELECT name from tz_equipment_category where code = isn.equ_list_code) AS equListName,
(SELECT name from tz_equipment_category where code = isn.equ_category_code) AS equList,
isn.cancel_reason as cancelReason
</sql>
<select id="queryForPage" resultType="java.util.Map">
<include refid="page_list"/>
FROM tzs_jg_installation_notice isn
<where>
isn.is_delete = false
......@@ -180,4 +184,20 @@
and (a.notice_status <![CDATA[ <> ]]> '6614' and a.notice_status <![CDATA[ <> ]]> '6615' and a.notice_status <![CDATA[ <> ]]>'6610' and a.notice_status <![CDATA[ <> ]]>'6617')
GROUP BY a.install_unit_credit_code
</select>
<select id="queryInstallationInIds" resultType="com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.InstallationVo">
<include refid="page_list"/>
from tzs_jg_installation_notice isn
<where>
<if test='ids != null'>
and isn.sequence_nbr in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
ORDER BY
isn.create_date DESC, isn.apply_no DESC
</select>
</mapper>
......@@ -6,71 +6,73 @@
set promoter = null
where sequence_nbr = #{id}
</update>
<select id="queryForPage" resultType="java.util.Map">
<sql id="page_list">
select
isn.sequence_nbr AS sequenceNbr,
isn.apply_no AS applyNo,
DATE_FORMAT(isn.notice_date,'%Y-%m-%d') AS noticeDate,
isn.notice_status AS noticeStatus,
isn.install_unit_credit_code AS installUnitCreditCode,
isn.install_unit_name AS installUnitName,
isn.equip_num AS equipNum,
isn.instance_id AS instanceId,
isn.next_executor_ids AS nextExecutorIds,
isn.execute_sequence AS executeSequence,
DATE_FORMAT(isn.rec_date,'%Y-%m-%d') AS recDate,
DATE_FORMAT(isn.create_date,'%Y-%m-%d') AS createDate,
isn.rec_user_id AS recUserId,
isn.create_user_id AS createUserId,
isn.rec_user_name AS recUserName,
isn.create_user_name AS createUserName,
isn.is_delete AS isDelete,
isn.remark AS remark,
isn.instance_status AS instanceStatus,
DATE_FORMAT(isn.accept_date,'%Y-%m-%d') AS acceptDate,
isn.province AS province,
isn.city AS city,
isn.county AS county,
isn.street AS street,
isn.address AS address,
DATE_FORMAT(isn.plan_date,'%Y-%m-%d') AS planDate,
isn.receive_company_code AS receiveCompanyCode,
isn.receive_org_name AS receiveOrgName,
isn.construction_manager AS constructionManager,
isn.construction_manager_id AS constructionManagerId,
isn.construction_manager_phone AS constructionManagerPhone,
isn.inspection_unit_credit_code AS inspectionUnitCreditCode,
isn.inspection_unit_name AS inspectionUnitName,
isn.entrusting_unit_credit_code AS entrustingUnitCreditCode,
isn.entrusting_unit_name AS entrustingUnitName,
isn.power_of_attorney AS powerOfAttorney,
isn.construction_contract AS constructionContract,
isn.is_signed_with_a AS isSignedWithA,
isn.use_unit_credit_code AS useUnitCreditCode,
isn.use_unit_name AS useUnitName,
isn.maintain_type AS maintainType,
isn.is_inspected AS isInspected,
isn.receive_org_code AS receiveOrgCode,
isn.factory_use_site_street AS factoryUseSiteStreet,
isn.street_name AS streetName,
isn.province_name AS provinceName,
isn.city_name AS cityName,
isn.county_name AS countyName,
isn.notice_report_url AS noticeReportUrl,
isn.promoter AS promoter,
isn.equ_list_code AS equListCode,
isn.equ_category AS equCategory,
isn.next_execute_ids AS nextExecuteIds,
isn.status AS status,
isn.next_task_id AS nextTaskId,
isn.create_user_company_name AS createUserCompanyName,
isn.next_execute_user_ids AS nextExecuteUserIds,
isn.transfer_to_user_ids AS transferToUserIds,
isn.cancel_reason AS cancelReason,
(SELECT name from tz_equipment_category ec WHERE ec.code = isn.equ_list_code) AS equListName,
DATE_FORMAT(isn.create_date,'%Y-%m-%d') AS createDate,
(select name from tz_equipment_category ec WHERE ec.code = isn.equ_category) AS equCategoryName
isn.sequence_nbr AS sequenceNbr,
isn.apply_no AS applyNo,
DATE_FORMAT(isn.notice_date,'%Y-%m-%d') AS noticeDate,
isn.notice_status AS noticeStatus,
isn.install_unit_credit_code AS installUnitCreditCode,
isn.install_unit_name AS installUnitName,
isn.equip_num AS equipNum,
isn.instance_id AS instanceId,
isn.next_executor_ids AS nextExecutorIds,
isn.execute_sequence AS executeSequence,
DATE_FORMAT(isn.rec_date,'%Y-%m-%d') AS recDate,
DATE_FORMAT(isn.create_date,'%Y-%m-%d') AS createDate,
isn.rec_user_id AS recUserId,
isn.create_user_id AS createUserId,
isn.rec_user_name AS recUserName,
isn.create_user_name AS createUserName,
isn.is_delete AS isDelete,
isn.remark AS remark,
isn.instance_status AS instanceStatus,
DATE_FORMAT(isn.accept_date,'%Y-%m-%d') AS acceptDate,
isn.province AS province,
isn.city AS city,
isn.county AS county,
isn.street AS street,
isn.address AS address,
DATE_FORMAT(isn.plan_date,'%Y-%m-%d') AS planDate,
isn.receive_company_code AS receiveCompanyCode,
isn.receive_org_name AS receiveOrgName,
isn.construction_manager AS constructionManager,
isn.construction_manager_id AS constructionManagerId,
isn.construction_manager_phone AS constructionManagerPhone,
isn.inspection_unit_credit_code AS inspectionUnitCreditCode,
isn.inspection_unit_name AS inspectionUnitName,
isn.entrusting_unit_credit_code AS entrustingUnitCreditCode,
isn.entrusting_unit_name AS entrustingUnitName,
isn.power_of_attorney AS powerOfAttorney,
isn.construction_contract AS constructionContract,
isn.is_signed_with_a AS isSignedWithA,
isn.use_unit_credit_code AS useUnitCreditCode,
isn.use_unit_name AS useUnitName,
isn.maintain_type AS maintainType,
isn.is_inspected AS isInspected,
isn.receive_org_code AS receiveOrgCode,
isn.factory_use_site_street AS factoryUseSiteStreet,
isn.street_name AS streetName,
isn.province_name AS provinceName,
isn.city_name AS cityName,
isn.county_name AS countyName,
isn.notice_report_url AS noticeReportUrl,
isn.promoter AS promoter,
isn.equ_list_code AS equListCode,
isn.equ_category AS equCategory,
isn.next_execute_ids AS nextExecuteIds,
isn.status AS status,
isn.next_task_id AS nextTaskId,
isn.create_user_company_name AS createUserCompanyName,
isn.next_execute_user_ids AS nextExecuteUserIds,
isn.transfer_to_user_ids AS transferToUserIds,
isn.cancel_reason AS cancelReason,
(SELECT name from tz_equipment_category ec WHERE ec.code = isn.equ_list_code) AS equListName,
DATE_FORMAT(isn.create_date,'%Y-%m-%d') AS createDate,
(select name from tz_equipment_category ec WHERE ec.code = isn.equ_category) AS equCategoryName
</sql>
<select id="queryForPage" resultType="java.util.Map">
<include refid="page_list"/>
FROM tzs_jg_maintain_notice isn
<where>
isn.is_delete = 0
......@@ -263,4 +265,19 @@
and a.notice_status = '6612'
GROUP BY a.install_unit_credit_code
</select>
<select id="queryMaintainInIds" resultType="com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.MaintainVo">
<include refid="page_list"/>
from tzs_jg_maintain_notice isn
<where>
<if test='ids != null'>
and isn.sequence_nbr in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
ORDER BY
isn.create_date DESC, isn.apply_no DESC
</select>
</mapper>
......@@ -15,7 +15,7 @@
</foreach>
</delete>
<select id="getContractList" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto">
<sql id="page_list">
SELECT
tjmc.sequence_nbr,
tjmc.apply_no,
......@@ -42,10 +42,14 @@
date_format(tjmc.create_date,'%Y-%m-%d') AS createDate,
concat(date_format(IFNULL(inform_start, null),'%Y-%m-%d'),' ~ ',date_format(IFNULL(inform_end, null),'%Y-%m-%d')) as informStartAndEnd
<!-- ri."EQU_CODE" as equCode,-->
<!-- (SELECT name from tz_equipment_category ec WHERE ec.code = ri.EQU_LIST) AS equList,-->
<!-- (select name from tz_equipment_category ec WHERE ec.code = ri.EQU_CATEGORY) AS equCategory,-->
<!-- (select name from tz_equipment_category ec WHERE ec.code = ri.EQU_DEFINE) AS equDefine-->
<!-- ri."EQU_CODE" as equCode,-->
<!-- (SELECT name from tz_equipment_category ec WHERE ec.code = ri.EQU_LIST) AS equList,-->
<!-- (select name from tz_equipment_category ec WHERE ec.code = ri.EQU_CATEGORY) AS equCategory,-->
<!-- (select name from tz_equipment_category ec WHERE ec.code = ri.EQU_DEFINE) AS equDefine-->
</sql>
<select id="getContractList" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto">
<include refid="page_list"/>
FROM
amos_tzs_biz.tzs_jg_maintenance_contract tjmc
<!-- LEFT JOIN tzs_jg_maintenance_contract_eq tjmce ON tjmce.equip_transfer_id = tjmc.sequence_nbr-->
......@@ -170,4 +174,19 @@
and a.status in ('监管单位待受理','维保单位待受理')
GROUP BY a.use_unit_code
</select>
<select id="queryMaintenanceInIds" resultType="com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.MaintenanceVo">
<include refid="page_list"/>
from amos_tzs_biz.tzs_jg_maintenance_contract tjmc
<where>
<if test='ids != null'>
and tjmc.sequence_nbr in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
ORDER BY
tjmc.create_date DESC, tjmc.apply_no DESC
</select>
</mapper>
......@@ -2,43 +2,46 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgReformNoticeMapper">
<select id="queryForPage" resultType="java.util.Map">
<sql id="page_list">
select
isn.province,
isn.city,
isn.county,
isn.street,
isn.promoter,
isn.sequence_nbr AS sequenceNbr,
isn.apply_no AS applyNo,
isn.use_unit_name AS useUnitName,
isn.receive_org_name AS receiveOrgName,
isn.address AS address,
isn.notice_status AS noticeStatus,
isn.install_unit_name AS installUnitName,
isn.province_name AS provinceName,
isn.notice_report_url AS noticeReportUrl,
isn.equ_list_code as equListCode,
isn.equ_list_name as equListName,
isn.equ_category_code as equCategoryCode,
isn.equ_category_name as equCategoryName,
isn.create_user_id as createUserId,
isn.next_execute_user_ids as nextExecuteUserIds,
isn.instance_id AS instanceId,
isn.city_name AS cityName,
isn.county_name AS countyName,
isn.street_name AS streetName,
isn.receive_company_code AS receiveCompanyCode,
isn.receive_org_name AS receiveOrgName,
isn.next_execute_ids as nextExecuteIds,
isn.instance_status AS instanceStatus,
isn.inform_number AS informNumber,
isn.next_task_id as nextTaskId,
isn.cancel_reason as cancelReason,
DATE_FORMAT(isn.plan_date,'%Y-%m-%d') AS planDate,
DATE_FORMAT(isn.notice_date,'%Y-%m-%d') AS noticeDate,
DATE_FORMAT(isn.accept_date,'%Y-%m-%d') AS acceptDate,
DATE_FORMAT(isn.create_date,'%Y-%m-%d') AS createDate
isn.province,
isn.city,
isn.county,
isn.street,
isn.promoter,
isn.sequence_nbr AS sequenceNbr,
isn.apply_no AS applyNo,
isn.use_unit_name AS useUnitName,
isn.receive_org_name AS receiveOrgName,
isn.address AS address,
isn.notice_status AS noticeStatus,
isn.install_unit_name AS installUnitName,
isn.province_name AS provinceName,
isn.notice_report_url AS noticeReportUrl,
isn.equ_list_code as equListCode,
isn.equ_list_name as equListName,
isn.equ_category_code as equCategoryCode,
isn.equ_category_name as equCategoryName,
isn.create_user_id as createUserId,
isn.next_execute_user_ids as nextExecuteUserIds,
isn.instance_id AS instanceId,
isn.city_name AS cityName,
isn.county_name AS countyName,
isn.street_name AS streetName,
isn.receive_company_code AS receiveCompanyCode,
isn.receive_org_name AS receiveOrgName,
isn.next_execute_ids as nextExecuteIds,
isn.instance_status AS instanceStatus,
isn.inform_number AS informNumber,
isn.next_task_id as nextTaskId,
isn.cancel_reason as cancelReason,
DATE_FORMAT(isn.plan_date,'%Y-%m-%d') AS planDate,
DATE_FORMAT(isn.notice_date,'%Y-%m-%d') AS noticeDate,
DATE_FORMAT(isn.accept_date,'%Y-%m-%d') AS acceptDate,
DATE_FORMAT(isn.create_date,'%Y-%m-%d') AS createDate
</sql>
<select id="queryForPage" resultType="java.util.Map">
<include refid="page_list"/>
FROM
tzs_jg_reform_notice isn
<where>
......@@ -193,4 +196,19 @@
and a.notice_status not in('6614','6615','6610','6617','6616')
GROUP BY a.install_unit_credit_code
</select>
<select id="queryReformInIds" resultType="com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.ReformVo">
<include refid="page_list"/>
from tzs_jg_reform_notice isn
<where>
<if test='ids != null'>
and isn.sequence_nbr in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
ORDER BY
isn.create_date DESC, isn.apply_no DESC
</select>
</mapper>
......@@ -8,8 +8,7 @@
where sequence_nbr = #{id}
</update>
<select id="getListPage" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto">
<sql id="page_list">
select
tjsc.sequence_nbr,
tjsc.instance_id,
......@@ -37,6 +36,10 @@
tjsc.use_registration_code,
tjsc.equ_list_code
from tzs_jg_scrap_cancel tjsc
</sql>
<select id="getListPage" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto">
<include refid="page_list"/>
<where>
tjsc.is_delete = 0
<if test="dto.auditStatus != null and dto.auditStatus != ''">
......@@ -81,6 +84,23 @@
</if>
tjsc.create_date DESC, tjsc.apply_no DESC
</select>
<select id="queryScrapCancelInIds" resultType="com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.ScrapCancelVo">
<include refid="page_list"/>
<where>
<if test='ids != null'>
and tjsc.sequence_nbr in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
order by
tjsc.create_date DESC, tjsc.apply_no DESC
</select>
<select id="getDetail" resultType="java.util.Map">
SELECT jri.EQU_CODE as equCode,
jri.EQU_CATEGORY as equCategory,
......
......@@ -2,35 +2,38 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgTransferNoticeMapper">
<select id="queryForPage" resultType="java.util.Map">
<sql id="page_list">
select
tjtn.sequence_nbr AS sequenceNbr,
tjtn.apply_no AS applyNo,
tjtn.use_unit_name AS useUnitName,
tjtn.receive_org_name AS receiveOrgName,
tjtn.address AS address,
tjtn.notice_status AS noticeStatus,
tjtn.install_unit_name AS installUnitName,
tjtn.province_name AS provinceName,
tjtn.city_name AS cityName,
tjtn.county_name AS countyName,
tjtn.street_name AS streetName,
tjtn.instance_id AS instanceId,
tjtn.transfer_type AS transferType,
tjtn.promoter AS promoter,
tjtn.next_execute_ids AS nextExecuteIds,
tjtn.instance_status AS instanceStatus,
tjtn.notice_report_url AS noticeReportUrl,
tjtn.inform_number AS informNumber,
tjtn.create_user_id as createUserId,
tjtn.next_execute_user_ids as nextExecuteUserIds,
tjtn.next_task_id AS nextTaskId,
tjtn.equ_category AS equCategory,
tjtn.equ_list AS equList,
DATE_FORMAT(tjtn.notice_date,'%Y-%m-%d') AS noticeDate,
DATE_FORMAT(tjtn.handle_date,'%Y-%m-%d') AS handleDate,
DATE_FORMAT(tjtn.plan_date,'%Y-%m-%d') AS planDate,
DATE_FORMAT(tjtn.create_date,'%Y-%m-%d') AS createDate
tjtn.sequence_nbr AS sequenceNbr,
tjtn.apply_no AS applyNo,
tjtn.use_unit_name AS useUnitName,
tjtn.receive_org_name AS receiveOrgName,
tjtn.address AS address,
tjtn.notice_status AS noticeStatus,
tjtn.install_unit_name AS installUnitName,
tjtn.province_name AS provinceName,
tjtn.city_name AS cityName,
tjtn.county_name AS countyName,
tjtn.street_name AS streetName,
tjtn.instance_id AS instanceId,
tjtn.transfer_type AS transferType,
tjtn.promoter AS promoter,
tjtn.next_execute_ids AS nextExecuteIds,
tjtn.instance_status AS instanceStatus,
tjtn.notice_report_url AS noticeReportUrl,
tjtn.inform_number AS informNumber,
tjtn.create_user_id as createUserId,
tjtn.next_execute_user_ids as nextExecuteUserIds,
tjtn.next_task_id AS nextTaskId,
tjtn.equ_category AS equCategory,
tjtn.equ_list AS equList,
DATE_FORMAT(tjtn.notice_date,'%Y-%m-%d') AS noticeDate,
DATE_FORMAT(tjtn.handle_date,'%Y-%m-%d') AS handleDate,
DATE_FORMAT(tjtn.plan_date,'%Y-%m-%d') AS planDate,
DATE_FORMAT(tjtn.create_date,'%Y-%m-%d') AS createDate
</sql>
<select id="queryForPage" resultType="java.util.Map">
<include refid="page_list"/>
FROM tzs_jg_transfer_notice tjtn
<where>
tjtn.is_delete = false
......@@ -200,4 +203,19 @@
and a.notice_status not in('6614','6615','6610','6617','6616')
GROUP BY a.install_unit_credit_code
</select>
<select id="queryTransferInIds" resultType="com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.TransferVo">
<include refid="page_list"/>
from tzs_jg_transfer_notice tjtn
<where>
<if test='ids != null'>
and tjtn.sequence_nbr in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
ORDER BY
tjtn.create_date DESC, tjtn.apply_no DESC
</select>
</mapper>
......@@ -199,4 +199,19 @@
ORDER BY tjurm.rec_date DESC
</where>
</select>
<select id="queryCertificateInIds" resultType="com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.CertificateVo">
<include refid="page_list"/>
from tzs_jg_use_registration_manage tjurm
<where>
<if test='ids != null'>
and tjurm.sequence_nbr in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
ORDER BY
tjurm.rec_date DESC
</select>
</mapper>
......@@ -124,6 +124,21 @@
</if>
ur.create_date DESC, ur.apply_no DESC
</select>
<select id="queryRegistrationInIds" resultType="com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.RegistrationVo">
<include refid="page-list"/>
<where>
<if test='ids != null'>
and ur.sequence_nbr in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
order by
ur.create_date DESC, ur.apply_no DESC
</select>
<select id="getDetail" resultType="java.util.Map">
SELECT
jri.RECORD as equipId,
......
......@@ -49,6 +49,21 @@
</if>
tjvi.create_date DESC, tjvi.apply_no DESC
</select>
<select id="queryVehicleInformationInIds" resultType="com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.VehicleInformationVo">
<include refid="page-list"/>
<where>
<if test='ids != null'>
and tjvi.sequence_nbr in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
order by
tjvi.create_date DESC, tjvi.apply_no DESC
</select>
<sql id="page-list">
select tjvi.sequence_nbr as sequenceNbr,
tjvi.audit_status as auditStatus,
......
package com.yeejoin.amos.boot.module.jg.biz.controller;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.jg.biz.service.IJgTableDataExportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
/**
* JG表格数据导出
*/
@RestController
@Api(tags = "JG表格数据导出")
@RequestMapping(value = "/dataExport")
public class JgTableDataExportController extends BaseController {
private IJgTableDataExportService iJgTableDataExportService;
public JgTableDataExportController(IJgTableDataExportService iJgTableDataExportService) {
this.iJgTableDataExportService = iJgTableDataExportService;
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/gen")
@ApiOperation(httpMethod = "GET", value = "工具辅助接口", notes = "工具辅助接口")
public ResponseModel<String> httGen(String jsonName, String voName, String tableName) {
iJgTableDataExportService.gen(jsonName, voName, tableName);
return ResponseHelper.buildResponse("Ok");
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/certificate")
@ApiOperation(httpMethod = "GET", value = "登记证列表数据导出", notes = "登记证列表数据导出")
public void certificateExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
iJgTableDataExportService.certificate(response, Arrays.asList(ids.split(",")));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/maintenance")
@ApiOperation(httpMethod = "GET", value = "维保备案列表数据导出", notes = "维保备案列表数据导出")
public void maintenanceExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
iJgTableDataExportService.maintenance(response, Arrays.asList(ids.split(",")));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/installation")
@ApiOperation(httpMethod = "GET", value = "安装告知列表数据导出", notes = "安装告知列表数据导出")
public void installationExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
iJgTableDataExportService.installation(response, Arrays.asList(ids.split(",")));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/maintain")
@ApiOperation(httpMethod = "GET", value = "维修告知列表数据导出", notes = "维修告知列表数据导出")
public void maintainExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
iJgTableDataExportService.maintain(response, Arrays.asList(ids.split(",")));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/reform")
@ApiOperation(httpMethod = "GET", value = "改造告知列表数据导出", notes = "改造告知列表数据导出")
public void reformExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
iJgTableDataExportService.reform(response, Arrays.asList(ids.split(",")));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/transfer")
@ApiOperation(httpMethod = "GET", value = "移装告知列表数据导出", notes = "移装告知列表数据导出")
public void transferExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
iJgTableDataExportService.transfer(response, Arrays.asList(ids.split(",")));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/registration")
@ApiOperation(httpMethod = "GET", value = "使用登记列表数据导出", notes = "使用登记列表数据导出")
public void registrationExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
iJgTableDataExportService.registration(response, Arrays.asList(ids.split(",")));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/changeRegistrationUnit")
@ApiOperation(httpMethod = "GET", value = "单位变更列表数据导出", notes = "单位变更列表数据导出")
public void changeRegistrationUnitExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
iJgTableDataExportService.changeRegistrationUnit(response, Arrays.asList(ids.split(",")));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/changeRegistrationReform")
@ApiOperation(httpMethod = "GET", value = "改造登记列表数据导出", notes = "改造登记列表数据导出")
public void changeRegistrationReformExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
iJgTableDataExportService.changeRegistrationReform(response, Arrays.asList(ids.split(",")));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/enableDisable")
@ApiOperation(httpMethod = "GET", value = "启用停用列表数据导出", notes = "启用停用列表数据导出")
public void enableDisableExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
iJgTableDataExportService.enableDisable(response, Arrays.asList(ids.split(",")));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/scrapCancel")
@ApiOperation(httpMethod = "GET", value = "注销报废列表数据导出", notes = "注销报废列表数据导出")
public void scrapCancelExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
iJgTableDataExportService.scrapCancel(response, Arrays.asList(ids.split(",")));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/changeRegistrationTransfer")
@ApiOperation(httpMethod = "GET", value = "移装变更列表数据导出", notes = "移装变更列表数据导出")
public void changeRegistrationTransferExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
iJgTableDataExportService.changeRegistrationTransfer(response, Arrays.asList(ids.split(",")));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/changeRegistrationName")
@ApiOperation(httpMethod = "GET", value = "更名变更列表数据导出", notes = "更名变更列表数据导出")
public void changeRegistrationNameExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
iJgTableDataExportService.changeRegistrationName(response, Arrays.asList(ids.split(",")));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/vehicleInformation")
@ApiOperation(httpMethod = "GET", value = "车气登记列表数据导出", notes = "车气登记列表数据导出")
public void vehicleInformationExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
iJgTableDataExportService.vehicleInformation(response, Arrays.asList(ids.split(",")));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/changeVehicleRegistrationUnit")
@ApiOperation(httpMethod = "GET", value = "车用气瓶变更列表数据导出", notes = "车用气瓶变更列表数据导出")
public void changeVehicleRegistrationUnitExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
iJgTableDataExportService.changeVehicleRegistrationUnit(response, Arrays.asList(ids.split(",")));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/unregulatedEquip")
@ApiOperation(httpMethod = "GET", value = "未纳管设备列表数据导出", notes = "未纳管设备列表数据导出")
public void unregulatedEquipExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
iJgTableDataExportService.unregulatedEquip(response, Arrays.asList(ids.split(",")));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/manageEquipment")
@ApiOperation(httpMethod = "GET", value = "已纳管设备列表数据导出", notes = "已纳管设备列表数据导出")
public void manageEquipmentExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
iJgTableDataExportService.manageEquipment(response, Arrays.asList(ids.split(",")));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/equipTransfer")
@ApiOperation(httpMethod = "GET", value = "设备移交列表数据导出", notes = "设备移交列表数据导出")
public void equipTransferExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
iJgTableDataExportService.equipTransfer(response, Arrays.asList(ids.split(",")));
}
}
package com.yeejoin.amos.boot.module.jg.biz.service;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* JG表格数据导出接口类
*/
public interface IJgTableDataExportService {
void gen(String jsonName, String voName,String tableName);
void certificate(HttpServletResponse response, List<String> ids);
void maintenance(HttpServletResponse response, List<String> ids);
void installation(HttpServletResponse response, List<String> ids);
void maintain(HttpServletResponse response, List<String> ids);
void reform(HttpServletResponse response, List<String> ids);
void transfer(HttpServletResponse response, List<String> ids);
void registration(HttpServletResponse response, List<String> ids);
void changeRegistrationUnit(HttpServletResponse response, List<String> ids);
void changeRegistrationReform(HttpServletResponse response, List<String> ids);
void enableDisable(HttpServletResponse response, List<String> ids);
void scrapCancel(HttpServletResponse response, List<String> ids);
void changeRegistrationTransfer(HttpServletResponse response, List<String> ids);
void changeRegistrationName(HttpServletResponse response, List<String> ids);
void vehicleInformation(HttpServletResponse response, List<String> ids);
void changeVehicleRegistrationUnit(HttpServletResponse response, List<String> ids);
void unregulatedEquip(HttpServletResponse response, List<String> ids);
void manageEquipment(HttpServletResponse response, List<String> ids);
void equipTransfer(HttpServletResponse response, List<String> ids);
}
......@@ -43,7 +43,10 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
import com.yeejoin.amos.boot.module.ymt.api.mapper.CategoryOtherInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.SuperviseInfoMapper;
import com.yeejoin.amos.component.feign.utils.FeignUtil;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
......@@ -3666,4 +3669,44 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
private ReginParams getSelectedOrgInfo() {
return JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
}
/**
* 根据ids查询设备
*/
public List<JSONObject> queryEquipInIds(List<String> ids) {
List<JSONObject> result = new ArrayList<>();
SearchRequest request = new SearchRequest();
request.indices("idx_biz_view_jg_all");
SearchSourceBuilder builder = new SearchSourceBuilder();
builder.trackTotalHits(true);
BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
if (!ObjectUtils.isEmpty(ids)) {
BoolQueryBuilder seqBuilder = QueryBuilders.boolQuery();
seqBuilder.must(QueryBuilders.termsQuery("SEQUENCE_NBR.keyword", ids));
boolMust.must(seqBuilder);
}
builder.query(boolMust);
builder.sort("REC_DATE", SortOrder.DESC);
request.source(builder);
try {
SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
for (SearchHit hit : response.getHits().getHits()) {
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(hit);
JSONObject source = jsonObject.getJSONObject("sourceAsMap");
if (!ValidationUtil.isEmpty(source.get(DATA_SOURCE))) {
String s = source.get(DATA_SOURCE).toString();
source.put(DATA_SOURCE, s);
source.put(DATA_SOURCE_NAME, Arrays.stream(EquipSourceEnum.values())
.filter(e -> s.startsWith(e.getCode()))
.map(EquipSourceEnum::getName)
.findFirst()
.orElse(EquipSourceEnum.jg.getName()));
}
result.add(source);
}
} catch (IOException e) {
throw new RuntimeException(e);
}
return result;
}
}
\ No newline at end of file
......@@ -24,6 +24,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgEquipTransferService;
import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.EquipTransferVo;
import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
......@@ -606,6 +607,21 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
return equipTransferPage;
}
/**
* 列表查询-导出用
*/
public List<EquipTransferVo> queryTransferInIds(List<String> ids) {
List<EquipTransferVo> equipTransferVos = this.baseMapper.queryEquipTransferInIds(ids);
return equipTransferVos.stream()
.peek(transfer -> {
if (Objects.nonNull(transfer.getApplyStatus())) {
transfer.setApplyStatus(FlowStatusEnum.getNameByType(Long.parseLong(transfer.getApplyStatus())));
}
})
.collect(Collectors.toList());
}
@Override
public Map<String, Object> queryBySequenceNbr(Long sequenceNbr) {
JgEquipTransfer equipTransfer = baseMapper.selectById(sequenceNbr);
......
......@@ -31,6 +31,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.InstallationVo;
import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
......@@ -1740,4 +1741,17 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
commonService.saveExecuteFlowData2Redis(notice.getInstanceId(), this.buildInstanceRuntimeData(notice));
}
/**
* 列表数据查询
* @param ids
* @return
*/
public List<InstallationVo> queryInstallationInIds(List<String> ids) {
List<InstallationVo> installationVos = jgInstallationNoticeMapper.queryInstallationInIds(ids);
return installationVos.stream().peek(notice -> {
Optional<String> noticeStatusOpt = Optional.ofNullable(notice.getNoticeStatus());
noticeStatusOpt.ifPresent(status -> notice.setNoticeStatus(FlowStatusEnum.getNameByType(Long.valueOf(status))));
}).collect(Collectors.toList());
}
}
\ No newline at end of file
......@@ -26,6 +26,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintainNoticeService;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.MaintainVo;
import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
......@@ -481,10 +482,18 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
}
/**
* 列表查询 示例
* 列表查询-导出用
*/
public List<JgMaintainNoticeDto> queryForJgMaintainNoticeList() {
return this.queryForList("", false);
public List<MaintainVo> queryMaintainInIds(List<String> ids) {
List<DataDictionary> dictionaries = dataDictionaryService.getByType("WXLX");
List<MaintainVo> maintainVos = jgMaintainNoticeMapper.queryMaintainInIds(ids);
return maintainVos.stream().peek(notice -> {
Optional.ofNullable(notice.getNoticeStatus()).ifPresent(status -> notice.setNoticeStatus(FlowStatusEnum.getNameByType(Long.valueOf(status))));
Optional.ofNullable(notice.getMaintainType()).ifPresent(status -> {
String collect = dictionaries.stream().filter(d -> notice.getMaintainType().equals(d.getCode())).map(DataDictionary::getName).collect(Collectors.joining());
notice.setMaintainType(collect);
});
}).collect(Collectors.toList());
}
......
......@@ -26,6 +26,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgReformNoticeMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgReformNoticeService;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.ReformVo;
import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
......@@ -344,10 +345,11 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
}
/**
* 列表查询 示例
* 列表查询-导出用
*/
public List<JgReformNoticeDto> queryForJgReformNoticeList() {
return this.queryForList("", false);
public List<ReformVo> queryReformInIds(List<String> ids) {
List<ReformVo> reformVos = jgReformNoticeMapper.queryReformInIds(ids);
return reformVos.stream().peek(notice -> Optional.ofNullable(notice.getNoticeStatus()).ifPresent(status -> notice.setNoticeStatus(FlowStatusEnum.getNameByType(Long.valueOf(status))))).collect(Collectors.toList());
}
/**
......
......@@ -24,12 +24,13 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgScrapCancelMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationManageMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgScrapCancelService;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.ScrapCancelVo;
import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
import com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
import com.yeejoin.amos.boot.module.ymt.api.entity.SuperviseInfo;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
......@@ -154,6 +155,16 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
return listPage;
}
/**
* 列表查询-导出用
*/
public List<ScrapCancelVo> queryScrapCancelInIds(List<String> ids) {
List<ScrapCancelVo> scrapCancelVos = this.baseMapper.queryScrapCancelInIds(ids);
return scrapCancelVos.stream().peek(notice -> Optional.ofNullable(notice.getEquListCode())
.ifPresent(status -> notice.setEquListName(EquipmentClassifityEnum.getNameByCode(notice.getEquListCode()))))
.collect(Collectors.toList());
}
private void convertField(JgScrapCancelDto model) {
// 处理图片
if (!ValidationUtil.isEmpty(model.getCancelCertificateList())) {
......
......@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.util.StringUtil;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
......@@ -27,6 +26,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgTransferNoticeMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgTransferNoticeService;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.TransferVo;
import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
......@@ -34,7 +34,6 @@ import com.yeejoin.amos.boot.module.jg.biz.dao.ESElavtorRepository;
import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
......@@ -479,6 +478,13 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
noticePage.setRecords(mappedRecords);
return noticePage;
}
/**
* 列表查询-导出用
*/
public List<TransferVo> queryTransferInIds(List<String> ids) {
List<TransferVo> transferVos = jgTransferNoticeMapper.queryTransferInIds(ids);
return transferVos.stream().peek(notice -> Optional.ofNullable(notice.getNoticeStatus()).ifPresent(status -> notice.setNoticeStatus(FlowStatusEnum.getNameByType(Long.valueOf(status))))).collect(Collectors.toList());
}
@Override
@SuppressWarnings({"Duplicates", "rawtypes"})
......
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