Commit d5dec841 authored by kongfm's avatar kongfm

气瓶相关接口调整

parent df5e85dc
...@@ -82,6 +82,6 @@ public class CylinderInfoDto extends BaseDto { ...@@ -82,6 +82,6 @@ public class CylinderInfoDto extends BaseDto {
private Boolean syncState; private Boolean syncState;
@ApiModelProperty(value = "对接公司编码") @ApiModelProperty(value = "对接公司编码")
private String apiCompanyCode; private String appId;
} }
...@@ -90,8 +90,8 @@ public class CylinderUnitDto extends BaseDto { ...@@ -90,8 +90,8 @@ public class CylinderUnitDto extends BaseDto {
@ApiModelProperty(value = "1初次同步数据 2上层系统已同步数据 0已删除数据") @ApiModelProperty(value = "1初次同步数据 2上层系统已同步数据 0已删除数据")
private Boolean syncState; private Boolean syncState;
@ApiModelProperty(value = "对接公司编码") @ApiModelProperty(value = "对接公司编码")
private String apiCompanyCode; private String appId;
@ApiModelProperty(value = "气瓶数量") @ApiModelProperty(value = "气瓶数量")
private Long cylinderNumber; private Long cylinderNumber;
......
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -150,7 +151,6 @@ public class CylinderInfo { ...@@ -150,7 +151,6 @@ public class CylinderInfo {
/** /**
* 对接公司编码 * 对接公司编码
*/ */
@TableField("api_company_code") @TableField("app_id")
private String apiCompanyCode; private String appId;
} }
...@@ -168,8 +168,8 @@ public class CylinderUnit { ...@@ -168,8 +168,8 @@ public class CylinderUnit {
/** /**
* 对接公司编码 * 对接公司编码
*/ */
@TableField("api_company_code") @TableField("app_id")
private String apiCompanyCode; private String appId;
/** /**
* 经度 * 经度
......
...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.service; ...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentInformDto; import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentInformDto;
import java.util.List; import java.util.List;
...@@ -19,4 +20,12 @@ public interface IEquipmentInformService { ...@@ -19,4 +20,12 @@ public interface IEquipmentInformService {
Page<EquipmentInformDto> queryDtoList(Page<EquipmentInformDto> page, EquipmentInformDto equipmentInformDto, String sortParam, String sortRule); Page<EquipmentInformDto> queryDtoList(Page<EquipmentInformDto> page, EquipmentInformDto equipmentInformDto, String sortParam, String sortRule);
Boolean batchDelete(List<Long> sequenceNbrList); Boolean batchDelete(List<Long> sequenceNbrList);
Boolean acceptInform(Long sequenceNbr);
EquipmentInformDto updateEquipmentInform(EquipmentInformDto model);
EquipmentInformDto queryDtoBySeq(Long sequenceNbr);
Boolean startWorkflow(Long sequenceNbr, ReginParams userInfo) throws Exception;
} }
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
tz_cylinder_info t tz_cylinder_info t
WHERE WHERE
t.sequence_nbr IN ( SELECT max( tt.sequence_nbr ) FROM tz_cylinder_info tt GROUP BY tt.sequence_code ) t.sequence_nbr IN ( SELECT max( tt.sequence_nbr ) FROM tz_cylinder_info tt GROUP BY tt.sequence_code )
AND t.api_company_code = ( AND t.app_id = (
SELECT SELECT
u.api_company_code u.app_id
FROM FROM
tz_cylinder_unit u tz_cylinder_unit u
WHERE WHERE
......
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