Skip to content

A
amos-boot-biz
Commit cb44ec4b authored by 王果's avatar 王果
Browse files
Options

维修告知接口调整

parent d6314708
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 68 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgMaintainNoticeDto.java
View file @ cb44ec4b
......@@ -196,4 +196,11 @@ public class JgMaintainNoticeDto extends BaseDto {
@ApiModelProperty(value = "设备类别名称")
private String equCategory;
private List<String> roleIds;
private String dataType;
@ApiModelProperty(value = "状态")
private String status;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgMaintainNotice.java
View file @ cb44ec4b
......@@ -304,4 +304,13 @@ public class JgMaintainNotice extends BaseEntity {
*/
@TableField(value = "equ_category")
private String equCategory;
/**
* 状态
*/
@TableField("status")
private String status;
@TableField("next_execute_ids")
private String nextExecuteIds;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintainNoticeMapper.xml
View file @ cb44ec4b
......@@ -8,92 +8,95 @@
<select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice">
select
tjmn.sequence_nbr AS sequenceNbr,
tjmn.apply_no AS applyNo,
tjmn.notice_date AS noticeDate,
tjmn.use_unit_name AS useUnitName,
tjmn.receive_org_name AS receiveOrgName,
tjmn.address AS address,
tjmn.notice_status AS noticeStatus,
tjmn.install_unit_name AS installUnitName,
tjmn.province,
tjmn.city,
tjmn.county,
tjmn.factory_use_site_street,
tjmn.street_name,
tjmn.street,
tjmn.maintain_type,
tjmn.plan_date,
tjmn.notice_report_url,
tjmn.province_name AS provinceName,
tjmn.city_name AS cityName,
tjmn.county_name AS countyName,
tjmn.promoter,
tjmn.equ_category AS equCategory,
tjmn.equ_list_code AS equListCode,
tjmn.instance_id AS instanceId
isn.sequence_nbr AS sequenceNbr,
isn.apply_no AS applyNo,
isn.notice_date AS noticeDate,
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,
isn.city,
isn.county,
isn.factory_use_site_street,
isn.street_name,
isn.street,
isn.maintain_type,
isn.plan_date,
isn.notice_report_url,
isn.province_name AS provinceName,
isn.city_name AS cityName,
isn.county_name AS countyName,
isn.promoter,
isn.equ_category AS equCategory,
isn.equ_list_code AS equListCode,
isn.instance_id AS instanceId,
isn.accept_date AS acceptDate
FROM
tzs_jg_maintain_notice tjmn
tzs_jg_maintain_notice isn
<where>
tjmn.is_delete = 0
isn.is_delete = 0
<if test="param != null ">
<if test="param.applyNo != null and param.applyNo != ''">
AND tjmn.apply_no LIKE CONCAT('%', #{param.applyNo}, '%')
AND isn.apply_no LIKE CONCAT('%', #{param.applyNo}, '%')
</if>
<if test="param.receiveOrgName != null and param.receiveOrgName != ''">
AND tjmn.receive_org_name LIKE CONCAT('%', #{param.receiveOrgName}, '%')
<if test="param.receiveOrgCode != null and param.receiveOrgCode != ''">
AND isn.receive_org_code = #{param.receiveOrgCode}
</if>
<if test="param.useUnitName != null and param.useUnitName != ''">
AND tjmn.use_unit_name LIKE CONCAT('%', #{param.useUnitName}, '%')
AND isn.use_unit_name LIKE CONCAT('%', #{param.useUnitName}, '%')
</if>
<if test="param.installUnitName != null and param.installUnitName != ''">
AND tjmn.install_unit_name LIKE CONCAT('%', #{param.installUnitName}, '%')
AND isn.install_unit_name LIKE CONCAT('%', #{param.installUnitName}, '%')
</if>
<if test="param.noticeStatus != null and param.noticeStatus != ''">
AND tjmn.notice_status = #{param.noticeStatus}
AND isn.notice_status = #{param.noticeStatus}
</if>
<if test="param.maintainType != null and param.maintainType != ''">
AND tjmn.maintain_type = #{param.maintainType}
AND isn.maintain_type = #{param.maintainType}
</if>
</if>
<if test="type == 'supervision'">
AND (tjmn.notice_status in ('6612', '6614', '6616') )
AND tjmn.receive_org_code = #{orgCode}
AND (isn.notice_status in ('6612', '6614', '6616') )
AND isn.receive_org_code = #{orgCode}
</if>
<if test="type == 'enterprise'">
AND tjmn.install_unit_credit_code = #{orgCode}
AND isn.install_unit_credit_code = #{orgCode}
</if>
</where>
ORDER BY
tjmn.create_date DESC
isn.apply_no DESC
</select>
<select id="queryEquipInformation" resultType="java.util.Map">
select
tjmn.sequence_nbr AS sequenceNbr,
tjmn.apply_no AS applyNo,
tjmn.notice_date AS noticeDate,
tjmn.use_unit_name AS useUnitName,
tjmn.receive_org_name AS receiveOrgName,
tjmn.address AS address,
tjmn.notice_status AS noticeStatus,
tjmn.install_unit_name AS installUnitName,
tjmn.province,
tjmn.city,
tjmn.county,
tjmn.factory_use_site_street AS factoryUseSiteStreet,
tjmn.street_name AS streetName,
tjmn.street,
tjmn.maintain_type AS maintainType,
tjmn.plan_date AS planDate,
tjmn.notice_report_url AS noticeReportUrl,
tjmn.province_name AS provinceName,
tjmn.city_name AS cityName,
tjmn.county_name AS countyName,
tjmn.instance_id AS instanceId,
tjmn.promoter,
tjmn.equ_category AS equCategory,
tjmn.equ_list_code AS equListCode,
isn.sequence_nbr AS sequenceNbr,
isn.apply_no AS applyNo,
isn.notice_date AS noticeDate,
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,
isn.city,
isn.county,
isn.factory_use_site_street AS factoryUseSiteStreet,
isn.street_name AS streetName,
isn.street,
isn.maintain_type AS maintainType,
isn.notice_report_url AS noticeReportUrl,
isn.province_name AS provinceName,
isn.city_name AS cityName,
isn.county_name AS countyName,
isn.instance_id AS instanceId,
isn.promoter,
isn.equ_category AS equCategory,
isn.equ_list_code AS equListCode,
isn.plan_date AS installStartDate,
isn.construction_manager AS installLeaderName,
isn.construction_manager_phone AS installLeaderPhone,
ri.equ_list AS equList,
ri.equ_category AS equCategory,
ri.EQU_DEFINE AS equDefine,
......@@ -116,7 +119,8 @@
fi.produce_unit_credit_code AS produceUnitCreditCode,
fi.produce_unit_name AS produceUnitName,
fi.produce_license_num AS produceLicenseNum,
fi.factory_num AS factoryNum,
fi.FACTORY_NUM AS produceCode,
fi.FACTORY_NUM AS factoryNum,
fi.produce_date AS produceDate,
fi.imported AS imported,
fi.produce_country AS produceCountry,
......@@ -124,21 +128,22 @@
fi.product_quality_yield_prove AS productQualityYieldProve,
fi.ins_use_maintain_explain AS insUseMaintainExplain,
ui.safety_manager AS safetyManager,
ui.phone AS safetyManagerPhone,
ui.PROVINCE_NAME AS useUnitProvinceName,
ei.legal_person AS safetyManager,
ei.legal_phone AS safetyManagerPhone,
ui.CITY_NAME AS useUnitCityName,
ui.COUNTY_NAME AS useUnitCountyName,
ui.ADDRESS AS useUnitAddress
ei.ADDRESS AS useUnitAddress
FROM
tzs_jg_maintain_notice tjmn
LEFT JOIN tzs_jg_maintain_notice_eq re ON re.equip_transfer_id = tjmn.sequence_nbr
tzs_jg_maintain_notice isn
LEFT JOIN tzs_jg_maintain_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code
WHERE
tjmn.sequence_nbr = #{sequenceNbr}
isn.sequence_nbr = #{sequenceNbr}
LIMIT 1
</select>
</mapper>
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