b2894lxlx/tuanwei-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复设备分类和设备型号问题

Browse Source
This commit is contained in:
gxwebsoft
2023-06-05 17:06:07 +08:00
parent d2a82a97e6
commit 47e758e22f
8 changed files with 58 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/gxwebsoft/common/system/entity/Company.java
View File

@@ -38,6 +38,9 @@ public class Company implements Serializable {
@ApiModelProperty(value = "类型 10企业 20政府单位")
private Integer companyType;
@ApiModelProperty(value = "企业类型 多选")
private String companyTypeMultiple;
@ApiModelProperty(value = "应用标识")
private String companyLogo;
@@ -47,6 +50,9 @@ public class Company implements Serializable {
@ApiModelProperty(value = "联系电话")
private String phone;
@ApiModelProperty(value = "企业法人")
private String businessEntity;
@ApiModelProperty(value = "发票抬头")
@TableField("Invoice_header")
private String invoiceHeader;
@@ -111,9 +117,15 @@ public class Company implements Serializable {
@ApiModelProperty(value = "状态")
private Integer status;
@ApiModelProperty(value = "排序")
private Integer sortNumber;
@ApiModelProperty(value = "用户ID")
private Integer userId;
@ApiModelProperty(value = "是否含税")
private Boolean isTax;
@ApiModelProperty(value = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;

6
src/main/java/com/gxwebsoft/common/system/param/CompanyParam.java
View File

@@ -39,6 +39,9 @@ public class CompanyParam extends BaseParam {
@QueryField(type = QueryType.EQ)
private Integer companyType;
@ApiModelProperty(value = "企业类型 多选")
private String companyTypeMultiple;
@ApiModelProperty(value = "应用标识")
private String companyLogo;
@@ -48,6 +51,9 @@ public class CompanyParam extends BaseParam {
@ApiModelProperty(value = "联系电话")
private String phone;
@ApiModelProperty(value = "企业法人")
private String businessEntity;
@ApiModelProperty(value = "发票抬头")
private String invoiceHeader;

13
src/main/java/com/gxwebsoft/tower/controller/TowerModelController.java
View File

@@ -32,11 +32,8 @@ public class TowerModelController extends BaseController {
@ApiOperation("分页查询设备型号管理表")
@GetMapping("/page")
public ApiResult<PageResult<TowerModel>> page(TowerModelParam param) {
PageParam<TowerModel, TowerModelParam> page = new PageParam<>(param);
page.setDefaultOrder("create_time desc");
return success(towerModelService.page(page, page.getWrapper()));
// 使用关联查询
//return success(towerModelService.pageRel(param));
return success(towerModelService.pageRel(param));
}
@PreAuthorize("hasAuthority('tower:towerModel:list')")
@@ -44,11 +41,8 @@ public class TowerModelController extends BaseController {
@ApiOperation("查询全部设备型号管理表")
@GetMapping()
public ApiResult<List<TowerModel>> list(TowerModelParam param) {
PageParam<TowerModel, TowerModelParam> page = new PageParam<>(param);
page.setDefaultOrder("create_time desc");
return success(towerModelService.list(page.getOrderWrapper()));
// 使用关联查询
//return success(towerModelService.listRel(param));
return success(towerModelService.listRel(param));
}
@PreAuthorize("hasAuthority('tower:towerModel:list')")
@@ -56,9 +50,8 @@ public class TowerModelController extends BaseController {
@ApiOperation("根据id查询设备型号管理表")
@GetMapping("/{id}")
public ApiResult<TowerModel> get(@PathVariable("id") Integer id) {
return success(towerModelService.getById(id));
// 使用关联查询
//return success(towerModelService.getByIdRel(id));
return success(towerModelService.getByIdRel(id));
}
@PreAuthorize("hasAuthority('tower:towerModel:save')")

13
src/main/java/com/gxwebsoft/tower/entity/TowerAccessory.java
View File

@@ -1,20 +1,18 @@
package com.gxwebsoft.tower.entity;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDate;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 配件管理
*
@@ -43,6 +41,9 @@ public class TowerAccessory implements Serializable {
@ApiModelProperty(value = "适用设备型号")
private String accessoryModel;
@ApiModelProperty(value = "适用设备型号(多选)")
private String accessoryModelMultiple;
@ApiModelProperty(value = "配件规格")
private String accessorySpecs;

11
src/main/java/com/gxwebsoft/tower/entity/TowerModel.java
View File

@@ -24,11 +24,14 @@ public class TowerModel implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "型号ID")
@TableId(value = "category_id", type = IdType.AUTO)
private Integer categoryId;
@TableId(value = "model_id", type = IdType.AUTO)
private Integer modelId;
@ApiModelProperty(value = "设备型号名称")
private String title;
@ApiModelProperty(value = "设备名称")
private String name;
@ApiModelProperty(value = "设备型号")
private String model;
@ApiModelProperty(value = "上级分类ID")
private Integer parentId;

17
src/main/java/com/gxwebsoft/tower/mapper/xml/TowerModelMapper.xml
View File

@@ -7,11 +7,14 @@
SELECT a.*
FROM tower_model a
<where>
<if test="param.categoryId != null">
AND a.category_id = #{param.categoryId}
<if test="param.modelId != null">
AND a.model_id = #{param.modelId}
</if>
<if test="param.title != null">
AND a.title LIKE CONCAT('%', #{param.title}, '%')
<if test="param.name != null">
AND a.name LIKE CONCAT('%', #{param.name}, '%')
</if>
<if test="param.model != null">
AND a.model LIKE CONCAT('%', #{param.model}, '%')
</if>
<if test="param.parentId != null">
AND a.parent_id = #{param.parentId}
@@ -46,6 +49,12 @@
<if test="param.createTimeEnd != null">
AND a.create_time &lt;= #{param.createTimeEnd}
</if>
<if test="param.keywords != null">
AND (
a.name LIKE CONCAT('%', #{param.keywords}, '%')
OR a.model LIKE CONCAT('%', #{param.keywords}, '%')
)
</if>
</where>
</sql>

9
src/main/java/com/gxwebsoft/tower/param/TowerModelParam.java
View File

@@ -24,10 +24,13 @@ public class TowerModelParam extends BaseParam {
@ApiModelProperty(value = "型号ID")
@QueryField(type = QueryType.EQ)
private Integer categoryId;
private Integer modelId;
@ApiModelProperty(value = "设备型号名称")
private String title;
@ApiModelProperty(value = "设备名称")
private String name;
@ApiModelProperty(value = "设备型号")
private String model;
@ApiModelProperty(value = "上级分类ID")
@QueryField(type = QueryType.EQ)

8
src/main/java/com/gxwebsoft/tower/service/impl/TowerModelServiceImpl.java
View File

@@ -23,7 +23,7 @@ public class TowerModelServiceImpl extends ServiceImpl<TowerModelMapper, TowerMo
@Override
public PageResult<TowerModel> pageRel(TowerModelParam param) {
PageParam<TowerModel, TowerModelParam> page = new PageParam<>(param);
//page.setDefaultOrder("create_time desc");
page.setDefaultOrder("create_time desc");
List<TowerModel> list = baseMapper.selectPageRel(page, param);
return new PageResult<>(list, page.getTotal());
}
@@ -33,14 +33,14 @@ public class TowerModelServiceImpl extends ServiceImpl<TowerModelMapper, TowerMo
List<TowerModel> list = baseMapper.selectListRel(param);
// 排序
PageParam<TowerModel, TowerModelParam> page = new PageParam<>();
//page.setDefaultOrder("create_time desc");
page.setDefaultOrder("create_time desc");
return page.sortRecords(list);
}
@Override
public TowerModel getByIdRel(Integer categoryId) {
public TowerModel getByIdRel(Integer modelId) {
TowerModelParam param = new TowerModelParam();
param.setCategoryId(categoryId);
param.setModelId(modelId);
return param.getOne(baseMapper.selectListRel(param));
}