bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
#	zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/controller/BaseAddressController.java
This commit is contained in:
nmy 2023-12-08 14:14:26 +08:00
parent d5302deb2c 3077109102
commit b6b9c71fa6
36 changed files with 314 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCoBank.java
View File

@ -1,6 +1,9 @@
package com.bonus.zlpt.company.api.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -14,6 +17,7 @@ import lombok.Data;
* bm_co_bank企业开户行信息
*/
@Data
@ApiModel("企业开户行信息")
public class BmCoBank implements Serializable {
private static final long serialVersionUID = 9028660704843374531L;
@ -23,36 +27,43 @@ public class BmCoBank implements Serializable {
/**
* 开户行
*/
@ApiModelProperty(value = "开户行", required = true)
private String bankName;
/**
* 账户名称
*/
@ApiModelProperty(value = "账户名称", required = true)
private String accountName;
/**
* 银行账号
*/
@ApiModelProperty(value = "银行账号", required = true)
private String bankAccount;
/**
* 开户行所在地
*/
@ApiModelProperty(value = "开户行所在地", required = true)
private String bankAddress;
/**
* 开户许可证核准号
*/
@ApiModelProperty(value = "开户许可证核准号", required = true)
private String permitNumber;
/**
* 开户许可证
*/
@ApiModelProperty(value = "开户许可证", required = true)
private String permitUrl;
/**
* 企业id
*/
@ApiModelProperty(value = "企业id", required = true)
private Integer coId;

34
zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java
View File

@ -3,6 +3,8 @@ package com.bonus.zlpt.company.api.domain;
import java.io.Serializable;
import com.bonus.zlpt.common.core.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -16,6 +18,7 @@ import lombok.Data;
* 企业信息表
*/
@Data
@ApiModel("企业信息表")
public class BmCompanyInfo implements Serializable {
private static final long serialVersionUID = 1L;
@ -24,174 +27,205 @@ public class BmCompanyInfo implements Serializable {
* 企业id
*/
@Excel(name = "企业id")
@ApiModelProperty(value = "企业id", required = true)
private Integer companyId;
/**
* 企业名称
*/
@Excel(name = "企业名称")
@ApiModelProperty(value = "企业名称", required = true)
private String companyName;
/**
* 企业类型(社会企业，南网集团企业，南网控股企业)
*/
@Excel(name = "企业类型")
@ApiModelProperty(value = "企业类型", required = true)
private String companyType;
/**
* 企业所属（广东电网、广西电网、贵州电网、云南电网、海南电网、储能公司、深圳供电局、超高压公司）
*/
@Excel(name = "企业所属")
@ApiModelProperty(value = "企业所属", required = true)
private String companyLtd;
/**
* 统一社会信用代码
*/
@Excel(name = "统一社会信用代码")
@ApiModelProperty(value = "统一社会信用代码", required = true)
private String creditCode;
/**
* 注册地址
*/
@Excel(name = "注册地址")
@ApiModelProperty(value = "注册地址", required = true)
private String registerAddress;
/**
* 经营地址
*/
@Excel(name = "经营地址")
@ApiModelProperty(value = "经营地址", required = true)
private String operateAddress;
/**
* 证件类型
*/
@Excel(name = "证件类型")
@ApiModelProperty(value = "证件类型", required = true)
private String certificatetype;
/**
* 法人证件号码
*/
@Excel(name = "法人证件号码")
@ApiModelProperty(value = "法人证件号码", required = true)
private String idNumber;
/**
* 营业执照
*/
@Excel(name = "营业执照")
@ApiModelProperty(value = "营业执照", required = true)
private String businessLicense;
/**
* 法人姓名
*/
@Excel(name = "法人姓名")
@ApiModelProperty(value = "法人姓名", required = true)
private String legalPerson;
/**
* 邀请码
*/
@Excel(name = "邀请码")
@ApiModelProperty(value = "邀请码", required = true)
private String invitationCode;
/**
* 邀请企业名称
*/
@Excel(name = "邀请企业名称")
@ApiModelProperty(value = "邀请企业名称", required = true)
private String invitationCoName;
/**
* 经营范围
*/
@Excel(name = "经营范围")
@ApiModelProperty(value = "经营范围", required = true)
private String businessScope;
/**
* 被授权人姓名
*/
@Excel(name = "被授权人姓名")
@ApiModelProperty(value = "被授权人姓名", required = true)
private String authPerson;
/**
* 被授权人身份证
*/
@Excel(name = "被授权人身份证")
@ApiModelProperty(value = "被授权人身份证", required = true)
private String authIdNumber;
/**
* 被授权人手机号
*/
@Excel(name = "被授权人手机号")
@ApiModelProperty(value = "被授权人手机号", required = true)
private String authPhone;
/**
* 法人授权书
*/
@Excel(name = "法人授权书")
@ApiModelProperty(value = "法人授权书", required = true)
private String authDocument;
/**
* 被授权人身份证头像面
*/
@Excel(name = "被授权人身份证头像面")
@ApiModelProperty(value = "被授权人身份证头像面", required = true)
private String idFaceUrl;
/**
* 被授权人身份证国徽面
*/
@Excel(name = "被授权人身份证国徽面")
@ApiModelProperty(value = "被授权人身份证国徽面", required = true)
private String idNationUrl;
/**
* 被授权人邮箱
*/
@Excel(name = "被授权人邮箱")
@ApiModelProperty(value = "被授权人邮箱", required = true)
private String authEmail;
/**
* 创建时间
*/
@Excel(name = "创建时间")
@ApiModelProperty(value = "创建时间", required = true)
private String createTime;
/**
* 创建人
*/
@Excel(name = "创建人")
@ApiModelProperty(value = "创建人", required = true)
private Integer creator;
/**
* 审核人
*/
@Excel(name = "审核人")
@ApiModelProperty(value = "审核人", required = true)
private Integer auditor;
/**
* 审核时间
*/
@Excel(name = "审核时间")
@ApiModelProperty(value = "审核时间", required = true)
private String auditTime;
/**
* 审核备注
*/
@Excel(name = "审核备注")
@ApiModelProperty(value = "审核备注", required = true)
private String auditRemark;
/**
* 状态（0待审核，1通过，2驳回）
*/
@Excel(name = "状态（0待审核，1通过，2驳回）")
@ApiModelProperty(value = "状态（0待审核，1通过，2驳回）", required = true)
private String status;
@Excel(name = "公司logo")
@ApiModelProperty(value = "公司logo", required = true)
private String logoUrl;
@Excel(name = "修改时间")
@ApiModelProperty(value = "修改时间", required = true)
private String updateTime;
@Excel(name = "法人身份证头像面")
@ApiModelProperty(value = "法人身份证头像面", required = true)
private String legalFaceUrl;
@Excel(name = "法人身份证国徽面")
@ApiModelProperty(value = "法人身份证国徽面", required = true)
private String legalNationUrl;

7
zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BusinessMenu.java
View File

@ -1,25 +1,32 @@
package com.bonus.zlpt.company.api.domain;
import com.bonus.zlpt.common.core.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 业务菜单
*/
@Data
@ApiModel("业务菜单")
public class BusinessMenu {
@Excel(name = "id")
@ApiModelProperty(value = "id", required = true)
private Integer id;
@Excel(name = "业务名称")
@ApiModelProperty(value = "业务名称", required = true)
private String name;
@Excel(name = "业务类型")
@ApiModelProperty(value = "业务类型", required = true)
private String type;
@Excel(name = "是否删除")
@ApiModelProperty(value = "是否删除", required = true)
private String isActive;

14
zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BusinessOpen.java
View File

@ -1,45 +1,59 @@
package com.bonus.zlpt.company.api.domain;
import com.bonus.zlpt.common.core.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 业务开通管理
*/
@Data
@ApiModel("业务开通管理")
public class BusinessOpen {
@Excel(name = "id")
@ApiModelProperty(value = "id", required = true)
private Integer id;
@Excel(name = "用户id")
@ApiModelProperty(value = "用户id", required = true)
private Integer userId;
@Excel(name = "企业ID")
@ApiModelProperty(value = "企业ID", required = true)
private Integer coId;
@Excel(name = "业务id")
@ApiModelProperty(value = "业务id", required = true)
private Integer businessId;
@Excel(name = "开通申请日期")
@ApiModelProperty(value = "开通申请日期", required = true)
private String time;
@Excel(name = "附件名称")
@ApiModelProperty(value = "附件名称", required = true)
private String fileName;
@Excel(name = "附件地址")
@ApiModelProperty(value = "附件地址", required = true)
private String fileUrl;
@Excel(name = "审核人")
@ApiModelProperty(value = "审核人", required = true)
private String auditor;
@Excel(name = "审核日期")
@ApiModelProperty(value = "审核日期", required = true)
private String auditTime;
@Excel(name = "状态（0待审核，1通过，2驳回）")
@ApiModelProperty(value = "状态（0待审核，1通过，2驳回）", required = true)
private String status;
@Excel(name = "审核备注 ")
@ApiModelProperty(value = "审核备注", required = true)
private String auditRemark;

12
zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/MaUpOff.java
View File

@ -1,6 +1,9 @@
package com.bonus.zlpt.company.api.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -11,6 +14,7 @@ import lombok.Data;
*/
@Data
@ApiModel("设备上下架管理")
public class MaUpOff implements Serializable {
private static final long serialVersionUID = -734284532786259297L;
@ -20,41 +24,49 @@ public class MaUpOff implements Serializable {
/**
* 设备id
*/
@ApiModelProperty(value = "设备id", required = true)
private Integer maId;
/**
* 申请时间
*/
@ApiModelProperty(value = "申请时间", required = true)
private String applyTime;
/**
* 申请人
*/
@ApiModelProperty(value = "申请人", required = true)
private String applyUser;
/**
* 申请企业
*/
@ApiModelProperty(value = "申请企业", required = true)
private String applyCompany;
/**
* 1上架，2下架
*/
@ApiModelProperty(value = "1上架，2下架", required = true)
private String type;
/**
* 审核人
*/
@ApiModelProperty(value = "审核人", required = true)
private String auditUser;
/**
* 审核时间
*/
@ApiModelProperty(value = "审核时间", required = true)
private String auditTime;
/**
* 状态（1通过，2驳回）
*/
@ApiModelProperty(value = "状态（1通过，2驳回）", required = true)
private String status;
}

9
zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/MaUserCollect.java
View File

@ -1,6 +1,9 @@
package com.bonus.zlpt.company.api.domain;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -11,6 +14,7 @@ import lombok.Data;
*/
@Data
@ApiModel("我的收藏表")
public class MaUserCollect implements Serializable {
private static final long serialVersionUID = -8259045797259132976L;
@ -20,26 +24,31 @@ public class MaUserCollect implements Serializable {
/**
* 用户id
*/
@ApiModelProperty(value = "用户id", required = true)
private Integer userId;
/**
* 用户名
*/
@ApiModelProperty(value = "用户名", required = true)
private String userName;
/**
* 设备id
*/
@ApiModelProperty(value = "设备id", required = true)
private Integer maId;
/**
* 设备名称
*/
@ApiModelProperty(value = "设备名称", required = true)
private String maName;
/**
* 收藏时间
*/
@ApiModelProperty(value = "收藏时间", required = true)
private String time;
}

14
zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/SysDic.java
View File

@ -4,6 +4,8 @@ import com.bonus.zlpt.common.core.annotation.Excel;
import com.bonus.zlpt.common.core.web.domain.BaseEntity;
import com.bonus.zlpt.common.core.web.page.PageDomain;
import com.fasterxml.jackson.databind.ser.Serializers;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -12,6 +14,7 @@ import lombok.EqualsAndHashCode;
*/
@EqualsAndHashCode(callSuper = true)
@Data
@ApiModel("数据字典（企业类型管理）")
public class SysDic extends PageDomain {
private static final long serialVersionUID = 1L;
@ -20,36 +23,47 @@ public class SysDic extends PageDomain {
private PageDomain pageDomain;
@Excel(name = "id")
@ApiModelProperty(value = "id", required = true)
private Integer id;
@Excel(name = "父id")
@ApiModelProperty(value = "父id", required = true)
private Integer pId;
@Excel(name = "编码")
@ApiModelProperty(value = "编码", required = true)
private String code;
@Excel(name = "字典名称")
@ApiModelProperty(value = "字典名称", required = true)
private String name;
@Excel(name = "描述")
@ApiModelProperty(value = "描述", required = true)
private String description;
@Excel(name = "值")
@ApiModelProperty(value = "值", required = true)
private String value;
@Excel(name = "排序")
@ApiModelProperty(value = "排序", required = true)
private String sort;
@Excel(name = "层级")
@ApiModelProperty(value = "层级", required = true)
private String level;
@Excel(name = "状态")
@ApiModelProperty(value = "状态", required = true)
private String status;
@Excel(name = "创建时间")
@ApiModelProperty(value = "创建时间", required = true)
private String createTime;
@Excel(name = "创建人")
@ApiModelProperty(value = "创建人", required = true)
private String creator;

8
zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/BmCompanyDto.java
View File

@ -1,35 +1,43 @@
package com.bonus.zlpt.company.api.domain.dto;
import com.bonus.zlpt.common.core.web.page.PageDomain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("企业对象入参")
public class BmCompanyDto extends PageDomain {
/**
* 企业名称
*/
@ApiModelProperty(value = "企业名称", required = true)
private String companyName;
/**
* 统一社会信用代码
*/
@ApiModelProperty(value = "统一社会信用代码", required = true)
private String creditCode;
/**
* 用户名
*/
@ApiModelProperty(value = "用户名", required = true)
private String userName;
/**
* 开始时间
*/
@ApiModelProperty(value = "开始时间", required = true)
private String beginTime;
/**
* 结束时间
*/
@ApiModelProperty(value = "结束时间", required = true)
private String endTime;

7
zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/FileInfoDto.java
View File

@ -1,22 +1,29 @@
package com.bonus.zlpt.company.api.domain.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 附件表入参
*/
@Data
@ApiModel("附件表入参")
public class FileInfoDto {
//模块id
@ApiModelProperty(value = "模块id", required = true)
private Integer modelId;
//文件路径
@ApiModelProperty(value = "文件路径", required = true)
private String fileUrl;
//创建人
@ApiModelProperty(value = "创建人", required = true)
private String creator;
//创建时间
@ApiModelProperty(value = "创建时间", required = true)
private String createTime;
}

8
zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/ServiceGreementDto.java
View File

@ -1,5 +1,7 @@
package com.bonus.zlpt.company.api.domain.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@ -8,20 +10,26 @@ import java.util.Date;
* 隐私协议入参
*/
@Data
@ApiModel("隐私协议入参")
public class ServiceGreementDto {
//协议id
@ApiModelProperty(value = "协议id", required = true)
private Integer serviceId;
//隐私协议名称
@ApiModelProperty(value = "隐私协议名称", required = true)
private String serviceName;
//创建时间
@ApiModelProperty(value = "创建时间", required = true)
private Date createTime;
//创建人
@ApiModelProperty(value = "创建人", required = true)
private Integer userId;
//协议状态(0 启用, 1 停用)
@ApiModelProperty(value = "协议状态(0 启用, 1 停用)", required = true)
private String status;
}

8
zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/BusinessOpenVo.java
View File

@ -2,32 +2,40 @@ package com.bonus.zlpt.company.api.domain.vo;
import com.bonus.zlpt.common.core.annotation.Excel;
import com.bonus.zlpt.company.api.domain.BusinessOpen;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
@ApiModel("企业对象返回类")
public class BusinessOpenVo extends BusinessOpen {
//企业名称
@Excel(name = "企业名称")
@ApiModelProperty(value = "企业名称", required = true)
private String companyName;
//业务类型
@Excel(name = "业务类型")
@ApiModelProperty(value = "业务类型", required = true)
private String businessType;
//用户名
@Excel(name = "用户名")
@ApiModelProperty(value = "用户名", required = true)
private String nickName;
//用户账号
@Excel(name = "用户账号")
@ApiModelProperty(value = "用户账号", required = true)
private String userName;
//统一社会信用代码
@Excel(name = "统一社会信用代码")
@ApiModelProperty(value = "统一社会信用代码", required = true)
private String creditCode;
}

8
zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/ServiceGreementVo.java
View File

@ -1,31 +1,39 @@
package com.bonus.zlpt.company.api.domain.vo;
import com.bonus.zlpt.common.core.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel("隐私协议返回vo")
@SuppressWarnings("all")
public class ServiceGreementVo {
//协议id
@Excel(name = "协议id")
@ApiModelProperty(value = "协议id", required = true)
private Integer serviceId;
//隐私协议名称
@Excel(name = "隐私协议名称")
@ApiModelProperty(value = "隐私协议名称", required = true)
private String serviceName;
//创建时间
@Excel(name = "创建时间")
@ApiModelProperty(value = "创建时间", required = true)
private Date createTime;
//协议状态(0 启用, 1 停用)
@Excel(name = "协议状态(0 启用, 1 停用)")
@ApiModelProperty(value = "协议状态(0 启用, 1 停用)", required = true)
private String status;
//文件路径
@Excel(name = "文件路径")
@ApiModelProperty(value = "文件路径", required = true)
private String fileUrl;
}

7
zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/FileInfo.java
View File

@ -2,6 +2,8 @@ package com.bonus.zlpt.equip.api.domain;
import com.bonus.zlpt.common.core.annotation.Excel;
import com.bonus.zlpt.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.ToString;
@ -14,6 +16,7 @@ import lombok.ToString;
*/
@Data
@ToString
@ApiModel("设备附件")
public class FileInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
@ -23,17 +26,21 @@ public class FileInfo extends BaseEntity
/** 设备id */
@Excel(name = "设备id")
@ApiModelProperty(value = "设备id", required = true)
private Long maId;
/** 文件名称 */
@Excel(name = "文件名称")
@ApiModelProperty(value = "文件名称", required = true)
private String fileName;
/** 文件路径 */
@Excel(name = "文件路径")
@ApiModelProperty(value = "文件路径", required = true)
private String fileUrl;
/** 0检测信息，1保险信息，3设备照片 */
@Excel(name = "0检测信息，1保险信息，3设备照片")
@ApiModelProperty(value = "0检测信息，1保险信息，3设备照片", required = true)
private String type;
}

5
zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/LeaseInfo.java
View File

@ -2,6 +2,8 @@ package com.bonus.zlpt.equip.api.domain;
import com.bonus.zlpt.common.core.annotation.Excel;
import com.bonus.zlpt.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.ToString;
@ -13,6 +15,7 @@ import lombok.ToString;
*/
@Data
@ToString
@ApiModel("租赁信息对象")
public class LeaseInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
@ -22,10 +25,12 @@ public class LeaseInfo extends BaseEntity
/** 出租信息 */
@Excel(name = "出租信息")
@ApiModelProperty(value = "出租信息", required = true)
private Long czNum;
/** 求租信息 */
@Excel(name = "求租信息")
@ApiModelProperty(value = "求租信息", required = true)
private Long qzNum;
}

10
zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/SysFileInfo.java
View File

@ -1,35 +1,45 @@
package com.bonus.zlpt.equip.api.domain;
import com.bonus.zlpt.common.core.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("附件表")
public class SysFileInfo {
@Excel(name = "id")
@ApiModelProperty(value = "id", required = true)
private Integer id;
@Excel(name = "设备id")
@ApiModelProperty(value = "设备id", required = true)
private Integer modelId;
@Excel(name = "文件名称")
@ApiModelProperty(value = "文件名称", required = true)
private String fileName;
@Excel(name = "文件路径")
@ApiModelProperty(value = "文件路径", required = true)
private String fileUrl;
@Excel(name = "字典id")
@ApiModelProperty(value = "字典id", required = true)
private Integer dicId;
@Excel(name = "创建人")
@ApiModelProperty(value = "创建人", required = true)
private String creator;
@Excel(name = "创建时间")
@ApiModelProperty(value = "创建时间", required = true)
private String createTime;

12
zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/TypeInfo.java
View File

@ -2,6 +2,8 @@ package com.bonus.zlpt.equip.api.domain;
import com.bonus.zlpt.common.core.annotation.Excel;
import com.bonus.zlpt.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.ToString;
@ -16,42 +18,52 @@ import java.util.List;
*/
@Data
@ToString
@ApiModel("设备类型对象")
public class TypeInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 类型id */
@Excel(name = "类型id")
@ApiModelProperty(value = "类型id", required = true)
private Long typeId;
/** 父级id */
@Excel(name = "父级id")
@ApiModelProperty(value = "父级id", required = true)
private Long parentId;
/** 类型名称 */
@Excel(name = "类型名称")
@ApiModelProperty(value = "类型名称", required = true)
private String typeName;
/** 计量单位 */
@Excel(name = "计量单位")
@ApiModelProperty(value = "计量单位", required = true)
private String unitName;
/** 层级 */
@Excel(name = "层级")
@ApiModelProperty(value = "层级", required = true)
private String level;
/** 排序 */
@Excel(name = "排序")
@ApiModelProperty(value = "排序", required = true)
private String sort;
/** 是否删除 */
@Excel(name = "是否删除")
@ApiModelProperty(value = "是否删除", required = true)
private String isActive;
/** 父部门名称 */
@ApiModelProperty(value = "父部门名称", required = true)
private String parentName;
/** 子部门 */
@ApiModelProperty(value = "子部门", required = true)
private List<TypeInfo> children = new ArrayList<TypeInfo>();
}

9
zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/TypeInfoRecord.java
View File

@ -2,6 +2,8 @@ package com.bonus.zlpt.equip.api.domain;
import com.bonus.zlpt.common.core.annotation.Excel;
import com.bonus.zlpt.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.ToString;
@ -13,32 +15,39 @@ import lombok.ToString;
*/
@Data
@ToString
@ApiModel("设备类型对象")
public class TypeInfoRecord extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 类型id */
@Excel(name = "类型id")
@ApiModelProperty(value = "类型id", required = true)
private Long typeId;
/** 父级id */
@Excel(name = "父级id")
@ApiModelProperty(value = "父级id", required = true)
private Long parentId;
/** 类型名称 */
@Excel(name = "类型名称")
@ApiModelProperty(value = "类型名称", required = true)
private String typeName;
/** 层级 */
@Excel(name = "层级")
@ApiModelProperty(value = "层级", required = true)
private String level;
/** 排序 */
@Excel(name = "排序")
@ApiModelProperty(value = "排序", required = true)
private String sort;
/** 是否删除 */
@Excel(name = "是否删除")
@ApiModelProperty(value = "是否删除", required = true)
private String isActive;
}

11
zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/UpOff.java
View File

@ -2,6 +2,8 @@ package com.bonus.zlpt.equip.api.domain;
import com.bonus.zlpt.common.core.annotation.Excel;
import com.bonus.zlpt.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.ToString;
@ -14,6 +16,7 @@ import lombok.ToString;
*/
@Data
@ToString
@ApiModel("设备上下架管理")
public class UpOff extends BaseEntity
{
private static final long serialVersionUID = 1L;
@ -23,34 +26,42 @@ public class UpOff extends BaseEntity
/** 设备id */
@Excel(name = "设备id")
@ApiModelProperty(value = "设备id", required = true)
private Long maId;
/** 申请时间 */
@Excel(name = "申请时间")
@ApiModelProperty(value = "申请时间", required = true)
private String applyTime;
/** 申请人 */
@Excel(name = "申请人")
@ApiModelProperty(value = "申请人", required = true)
private String applyUser;
/** 申请企业 */
@Excel(name = "申请企业")
@ApiModelProperty(value = "申请企业", required = true)
private String applyCompany;
/** 1上架，2下架 */
@Excel(name = "1上架，2下架")
@ApiModelProperty(value = "1上架，2下架", required = true)
private String type;
/** 审核人 */
@Excel(name = "审核人")
@ApiModelProperty(value = "审核人", required = true)
private String auditUser;
/** 审核时间 */
@Excel(name = "审核时间")
@ApiModelProperty(value = "审核时间", required = true)
private String auditTime;
/** 状态（1通过，2驳回） */
@Excel(name = "状态", readConverterExp = "1=通过，2驳回")
@ApiModelProperty(value = "状态（1通过，2驳回）", required = true)
private String status;
}

6
zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/UserCollect.java
View File

@ -2,6 +2,8 @@ package com.bonus.zlpt.equip.api.domain;
import com.bonus.zlpt.common.core.annotation.Excel;
import com.bonus.zlpt.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.ToString;
@ -14,6 +16,7 @@ import lombok.ToString;
*/
@Data
@ToString
@ApiModel("我的收藏")
public class UserCollect extends BaseEntity
{
private static final long serialVersionUID = 1L;
@ -23,14 +26,17 @@ public class UserCollect extends BaseEntity
/** 用户id */
@Excel(name = "用户id")
@ApiModelProperty(value = "用户id", required = true)
private Long userId;
/** 设备id */
@Excel(name = "设备id")
@ApiModelProperty(value = "设备id", required = true)
private Long maId;
/** 收藏时间 */
@Excel(name = "收藏时间")
@ApiModelProperty(value = "收藏时间", required = true)
private String time;
private Boolean isCollect;

4
zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/dto/InforMationDto.java
View File

@ -1,6 +1,7 @@
package com.bonus.zlpt.equip.api.domain.dto;
import com.bonus.zlpt.equip.api.domain.DevInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -9,8 +10,9 @@ import lombok.EqualsAndHashCode;
public class InforMationDto extends DevInfo {
@ApiModelProperty(value = "经度", required = true)
private String lon;
@ApiModelProperty(value = "纬度", required = true)
private String lat;
}

7
zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/dto/UpOffDto.java
View File

@ -1,20 +1,27 @@
package com.bonus.zlpt.equip.api.domain.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("企业上下架入参")
public class UpOffDto {
//系统编码
@ApiModelProperty(value = "系统编码", required = true)
private String code;
//装备名称
@ApiModelProperty(value = "装备名称", required = true)
private String name;
//企业名称
@ApiModelProperty(value = "企业名称", required = true)
private String companyName;
//类型id 根据这个查谁的父id是这个
@ApiModelProperty(value = "类型id", required = true)
private Integer typeId;

7
zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/MaDevInfoVo.java
View File

@ -2,6 +2,7 @@ package com.bonus.zlpt.equip.api.domain.vo;
import com.bonus.zlpt.equip.api.domain.DevInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -11,21 +12,27 @@ public class MaDevInfoVo extends DevInfo {
//企业名称
@ApiModelProperty(value = "企业名称", required = true)
private String companyName;
//装备类型 父级类型typeName
@ApiModelProperty(value = "装备类型", required = true)
private String parentDevType;
//类型名称 当前设备类型名称typeName
@ApiModelProperty(value = "类型名称", required = true)
private String devTypeName;
//装备名称 devTypeName+model_name
@ApiModelProperty(value = "装备名称", required = true)
private String devName;
//设备检验信息图片路径
@ApiModelProperty(value = "设备检验信息图片路径", required = true)
private String inspectImageUrl;
//设备保险信息图片路径
@ApiModelProperty(value = "设备保险信息图片路径", required = true)
private String insureImageUrl;

10
zlpt-common/zlpt-common-log/src/main/java/com/bonus/zlpt/common/log/enums/BusinessType.java
View File

@ -56,4 +56,14 @@ public enum BusinessType
* 清空数据
*/
CLEAN,
/**
* 同意、批准
*/
APPROVE,
/**
* 驳回、拒绝
*/
REJECT,
}

6
zlpt-common/zlpt-common-swagger/pom.xml
View File

@ -34,6 +34,10 @@
<groupId>com.bonus.zlpt</groupId>
<artifactId>zlpt-common-core</artifactId>
</dependency>
<dependency>
<groupId>com.bonus.zlpt</groupId>
<artifactId>zlpt-common-core</artifactId>
</dependency>
</dependencies>
</dependencies>
</project>

3
zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmCompanyInfoMapper.xml
View File

@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
JOIN bm_company_info c ON m.own_co = c.company_id
JOIN gps_real_info g ON m.gps_code = g.gps_code
WHERE
m.ma_status IN ('在租', '自有', '待租')
m.ma_status IN ('在租', '自有', '待租') and m.is_active = '1'
GROUP BY
c.company_ltd, m.ma_status, g.lon, g.lat,maId
@ -43,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="maId != null and maId != '' ">
and md.ma_id = #{maId}
</if>
and md.is_active = '1'
</where>
</select>
</mapper>

14
zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/MaDevInfoMapper.xml
View File

@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT bc.company_ltd AS coType, COUNT(*) AS Count
FROM ma_dev_info md
JOIN bm_company_info bc ON md.own_co = bc.company_id
WHERE md.ma_status = '自有'
WHERE md.ma_status = '自有' and md.is_active = '1'
GROUP BY bc.company_ltd
</select>
@ -19,26 +19,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT mti.type_name as ownCo, COUNT(*) as count
FROM ma_type_info mti
INNER JOIN ma_dev_info mdi ON mti.type_id = mdi.type_id
WHERE mdi.ma_status = '在租'
WHERE mdi.ma_status = '在租' and mdi.is_active = '1'
GROUP BY mti.type_name
ORDER BY count DESC
</select>
<select id="selectList" resultType="java.lang.Integer">
SELECT COUNT(*) AS count FROM ma_dev_info
SELECT COUNT(*) AS count FROM ma_dev_info m
WHERE m.is_active = '1'
</select>
<select id="selectTypeList" resultType="com.bonus.zlpt.bigscreen.domain.vo.TypeVo">
SELECT ma_status as maStatus, COUNT(*) AS count
FROM ma_dev_info
WHERE ma_status IN ('自有', '待租')
WHERE ma_status IN ('自有', '待租') and is_active = '1'
GROUP BY ma_status
</select>
<select id="selectMaTypeList" resultType="com.bonus.zlpt.bigscreen.domain.vo.TypeVo">
SELECT ma_status as maStatus, COUNT(*) AS count
FROM ma_dev_info
WHERE ma_status IN ('在租', '待租')
WHERE ma_status IN ('在租', '待租') and is_active = '1'
GROUP BY ma_status
</select>
@ -47,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM ma_hot_search hs
LEFT JOIN ma_dev_info md ON hs.ma_id = md.ma_id
LEFT JOIN bm_company_info bc ON md.own_co = bc.company_id
WHERE md.is_active = '1'
GROUP BY bc.company_name
ORDER BY count DESC
</select>
@ -60,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM ma_dev_info md
LEFT JOIN ma_type_info mt ON md.type_id = mt.type_id
LEFT JOIN ma_order_details mo ON md.ma_id = mo.ma_id
where md.ma_id = #{maId}
where md.ma_id = #{maId} and md.is_active = '1'
GROUP BY maName,maStatus,needCompany,planStartTime,duration
</select>

6
zlpt-modules/zlpt-equip/pom.xml
View File

@ -71,10 +71,8 @@
<groupId>com.bonus.zlpt</groupId>
<artifactId>zlpt-common-log</artifactId>
</dependency>
<dependency>
<groupId>com.bonus.zlpt</groupId>
<artifactId>zlpt-common-log</artifactId>
</dependency>
<dependency>
<groupId>com.bonus.zlpt</groupId>
<artifactId>zlpt-common-swagger</artifactId>

1
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
View File

@ -26,7 +26,6 @@ import javax.servlet.http.HttpServletResponse;
* @author xsheng
* @date 2023-12-02
*/
@RestController
@RequestMapping("/dev")
@Api(value = "设备信息",tags = "设备管理")

16
zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
View File

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.zlpt.equip.mapper.DevInfoMapper">
<resultMap type="com.bonus.zlpt.equip.api.domain.DevInfo" id="DevInfoResult">
<resultMap type="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo" id="DevInfoResult">
<result property="maId" column="ma_id" />
<result property="code" column="code" />
<result property="typeId" column="type_id" />
@ -33,6 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="isActive" column="is_active" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="deviceName" column="device_name" />
<result property="groupName" column="group_name" />
<result property="companyName" column="company_name" />
</resultMap>
<sql id="selectDevInfoVo">
@ -122,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ma_type_info p on t.parent_id=p.type_id) t on d.type_id = t.type_id
left join bm_company_info c on d.own_co = c.company_id
left join ma_hot_search h on d.ma_id = h.ma_id
left join ma_type_info t on d.type_id = t.type_id
left join ma_type_info ti on d.type_id = ti.type_id
where d.is_active='1'
order by h.search_num
</select>
@ -308,4 +311,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{maId}
</foreach>
</update>
<select id="productList" parameterType="com.bonus.zlpt.equip.api.domain.DevInfo" resultType="com.bonus.zlpt.equip.api.domain.vo.MaDevInfoVo">
select d.*,t.type_name as device_name,t.parent_name as group_name,c.company_name
from ma_dev_info d
left join (select t.*, p.type_name as parent_name
from ma_type_info t
left join ma_type_info p on t.parent_id=p.type_id) t on d.type_id = t.type_id
left join bm_company_info c on d.own_co = c.company_id
</select>
</mapper>

7
zlpt-modules/zlpt-home/src/main/resources/mapper/BmCarouselSetMapper.xml
View File

@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.bonus.zlpt.home.mapper.BmCarouselSetMapper">
<sql id="selectBmCarouseVo">
select id, car_name, car_url, type, open_url, bc.status, bc.create_time, su.user_name AS createBy, sort, is_active
select bc.id, bc.car_name, bc.car_url, bc.type, bc.open_url, bc.status, bc.create_time, su.user_name AS createBy, bc.sort, bc.is_active
from bm_carousel_set bc
left join sys_user su on bc.creator = su.user_id
</sql>
@ -59,12 +59,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
BETWEEN date_format( #{beginTime}, '%Y-%m-%d' )
and date_format( #{endTime}, '%Y-%m-%d' )
</if>
and bc.is_active = '1'
</where>
ORDER BY CASE WHEN sort IS NULL THEN 1 ELSE 0 END, sort
ORDER BY CASE WHEN bc.sort IS NULL THEN 1 ELSE 0 END, bc.sort
</select>
<select id="selectListById" resultType="com.bonus.zlpt.home.pojo.BmCarouselSet">
<include refid="selectBmCarouseVo"/>
where id = #{id}
where bc.id = #{id} and bc.is_active = '1'
</select>
</mapper>

5
zlpt-modules/zlpt-home/src/main/resources/mapper/BmTopicInfoMapper.xml
View File

@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.bonus.zlpt.home.mapper.BmTopicInfoMapper">
<sql id="selectBmTopicVo">
select id, topic_name, type, view_num, content, is_active, su.user_name AS creator, bt.create_time
select bt.id, bt.topic_name, bt.type, bt.view_num, bt.content, bt.is_active, su.user_name AS creator, bt.create_time
from bm_topic_info bt
left join sys_user su on bt.creator = su.user_id
</sql>
@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectListById" resultType="com.bonus.zlpt.home.pojo.BmTopicInfo">
<include refid="selectBmTopicVo"/>
where id = #{id}
where bt.id = #{id} and bt.is_active = '1'
</select>
<select id="selectSpecialInfoList" resultType="com.bonus.zlpt.home.pojo.BmTopicInfo">
@ -69,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
BETWEEN date_format( #{beginTime}, '%Y-%m-%d' )
and date_format( #{endTime}, '%Y-%m-%d' )
</if>
and bt.is_active = '1'
</where>
</select>
</mapper>

42
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java
View File

@ -16,6 +16,7 @@ import com.bonus.zlpt.order.feign.EquipClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@ -40,6 +41,8 @@ import static com.bonus.zlpt.common.core.web.domain.AjaxResult.DATA_TAG;
@RequestMapping("/info")
public class OrderInfoController extends BaseController
{
private final String REJECT_ORDER_STATUS = "39";
@Autowired
private IOrderInfoService orderInfoService;
@Autowired
@ -55,18 +58,20 @@ public class OrderInfoController extends BaseController
{
startPage();
List<OrderInfoVo> list = orderInfoService.selectOrderInfoList(orderInfo);
for (OrderInfoVo orderInfoVo : list) {
Map map1 = (Map) equipClient.getInfo(orderInfoVo.getMaId());
if (map1 != null) {
Map map2 = (Map) map1.get(DATA_TAG);
if (map2 != null) {
String typeName = (String) map2.get("typeName");
String groupName = (String) map2.get("groupName");
String modelName = (String) map2.get("modelName");
String deviceName = (String) map2.get("deviceName");
orderInfoVo.setTypeName(typeName);
orderInfoVo.setGroupName(groupName);
orderInfoVo.setDeviceName(modelName + deviceName);
if (!CollectionUtils.isEmpty(list)) {
for (OrderInfoVo orderInfoVo : list) {
Map map1 = (Map) equipClient.getInfo(orderInfoVo.getMaId());
if (map1 != null) {
Map map2 = (Map) map1.get(DATA_TAG);
if (map2 != null) {
String typeName = (String) map2.get("typeName");
String groupName = (String) map2.get("groupName");
String modelName = (String) map2.get("modelName");
String deviceName = (String) map2.get("deviceName");
orderInfoVo.setTypeName(typeName);
orderInfoVo.setGroupName(groupName);
orderInfoVo.setDeviceName(modelName + deviceName);
}
}
}
}
@ -136,6 +141,19 @@ public class OrderInfoController extends BaseController
return toAjax(orderInfoService.updateOrderInfo(orderInfo));
}
/**
* 驳回订单
*/
@ApiOperation(value = "驳回订单")
@RequiresPermissions("order:info:edit")
@Log(title = "订单信息", businessType = BusinessType.REJECT)
@PutMapping(value = "/reject")
public AjaxResult reject(@RequestBody OrderInfoVo orderInfo)
{
orderInfo.setOrderStatus(REJECT_ORDER_STATUS);
return toAjax(orderInfoService.rejectOrderInfo(orderInfo));
}
/**
* 删除订单信息
*/

2
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderInfoService.java
View File

@ -44,6 +44,8 @@ public interface IOrderInfoService
*/
public int updateOrderInfo(OrderInfoVo orderInfo);
public int rejectOrderInfo(OrderInfoVo orderInfo);
/**
* 批量删除订单信息
*

9
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java
View File

@ -90,8 +90,13 @@ public class OrderInfoServiceImpl implements IOrderInfoService
orderDetailsMapper.insertAttachment(fileInfoDto);
}
orderInfoMapper.updateOrderDetails(orderInfo);
LoginUser user = SecurityUtils.getLoginUser();
orderInfo.setOrderUser(user.getUserid());
// LoginUser user = SecurityUtils.getLoginUser();
return orderInfoMapper.updateOrderInfo(orderInfo);
}
@Override
public int rejectOrderInfo(OrderInfoVo orderInfo)
{
return orderInfoMapper.updateOrderInfo(orderInfo);
}

19
zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
View File

@ -44,16 +44,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectOrderInfoByOrderId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">
-- select d.*,o.code,o.time as order_time,o.order_status
-- from ma_order_info o
-- left join ma_order_details d on d.order_id = o.order_id
-- where o.order_id = #{orderId}
select d.*,o.code,o.time as order_time,o.order_status,s.file_url as contract_url
select d.*,o.code,o.time as order_time,o.order_status
from ma_order_info o
left join ma_order_details d on d.order_id = o.order_id
left join sys_file_info s on s.model_id = o.order_id
where o.order_id = #{orderId} and s.dic_id = 21
left join ma_order_details d on d.order_id = o.order_id
where o.order_id = #{orderId}
</select>
<!-- select d.*,o.code,o.time as order_time,o.order_status,s.file_url as contract_url-->
<!-- from ma_order_info o-->
<!-- left join ma_order_details d on d.order_id = o.order_id-->
<!-- left join sys_file_info s on s.model_id = o.order_id-->
<!-- where o.order_id = #{orderId} and s.dic_id = 21-->
<insert id="insertOrderInfo" parameterType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">
insert into ma_order_info
@ -140,6 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateOrderInfo" parameterType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">
update ma_order_info
<trim prefix="SET" suffixOverrides=",">
<if test="orderId != null">order_id = #{orderId},</if>
<if test="pId != null">p_id = #{pId},</if>
<if test="code != null">code = #{code},</if>
<if test="time != null">time = #{time},</if>
@ -199,6 +200,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="count" parameterType="Long" resultType="Long">
SELECT count(*) from ma_order_info where orderUser = #{userId}
SELECT count(*) from ma_order_info where order_user = #{userId}
</select>
</mapper>

1
zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/controller/BaseAddressController.java
View File

@ -2,7 +2,6 @@ package com.bonus.zlpt.system.controller;
import com.bonus.zlpt.common.core.web.controller.BaseController;
import com.bonus.zlpt.common.core.web.domain.AjaxResult;
import com.bonus.zlpt.system.api.domain.BaseAddress;
import com.bonus.zlpt.system.service.BaseAddressService;
import io.swagger.annotations.Api;