Skip to content

A
amos-boot-biz
Commit cbe71cc5 authored by 韩桐桐's avatar 韩桐桐
Browse files
Options

fix（改造告知）:列表返回设备监管码

parent c700060d
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 121 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgReformNoticeMapper.xml
View file @ cbe71cc5
...@@ -31,9 +31,13 @@ ...@@ -31,9 +31,13 @@
isn.equ_list_code, isn.equ_list_code,
isn.equ_category, isn.equ_category,
isn.create_user_id, isn.create_user_id,
isn.next_execute_user_ids isn.next_execute_user_ids,
oi.SUPERVISORY_CODE AS supervisoryCode
FROM FROM
tzs_jg_reform_notice isn tzs_jg_reform_notice isn
LEFT JOIN tzs_jg_reform_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_other_info oi ON ri.RECORD = oi.RECORD
<where> <where>
isn.is_delete = false isn.is_delete = false
<if test="param != null "> <if test="param != null ">
...@@ -57,7 +61,7 @@ ...@@ -57,7 +61,7 @@
</if> </if>
</if> </if>
<if test="type == 'supervision'"> <if test="type == 'supervision'">
AND (isn.notice_status in ('6612', '6613', '6614', '6616') ) AND (isn.notice_status in ('6612', '6613', '6614', '6616') )
AND isn.receive_org_code = #{orgCode} AND isn.receive_org_code = #{orgCode}
</if> </if>
<if test="type == 'company'"> <if test="type == 'company'">
...@@ -69,84 +73,82 @@ ...@@ -69,84 +73,82 @@
</select> </select>
<select id="queryEquipInformation" resultType="java.util.Map"> <select id="queryEquipInformation" resultType="java.util.Map">
select select isn.sequence_nbr AS sequenceNbr,
isn.sequence_nbr AS sequenceNbr, isn.install_unit_name AS installUnitName,
isn.install_unit_name AS installUnitName, isn.apply_no AS applyNo,
isn.apply_no AS applyNo, isn.province_name AS provinceName,
isn.province_name AS provinceName, isn.city_name AS cityName,
isn.city_name AS cityName, isn.county_name AS countyName,
isn.county_name AS countyName, isn.province,
isn.province, isn.city,
isn.city, isn.county,
isn.county, isn.street_name AS streetName,
isn.street_name AS streetName, isn.street,
isn.street, isn.address AS address,
isn.address AS address, isn.use_unit_name AS useUnitName,
isn.use_unit_name AS useUnitName, isn.receive_company_code AS receiveCompanyCode,
isn.receive_company_code AS receiveCompanyCode, isn.receive_org_name AS receiveOrgName,
isn.receive_org_name AS receiveOrgName, isn.receive_org_code AS receiveOrgCode,
isn.receive_org_code AS receiveOrgCode, isn.next_execute_ids as nextExecuteIds,
isn.next_execute_ids as nextExecuteIds, isn.promoter,
isn.promoter, isn.notice_status AS noticeStatus,
isn.notice_status AS noticeStatus, isn.plan_date AS installStartDate,
isn.plan_date AS installStartDate, isn.construction_manager AS installLeaderName,
isn.construction_manager AS installLeaderName, isn.construction_manager_phone AS installLeaderPhone,
isn.construction_manager_phone AS installLeaderPhone, ri.equ_code AS equRegisterCode,
ri.equ_code AS equRegisterCode, fi.FACTORY_NUM AS produceCode,
fi.FACTORY_NUM AS produceCode, ri.product_name AS productName,
ri.product_name AS productName, ri.brand_name AS brandName,
ri.brand_name AS brandName, ri.equ_type AS equType,
ri.equ_type AS equType, ri.equ_price AS equPrice,
ri.equ_price AS equPrice, ri.product_photo AS productPhoto,
ri.product_photo AS productPhoto, di.design_unit_credit_code AS designUnitCreditCode,
di.design_unit_credit_code AS designUnitCreditCode, di.design_unit_name AS designUnitName,
di.design_unit_name AS designUnitName, di.design_license_num AS designLicenseNum,
di.design_license_num AS designLicenseNum, di.design_use_date AS designUseDate,
di.design_use_date AS designUseDate, di.design_date AS designDate,
di.design_date AS designDate, di.drawing_do AS drawingDo,
di.drawing_do AS drawingDo, di.appraisal_unit AS appraisalUnit,
di.appraisal_unit AS appraisalUnit, di.appraisal_date AS appraisalDate,
di.appraisal_date AS appraisalDate, di.design_doc AS designDoc,
di.design_doc AS designDoc, di.design_standard AS designStandard,
di.design_standard AS designStandard, fi.produce_unit_credit_code AS produceUnitCreditCode,
fi.produce_unit_credit_code AS produceUnitCreditCode, fi.produce_unit_name AS produceUnitName,
fi.produce_unit_name AS produceUnitName, fi.produce_license_num AS produceLicenseNum,
fi.produce_license_num AS produceLicenseNum, fi.factory_num AS factoryNum,
fi.factory_num AS factoryNum, fi.produce_date AS produceDate,
fi.produce_date AS produceDate, fi.imported AS imported,
fi.imported AS imported, fi.produce_country AS produceCountry,
fi.produce_country AS produceCountry, fi.factory_standard AS factoryStandard,
fi.factory_standard AS factoryStandard, fi.product_quality_yield_prove AS productQualityYieldProve,
fi.product_quality_yield_prove AS productQualityYieldProve, fi.ins_use_maintain_explain AS insUseMaintainExplain,
fi.ins_use_maintain_explain AS insUseMaintainExplain, ei.legal_person AS safetyManager,
ei.legal_person AS safetyManager, ei.legal_phone AS safetyManagerPhone,
ei.legal_phone AS safetyManagerPhone, ei.ADDRESS AS useUnitAddress,
ei.ADDRESS AS useUnitAddress, ei2.use_code AS useCode,
ei2.use_code AS useCode, tec2.name AS equCategory,
tec2.name AS equCategory, tec1.name AS equList,
tec1.name AS equList, tec.name AS equDefine,
tec.name AS equDefine, oi.SUPERVISORY_CODE AS supervisoryCode
oi.SUPERVISORY_CODE AS supervisoryCode FROM tzs_jg_reform_notice isn
FROM LEFT JOIN tzs_jg_reform_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
tzs_jg_reform_notice isn LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
LEFT JOIN tzs_jg_reform_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code
LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id LEFT JOIN tz_base_enterprise_info ei2 ON ei2.use_code = isn.install_unit_credit_code
LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code LEFT JOIN tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text
LEFT JOIN tz_base_enterprise_info ei2 ON ei2.use_code = isn.install_unit_credit_code LEFT JOIN tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text
LEFT JOIN tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text LEFT JOIN tz_equipment_category tec2 ON ri."EQU_DEFINE"::text = tec2.code::text
LEFT JOIN tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text LEFT JOIN idx_biz_jg_other_info oi ON ri.RECORD = oi.RECORD
LEFT JOIN tz_equipment_category tec2 ON ri."EQU_DEFINE"::text = tec2.code::text WHERE isn.sequence_nbr = #{sequenceNbr}
LEFT JOIN idx_biz_jg_other_info oi ON ri.RECORD = oi.RECORD
WHERE
isn.sequence_nbr = #{sequenceNbr}
LIMIT 1 LIMIT 1
</select> </select>
<update id="updatePromoter"> <update id="updatePromoter">
UPDATE tzs_jg_reform_notice set promoter = null UPDATE tzs_jg_reform_notice
set promoter = null
where sequence_nbr = #{id} where sequence_nbr = #{id}
</update> </update>
</mapper> </mapper>
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgReformNoticeController.java
View file @ cbe71cc5
package com.yeejoin.amos.boot.module.jg.biz.controller; package com.yeejoin.amos.boot.module.jg.biz.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil; import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto; 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.entity.JgReformNotice;
import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService; import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.Map;
import java.util.Objects;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgReformNoticeServiceImpl; import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgReformNoticeServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import io.swagger.annotations.Api;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType; 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 java.util.Map;
import java.util.Objects;
/** /**
* 改造告知 * 改造告知
...@@ -29,8 +28,8 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType; ...@@ -29,8 +28,8 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
* @date 2023-12-19 * @date 2023-12-19
*/ */
@RestController @RestController
@Api (tags = "改造告知Api") @Api(tags = "改造告知Api")
@RequestMapping (value = "/jg-reform-notice") @RequestMapping(value = "/jg-reform-notice")
public class JgReformNoticeController extends BaseController { public class JgReformNoticeController extends BaseController {
@Autowired @Autowired
...@@ -44,9 +43,9 @@ public class JgReformNoticeController extends BaseController { ...@@ -44,9 +43,9 @@ public class JgReformNoticeController extends BaseController {
* *
* @return * @return
*/ */
@TycloudOperation (ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping (value = "/save") @PostMapping(value = "/save")
@ApiOperation (httpMethod = "POST", value = "新增改造告知", notes = "新增改造告知") @ApiOperation(httpMethod = "POST", value = "新增改造告知", notes = "新增改造告知")
public ResponseModel<Object> save(@RequestParam String submitType, @RequestBody Map<String, Object> model) { public ResponseModel<Object> save(@RequestParam String submitType, @RequestBody Map<String, Object> model) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
return ResponseHelper.buildResponse(jgReformNoticeService.saveNotice(submitType, model, reginParams)); return ResponseHelper.buildResponse(jgReformNoticeService.saveNotice(submitType, model, reginParams));
...@@ -55,15 +54,16 @@ public class JgReformNoticeController extends BaseController { ...@@ -55,15 +54,16 @@ public class JgReformNoticeController extends BaseController {
/** /**
* 更新 * 更新
* @param submitType 更新或提交 *
* @param submitType 更新或提交
* @param installationInfo 改造告知信息 * @param installationInfo 改造告知信息
* @param op 参数 * @param op 参数
* @return JgReformNoticeDto * @return JgReformNoticeDto
*/ */
@TycloudOperation (ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping (value = "/update") @PutMapping(value = "/update")
@ApiOperation (httpMethod = "PUT", value = "根据sequenceNbr更新改造告知", notes = "根据sequenceNbr更新改造告知") @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新改造告知", notes = "根据sequenceNbr更新改造告知")
public ResponseModel<JgReformNoticeDto> updateBySequenceNbrJgReformNotice(@RequestParam String submitType, @RequestBody JgReformNoticeDto installationInfo, @RequestParam (value = "op", required = false) String op) { public ResponseModel<JgReformNoticeDto> updateBySequenceNbrJgReformNotice(@RequestParam String submitType, @RequestBody JgReformNoticeDto installationInfo, @RequestParam(value = "op", required = false) String op) {
if (Objects.isNull(installationInfo)) { if (Objects.isNull(installationInfo)) {
throw new IllegalArgumentException("参数installationInfo不能为空"); throw new IllegalArgumentException("参数installationInfo不能为空");
} }
...@@ -76,10 +76,10 @@ public class JgReformNoticeController extends BaseController { ...@@ -76,10 +76,10 @@ public class JgReformNoticeController extends BaseController {
* *
* @param sequenceNbr 主键 * @param sequenceNbr 主键
*/ */
@TycloudOperation (ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping (value = "/delete") @DeleteMapping(value = "/delete")
@ApiOperation (httpMethod = "DELETE", value = "根据sequenceNbr删除改造告知", notes = "根据sequenceNbr删除改造告知") @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除改造告知", notes = "根据sequenceNbr删除改造告知")
public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam (value = "sequenceNbr") Long[] sequenceNbr) { public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long[] sequenceNbr) {
return ResponseHelper.buildResponse(jgReformNoticeService.removeById(sequenceNbr)); return ResponseHelper.buildResponse(jgReformNoticeService.removeById(sequenceNbr));
} }
...@@ -88,10 +88,10 @@ public class JgReformNoticeController extends BaseController { ...@@ -88,10 +88,10 @@ public class JgReformNoticeController extends BaseController {
* *
* @param sequenceNbrs 主键 * @param sequenceNbrs 主键
*/ */
@TycloudOperation (ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping (value = "/batchDelete") @DeleteMapping(value = "/batchDelete")
@ApiOperation (value = "根据sequenceNbr删除维保合同备案", notes = "根据sequenceNbr删除维保合同备案") @ApiOperation(value = "根据sequenceNbr删除维保合同备案", notes = "根据sequenceNbr删除维保合同备案")
public ResponseModel<Boolean> deleteForBatch(@RequestParam ("sequenceNbrs") Long[] sequenceNbrs) { public ResponseModel<Boolean> deleteForBatch(@RequestParam("sequenceNbrs") Long[] sequenceNbrs) {
try { try {
return ResponseHelper.buildResponse(jgReformNoticeService.deleteForBatch(sequenceNbrs)); return ResponseHelper.buildResponse(jgReformNoticeService.deleteForBatch(sequenceNbrs));
} catch (Exception e) { } catch (Exception e) {
...@@ -104,10 +104,10 @@ public class JgReformNoticeController extends BaseController { ...@@ -104,10 +104,10 @@ public class JgReformNoticeController extends BaseController {
* *
* @param sequenceNbr 主键 * @param sequenceNbr 主键
*/ */
@TycloudOperation (ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping (value = "/details") @GetMapping(value = "/details")
@ApiOperation (httpMethod = "GET", value = "根据sequenceNbr查询单个改造告知", notes = "根据sequenceNbr查询单个改造告知") @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个改造告知", notes = "根据sequenceNbr查询单个改造告知")
public ResponseModel<Map<String, Object>> selectOne(@RequestParam ("sequenceNbr") Long sequenceNbr) { public ResponseModel<Map<String, Object>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(jgReformNoticeService.queryBySequenceNbr(sequenceNbr)); return ResponseHelper.buildResponse(jgReformNoticeService.queryBySequenceNbr(sequenceNbr));
} }
...@@ -119,13 +119,13 @@ public class JgReformNoticeController extends BaseController { ...@@ -119,13 +119,13 @@ public class JgReformNoticeController extends BaseController {
* @param current 每页大小 * @param current 每页大小
* @return * @return
*/ */
@TycloudOperation (ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping (value = "/page") @PostMapping(value = "/page")
@ApiOperation (httpMethod = "GET", value = "改造告知分页查询", notes = "改造告知分页查询") @ApiOperation(httpMethod = "POST", value = "改造告知分页查询", notes = "改造告知分页查询")
public ResponseModel<Page<JgReformNoticeDto>> queryForPage( public ResponseModel<Page<JgReformNoticeDto>> queryForPage(
@ApiParam (value = "当前页码", required = true) @RequestParam (value = "current", defaultValue = "1") int current, @ApiParam(value = "当前页码", required = true) @RequestParam(value = "current", defaultValue = "1") int current,
@ApiParam (value = "每页大小", required = true) @RequestParam (value = "size", defaultValue = "20") int size, @ApiParam(value = "每页大小", required = true) @RequestParam(value = "size", defaultValue = "20") int size,
@RequestBody (required = false) JgReformNoticeDto model @RequestBody(required = false) JgReformNoticeDto model
) { ) {
Page<JgReformNotice> page = new Page<>(current, size); Page<JgReformNotice> page = new Page<>(current, size);
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
...@@ -136,10 +136,10 @@ public class JgReformNoticeController extends BaseController { ...@@ -136,10 +136,10 @@ public class JgReformNoticeController extends BaseController {
/** /**
* 生成告知单 * 生成告知单
*/ */
@TycloudOperation (ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation (httpMethod = "GET", value = "改造告知列表全部数据查询", notes = "改造告知列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "改造告知列表全部数据查询", notes = "改造告知列表全部数据查询")
@GetMapping (value = "/generate-report") @GetMapping(value = "/generate-report")
public ResponseModel<String> generateReport(@RequestParam ("sequenceNbr") Long sequenceNbr) { public ResponseModel<String> generateReport(@RequestParam("sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(jgReformNoticeService.generateInstallationNoticeReport(sequenceNbr)); return ResponseHelper.buildResponse(jgReformNoticeService.generateInstallationNoticeReport(sequenceNbr));
} }
} }
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