Skip to content

A
amos-boot-biz
Commit aba4dcc6 authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.设备注销报废初稿代码提交

parent 53463d8a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 130 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/JgScrapCancelDto.java
View file @ aba4dcc6
......@@ -25,9 +25,13 @@ public class JgScrapCancelDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "注销类型（1报废注销，2移装注销）")
@ApiModelProperty(value = "注销类型code（1报废注销，2移装注销）")
private String cancelType;
@ApiModelProperty(value = "注销类型每次")
private String cancelTypeDesc;
@ApiModelProperty(value = "申请编号")
private String applyNo;
......@@ -109,14 +113,11 @@ public class JgScrapCancelDto extends BaseDto {
@ApiModelProperty(value = "转办后执行人的Id逗号分割")
private String transferToUserIds;
@ApiModelProperty("设备品种")
private String equDefine;
@ApiModelProperty(value = "设备种类code")
private String equListCode;
@ApiModelProperty(value = "设备种类")
private String equList;
@ApiModelProperty(value = "设备类别")
private String equCategory;
@ApiModelProperty(value = "设备种类name")
private String equListName;
@ApiModelProperty(value = "设备代码")
private String equCode;
......@@ -127,16 +128,14 @@ public class JgScrapCancelDto extends BaseDto {
@ApiModelProperty(value = "96333识别码")
private String code96333;
@ApiModelProperty(value = "设备名称")
private String productName;
@ApiModelProperty(value = "设备地址")
private String fullAddress;
@ApiModelProperty (value = "其他附件")
@ApiModelProperty(value = "其他附件")
private String otherAccessories;
@ApiModelProperty(value = "申请日期，接收查询参数")
private String applicationDate;
@ApiModelProperty(value = "使用登记证id，多个逗号分割")
private String registrationManageId;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgScrapCancelEqDto.java
View file @ aba4dcc6
package com.yeejoin.amos.boot.module.jg.api.dto;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 报废注销设备关系表
......@@ -17,10 +14,10 @@ import java.util.Date;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="JgScrapCancelEqDto", description="报废注销设备关系表")
public class JgScrapCancelEqDto extends BaseDto {
@ApiModel(value = "JgScrapCancelEqDto", description = "报废注销设备关系表")
public class JgScrapCancelEqDto extends BaseDto {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "设备移交申请id")
......@@ -29,10 +26,10 @@ public class JgScrapCancelEqDto extends BaseDto {
@ApiModelProperty(value = "设备id")
private String equId;
@ApiModelProperty(value = "使用登记id")
private String certificateSeq;
@ApiModelProperty(value = "使用登记证编号")
private String useRegistrationCode;
@ApiModelProperty(value = "设备信息")
private JSONArray equipInfo;
@ApiModelProperty(value = "设备代码")
private String equCode;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgScrapCancel.java
View file @ aba4dcc6
......@@ -155,25 +155,28 @@ public class JgScrapCancel extends BaseEntity {
private String nextExecuteUserIds;
/**
* 使用登记证id，多个逗号分割
*/
@TableField("registration_manage_id")
private String registrationManageId;
/**
* 使用登记证编号，多个逗号分割（冗余前端检索使用）
*/
@TableField("use_registration_code")
private String useRegistrationCode;
/**
* 转办后执行人的Id逗号分割
*/
@TableField("transfer_to_user_ids")
private String transferToUserIds;
@TableField(exist = false)
private String equList;
@TableField(exist = false)
private String equListDesc;
@TableField(exist = false)
private String equCategoryDesc;
@TableField(exist = false)
private String productName;
@TableField(exist = false)
private String fullAddress;
/**
* 设备种类code
*/
@TableField("equ_list_code")
private String equListCode;
/**
* 其他附件
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgScrapCancelEq.java
View file @ aba4dcc6
package com.yeejoin.amos.boot.module.jg.api.entity;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 报废注销设备关系表
......@@ -27,26 +24,28 @@ public class JgScrapCancelEq extends BaseEntity {
/**
* 设备移交申请id
*/
@TableField("equip_transfer_id")
@TableField("equip_transfer_id")
private String equipTransferId;
/**
* 设备id
*/
@TableField("equ_id")
@TableField("equ_id")
private String equId;
/**
* 使用登记id
* 使用登记证编号
*/
@TableField("certificate_seq")
private String certificateSeq;
@TableField("use_registration_code")
private String useRegistrationCode;
/**
* 设备信息
* 设备代码
*/
@TableField("equip_info")
private String equipInfo;
@TableField("equ_code")
private String equCode;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgScrapCancelMapper.java
View file @ aba4dcc6
......@@ -20,7 +20,7 @@ import java.util.Map;
*/
public interface JgScrapCancelMapper extends BaseMapper<JgScrapCancel> {
Page<Map<String, Object>> getListPage(@Param("page") Page<Map<String, Object>> page,
Page<JgScrapCancelDto> getListPage(@Param("page") Page<JgScrapCancelDto> page,
@Param("sort") SortVo sortMap,
@Param("dto") JgScrapCancelDto dto,
@Param("roleIds") List<String> roleIds,
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgScrapCancelMapper.xml
View file @ aba4dcc6
......@@ -9,52 +9,35 @@
</update>
<select id="getListPage" resultType="java.util.Map">
<select id="getListPage" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto">
select
DISTINCT tjsc.sequence_nbr as sequenceNbr,
tjsc.instance_id as instanceId,
tjsc.create_user_id as createUserId,
tjsc.audit_status as auditStatus,
DATE_FORMAT(tjsc.rec_date,'%Y-%m-%d') as recDate,
DATE_FORMAT(tjsc.create_date,'%Y-%m-%d') as createDate,
tjsc.receive_org_code as receiveOrgCode,
tjsc.receive_org_name as receiveOrgName,
tjsc.receive_company_code as receiveCompanyCode,
tjsc.cancel_certificate as cancelCertificate,
tjsc.cancel_type as cancelType,
tjsc.apply_no as applyNo,
tjsc.status,
tjsc.remark,
tjsc.instance_status as instanceStatus,
tjsc.promoter,
tjsc.next_execute_user_ids as nextExecuteUserIds,
tjsc.supervisory_code as supervisoryCode,
tjsc.next_task_id as nextTaskId,
ifnull(tjsc.next_execute_ids,'') as nextExecuteIds,
DATE_FORMAT(tjsc.audit_pass_date,'%Y-%m-%d') as auditPassDate,
use.USE_UNIT_CREDIT_CODE as useUnitCreditCode,
tjsc.use_unit_name as useUnitName,
tjsc.use_unit_code as useUnitCode,
jri.USE_ORG_CODE AS useRegistrationCode,
jri.PRODUCT_NAME as productName,
jri.EQU_CODE as equCode,
use.USE_INNER_CODE as innerCode,
use.ADDRESS as address,
oi.SUPERVISORY_CODE AS supervisoryCode,
oi.CODE96333 as code96333,
(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,
CONCAT(use.PROVINCE_NAME,'', use.CITY_NAME, '', use.COUNTY_NAME, '', use.street_name) AS place,
use."ADDRESS" as detailedAddress,
re.equ_id as equipId
tjsc.sequence_nbr,
tjsc.instance_id,
tjsc.create_user_id,
tjsc.audit_status,
DATE_FORMAT(tjsc.rec_date,'%Y-%m-%d') as recDate,
DATE_FORMAT(tjsc.create_date,'%Y-%m-%d') as createDate,
tjsc.receive_org_code,
tjsc.receive_org_name,
tjsc.receive_company_code,
tjsc.cancel_certificate,
tjsc.cancel_type,
tjsc.apply_no,
tjsc.status,
tjsc.remark,
tjsc.instance_status,
tjsc.promoter,
tjsc.next_execute_user_ids,
tjsc.supervisory_code,
tjsc.next_task_id,
ifnull(tjsc.next_execute_ids,'') as nextExecuteIds,
DATE_FORMAT(tjsc.audit_pass_date,'%Y-%m-%d') as auditPassDate,
tjsc.use_unit_name,
tjsc.use_unit_code,
tjsc.use_registration_code
from tzs_jg_scrap_cancel tjsc
LEFT JOIN tzs_jg_scrap_cancel_eq re on tjsc.sequence_nbr = re.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD
LEFT JOIN idx_biz_jg_other_info oi ON oi.RECORD = re.equ_id
<where>
and tjsc.is_delete = 0
tjsc.is_delete = 0
<if test="dto.auditStatus != null and dto.auditStatus != ''">
and tjsc.audit_status = #{dto.auditStatus}
</if>
......@@ -70,34 +53,12 @@
<if test="dto.applicationDate != null and dto.applicationDate != ''">
and tjsc.create_date like concat('%',DATE_FORMAT(#{dto.applicationDate},'%Y-%m-%d'),'%')
</if>
<if test="dto.equList != null and dto.equList != ''">
AND jri."EQU_LIST" = #{dto.equList}
</if>
<if test="dto.equCategory != null and dto.equCategory != ''">
AND jri."equ_category" = #{dto.equCategory}
</if>
<if test="dto.equDefine != null and dto.equDefine != ''">
AND jri."EQU_DEFINE" = #{dto.equDefine}
</if>
<if test="dto.equCode != null and dto.equCode != ''">
AND jri."EQU_CODE" like concat('%',#{dto.equCode},'%')
<if test="dto.equListCode != null and dto.equListCode != ''">
AND tjsc."equ_list_code" = #{dto.equListCode}
</if>
<if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''">
AND jri."USE_ORG_CODE" like concat('%',#{dto.useRegistrationCode},'%')
</if>
<if test="dto.code96333 != null and dto.code96333 != ''">
AND oi.CODE96333 like concat('%',#{dto.code96333},'%')
</if>
<if test="dto.supervisoryCode != null and dto.supervisoryCode != ''">
AND oi.SUPERVISORY_CODE like concat('%',#{dto.supervisoryCode},'%')
</if>
<if test="dto.fullAddress != null and dto.fullAddress != ''">
AND (
use."PROVINCE_NAME" LIKE CONCAT('%', #{dto.fullAddress}, '%')
OR use."CITY_NAME" LIKE CONCAT('%', #{dto.fullAddress}, '%')
OR use."COUNTY_NAME" LIKE CONCAT('%', #{dto.fullAddress}, '%')
OR use."STREET_NAME" LIKE CONCAT('%', #{dto.fullAddress}, '%')
)
AND tjsc."USE_ORG_CODE" like concat('%',#{dto.useRegistrationCode},'%')
</if>
<if test="roleIds != null and dto.type == 'supervision'">
<foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgScrapCancelController.java
View file @ aba4dcc6
......@@ -40,7 +40,7 @@ public class JgScrapCancelController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@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) {
return ResponseHelper.buildResponse(jgScrapCancelService.save(submitType, model));
}
......@@ -52,7 +52,7 @@ public class JgScrapCancelController extends BaseController {
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/updateInfo")
@ApiOperation(httpMethod = "POST", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
@ApiOperation(httpMethod = "POST", value = "保存、保存并提交、提交", notes = "保存、保存并提交、提交")
public ResponseModel<JgScrapCancelDto> updateInfo(@RequestParam String submitType,
@RequestBody Map<String, Object> model,
@RequestParam(value = "op", required = false) String op) {
......@@ -77,7 +77,7 @@ public class JgScrapCancelController extends BaseController {
jgScrapCancelInfo.remove("SEQUENCE_NBR");
JgScrapCancelDto jgScrapCancelDto = JSON.parseObject(JSON.toJSONString(jgScrapCancelInfo), JgScrapCancelDto.class);
jgScrapCancelService.flowExecute(jgScrapCancelDto.getEquList(),
jgScrapCancelService.flowExecute(jgScrapCancelDto.getEquListCode(),
Long.valueOf(String.valueOf(jgScrapCancelDto.getSequenceNbr())),
jgScrapCancelDto.getInstanceId(),
String.valueOf(map.get("operate")),
......@@ -106,13 +106,13 @@ public class JgScrapCancelController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "列表全部数据查询", notes = "列表全部数据查询")
@ApiOperation(httpMethod = "POST", value = "分页查询", notes = "分页查询")
@PostMapping(value = "/getList")
public ResponseModel<Page<Map<String, Object>>> getList(JgScrapCancelDto dto,
public ResponseModel<Page<JgScrapCancelDto>> getList(JgScrapCancelDto dto,
@RequestParam(value = "sort",required = false) String sort,
@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size) {
Page<Map<String, Object>> page = new Page<>(current, size);
Page<JgScrapCancelDto> page = new Page<>(current, size);
dto.setType(String.valueOf(iJgInstallationNoticeService.getCompanyType().get("companyLevel")));
return ResponseHelper.buildResponse(jgScrapCancelService.getList(dto,sort, page, dto.getRoleIds()));
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationManageServiceImpl.java
View file @ aba4dcc6
......@@ -270,7 +270,8 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
public List<JSONObject> queryEquByCertificateSeqList(List<Long> sequenceNbrList) {
List<JgUseRegistrationManage> jgUseRegistrationManageList = this.baseMapper.selectList(new LambdaQueryWrapper<JgUseRegistrationManage>()
.in(JgUseRegistrationManage::getSequenceNbr, sequenceNbrList)
.eq(JgUseRegistrationManage::getIsDelete, 0));
.eq(JgUseRegistrationManage::getIsDelete, 0)
.select(JgUseRegistrationManage::getUseRegistrationCode));
if (ValidationUtil.isEmpty(jgUseRegistrationManageList)) {
return new ArrayList<>();
}
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java
View file @ aba4dcc6
......@@ -34,8 +34,7 @@ public enum ApplicationFormTypeEnum {
ZXBF("ZXBF", "BF_ZX"),//电梯（设备）报废注销
GMBG("GMBG", "DJ_GM"),//更名变更
SBQY("SBQY", "SB_QY"),//设备启用
SBTY("SBTY", "SB_TY")//设备启用
;
SBTY("SBTY", "SB_TY");//设备启用
/**
* 编号
......
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