bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目配置问题处理

This commit is contained in:
dingjie 2023-12-08 15:45:04 +08:00
parent 05864d6392
commit 4d285e4d8c
58 changed files with 190 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseController.java
View File

@ -4,8 +4,10 @@ import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.base.damain.MaHouse;
import com.bonus.sgzb.base.domain.MaHouse;
import com.bonus.sgzb.base.service.IhouseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@Api(tags = "仓库货架管理")
@RequestMapping("/house")
public class MaHouseController extends BaseController {
@ -24,6 +27,7 @@ public class MaHouseController extends BaseController {
* @param house
* @return
*/
@ApiOperation(value = "查询仓库货架列表")
@GetMapping("/list")
public TableDataInfo list(MaHouse house)
{
@ -32,9 +36,24 @@ public class MaHouseController extends BaseController {
return getDataTable(list);
}
/**
* 查询仓库列表
* @param house
* @return
*/
@ApiOperation(value = "查询仓库货架列表")
@GetMapping("/tree")
public TableDataInfo tree(MaHouse house)
{
startPage();
List<MaHouse> list = houseService.getHouseTree(house);
return getDataTable(list);
}
/**
* 新增仓库货架
*/
@ApiOperation(value = "新增仓库货架")
@PostMapping
public AjaxResult add(@Validated @RequestBody MaHouse house){
if (!houseService.checkHouseNameUnique(house)) {
@ -49,6 +68,7 @@ public class MaHouseController extends BaseController {
* @param house
* @return
*/
@ApiOperation(value = "修改仓库货架")
@PutMapping
public AjaxResult update(@Validated @RequestBody MaHouse house){
Long houseId = house.getHouseId();
@ -66,6 +86,7 @@ public class MaHouseController extends BaseController {
* @param houseId
* @return
*/
@ApiOperation(value = "删除仓库货架")
@DeleteMapping("/{houseId}")
public AjaxResult delete(@PathVariable("houseId") Long houseId){
if (houseService.hasChildByHouseId(houseId))

9
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseSetController.java
View File

@ -3,9 +3,10 @@ package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.base.damain.MaHouse;
import com.bonus.sgzb.base.damain.MaHouseSet;
import com.bonus.sgzb.base.domain.MaHouseSet;
import com.bonus.sgzb.base.service.MaHouseSetService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -16,6 +17,7 @@ import java.util.List;
* 仓库货架配置
*/
@RestController
@Api(tags = "仓库货架配置")
@RequestMapping("/houseSet")
public class MaHouseSetController extends BaseController {
@ -28,11 +30,12 @@ public class MaHouseSetController extends BaseController {
* @param maHouseSet
* @return
*/
@ApiOperation(value = "查询仓库货架配置")
@GetMapping("/getHouseSet")
public TableDataInfo getHouseSet(MaHouseSet maHouseSet)
{
startPage();
List<MaHouse> list = maHouseSetService.getHouseSetList(maHouseSet);
List<MaHouseSet> list = maHouseSetService.getHouseSetList(maHouseSet);
return getDataTable(list);
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseShelController.java
View File

@ -4,7 +4,7 @@ import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.base.damain.MaHouseShel;
import com.bonus.sgzb.base.domain.MaHouseShel;
import com.bonus.sgzb.base.service.MaHouseShelService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaMachineController.java
View File

@ -3,7 +3,7 @@ package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.base.damain.MaMachine;
import com.bonus.sgzb.base.domain.MaMachine;
import com.bonus.sgzb.base.service.MaMachineService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPartTypeController.java
View File

@ -5,7 +5,7 @@ import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.base.damain.MaPartType;
import com.bonus.sgzb.base.domain.MaPartType;
import com.bonus.sgzb.base.service.IPartTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java
View File

@ -5,7 +5,7 @@ import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.base.damain.MaPropInfo;
import com.bonus.sgzb.base.domain.MaPropInfo;
import com.bonus.sgzb.base.service.IMaPropInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisNumController.java
View File

@ -4,7 +4,7 @@ package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.base.damain.MaTypeHisNum;
import com.bonus.sgzb.base.domain.MaTypeHisNum;
import com.bonus.sgzb.base.service.MaTypeHisNumService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisPriceController.java
View File

@ -4,7 +4,7 @@ package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.base.damain.MaTypeHisPrice;
import com.bonus.sgzb.base.domain.MaTypeHisPrice;
import com.bonus.sgzb.base.service.MaTypeHisPriceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;

41
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaHouse.java → sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouse.java
View File

@ -1,62 +1,69 @@
package com.bonus.sgzb.base.damain;
package com.bonus.sgzb.base.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import java.util.List;
//@ApiModel(value="com.bonus.sgzb.base.domain.MaHouse")
public class MaHouse extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 仓库ID */
@Excel(name = "仓库ID")
@ApiModelProperty(value= "仓库ID")
private Long houseId;
/** 工程项目名称 */
@Excel(name = "工程项目名称")
@ApiModelProperty(value="工程项目名称")
private String houseName;
/** 上级ID */
@Excel(name = "上级ID")
@ApiModelProperty(value= "上级ID")
private Long parentId;
/** 帐号状态（0正常 1停用） */
@Excel(name = "帐号状态（0正常 1停用）")
@ApiModelProperty(value= "帐号状态（0正常 1停用）")
private String status;
/** 所属上级 */
@Excel(name = "所属上级")
@ApiModelProperty(value= "所属上级")
private Long deptId;
/** 删除标志（0代表存在 2代表删除） */
@Excel(name = "删除标志（0代表存在 2代表删除）")
@ApiModelProperty(value= "删除标志（0代表存在 2代表删除）")
private String delFlag;
/** 创建者 */
@Excel(name = "创建者")
@ApiModelProperty(value= "创建者")
private String createBy;
/** 创建时间 */
@Excel(name = "创建时间")
@ApiModelProperty(value= "创建时间")
private Date createTime;
/** 更新者 */
@Excel(name = "更新者")
@ApiModelProperty(value= "更新者")
private String updateBy;
/** 更新时间 */
@Excel(name = "更新时间")
@ApiModelProperty(value= "更新时间")
private Date updateTime;
/** 备注 */
@Excel(name = "备注")
@ApiModelProperty(value= "备注")
private String remark;
/** 数据所属组织 */
@Excel(name = "数据所属组织")
@ApiModelProperty(value= "数据所属组织")
private String companyId;
/** 数据所属组织 */
@ApiModelProperty(value= "排序")
private int sort;
public Long getHouseId() {
return houseId;
}
@ -163,5 +170,11 @@ public class MaHouse extends BaseEntity {
this.companyId = companyId;
}
public int getSort() {
return sort;
}
public void setSort(int sort) {
this.sort = sort;
}
}

25
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaHouseSet.java → sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouseSet.java
View File

@ -1,32 +1,31 @@
package com.bonus.sgzb.base.damain;
package com.bonus.sgzb.base.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ApiModel(value="com.bonus.sgzb.base.damain.MaHouseSet")
@ApiModel(value="com.bonus.sgzb.base.domain.MaHouseSet")
public class MaHouseSet {
/**
* 仓库ID
*/
@Excel(name = "仓库ID")
@ApiModelProperty(value="仓库ID")
private long houseId;
/**
* 机具类型ID
*/
@Excel(name = "机具类型ID")
@ApiModelProperty(value= "机具类型ID")
private long typeId;
/**
* 机具ID
*/
@Excel(name = "机具ID")
@ApiModelProperty(value= "机具ID")
private long maId;
/**
* 数量
*/
@Excel(name = "数量")
@ApiModelProperty(value= "数量")
private String num;
/**
* 帐号状态（0正常 1停用）
@ -35,7 +34,7 @@ public class MaHouseSet {
/**
* 所属上级
*/
@Excel(name = "所属上级")
@ApiModelProperty(value= "所属上级")
private long deptId;
/**
* 删除标志（0代表存在 2代表删除）
@ -45,32 +44,32 @@ public class MaHouseSet {
/**
* 创建者
*/
@Excel(name = "创建者")
@ApiModelProperty(value= "创建者")
private String createBy;
/**
* 创建时间
*/
@Excel(name = "创建时间")
@ApiModelProperty(value= "创建时间")
private java.sql.Timestamp createTime;
/**
* 更新者
*/
@Excel(name = "更新者")
@ApiModelProperty(value= "更新者")
private String updateBy;
/**
* 更新时间
*/
@Excel(name = "更新时间")
@ApiModelProperty(value= "更新时间")
private java.sql.Timestamp updateTime;
/**
* 备注
*/
@Excel(name = "备注")
@ApiModelProperty(value= "备注")
private String remark;
/**
* 数据所属组织
*/
@Excel(name = "数据所属组织")
@ApiModelProperty(value= "数据所属组织")
private String companyId;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaHouseShel.java → sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouseShel.java
View File

@ -1,4 +1,4 @@
package com.bonus.sgzb.base.damain;
package com.bonus.sgzb.base.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaLabelBind.java → sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaLabelBind.java
View File

@ -1,4 +1,4 @@
package com.bonus.sgzb.base.damain;
package com.bonus.sgzb.base.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import lombok.Data;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaMachine.java → sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaMachine.java
View File

@ -1,4 +1,4 @@
package com.bonus.sgzb.base.damain;
package com.bonus.sgzb.base.domain;
public class MaMachine {

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaPartType.java → sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPartType.java
View File

@ -1,4 +1,4 @@
package com.bonus.sgzb.base.damain;
package com.bonus.sgzb.base.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaPropInfo.java → sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPropInfo.java
View File

@ -1,4 +1,4 @@
package com.bonus.sgzb.base.damain;
package com.bonus.sgzb.base.domain;
import com.bonus.sgzb.common.core.annotation.Excel;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaPropSet.java → sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPropSet.java
View File

@ -1,4 +1,4 @@
package com.bonus.sgzb.base.damain;
package com.bonus.sgzb.base.domain;
public class MaPropSet {

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaType.java → sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaType.java
View File

@ -1,4 +1,4 @@
package com.bonus.sgzb.base.damain;
package com.bonus.sgzb.base.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaTypeFile.java → sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaTypeFile.java
View File

@ -1,4 +1,4 @@
package com.bonus.sgzb.base.damain;
package com.bonus.sgzb.base.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaTypeHisNum.java → sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaTypeHisNum.java
View File

@ -1,4 +1,4 @@
package com.bonus.sgzb.base.damain;
package com.bonus.sgzb.base.domain;
public class MaTypeHisNum {

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaTypeHisPrice.java → sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaTypeHisPrice.java
View File

@ -1,4 +1,4 @@
package com.bonus.sgzb.base.damain;
package com.bonus.sgzb.base.domain;
public class MaTypeHisPrice {

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaTypeKeeper.java → sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaTypeKeeper.java
View File

@ -1,4 +1,4 @@
package com.bonus.sgzb.base.damain;
package com.bonus.sgzb.base.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;

18
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseMapper.java
View File

@ -1,23 +1,23 @@
package com.bonus.sgzb.base.mapper;
import com.bonus.sgzb.base.damain.MaHouse;
import com.bonus.sgzb.base.domain.MaHouse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 仓库信息 数据层
*
*
* @author ruoyi
*/
public interface MaHouseMapper
{
public interface MaHouseMapper {
/**
* 校验项目名称
*
* @param houseName 项目名称
* @return 结果
*/
public MaHouse checkHouseNameUnique(String houseName);
public MaHouse checkHouseNameUnique(@Param("houseName") String houseName);
/**
* 新增保存仓库信息
@ -37,6 +37,7 @@ public interface MaHouseMapper
/**
* 删除仓库货架信息
*
* @param houseId
* @return
*/
@ -44,6 +45,7 @@ public interface MaHouseMapper
/**
* 查询仓库信息列表
*
* @param house
* @return
*/
@ -51,6 +53,7 @@ public interface MaHouseMapper
/**
* 根据仓库id查询仓库信息
*
* @param houseId
* @return
*/
@ -58,10 +61,13 @@ public interface MaHouseMapper
/**
* 是否存在子仓库
*
* @param houseId
* @return
*/
int hasChildByHouseId(Long houseId);
Integer hasChildByHouseId(@Param("houseId") Long houseId);
List<MaHouse> selectHouse();
List<MaHouse> selectHouseParent(@Param("parentId") long parentId);
}

5
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseSetMapper.java
View File

@ -1,12 +1,11 @@
package com.bonus.sgzb.base.mapper;
import com.bonus.sgzb.base.damain.MaHouse;
import com.bonus.sgzb.base.damain.MaHouseSet;
import com.bonus.sgzb.base.domain.MaHouseSet;
import java.util.List;
public interface MaHouseSetMapper {
public List<MaHouse> getHouseSetList(MaHouseSet maHouseSet);
public List<MaHouseSet> getHouseSetList(MaHouseSet maHouseSet);
public int maHouseSetAdd(MaHouseSet maHouseSet);

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseShelMapper.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.mapper;
import com.bonus.sgzb.base.damain.MaHouseShel;
import com.bonus.sgzb.base.domain.MaHouseShel;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.mapper;
import com.bonus.sgzb.base.damain.MaMachine;
import com.bonus.sgzb.base.domain.MaMachine;
import java.util.List;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPartTypeMapper.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.mapper;
import com.bonus.sgzb.base.damain.MaPartType;
import com.bonus.sgzb.base.domain.MaPartType;
import java.util.List;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.mapper;
import com.bonus.sgzb.base.damain.MaPropInfo;
import com.bonus.sgzb.base.domain.MaPropInfo;
import java.util.List;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeHisNumMapper.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.mapper;
import com.bonus.sgzb.base.damain.MaTypeHisNum;
import com.bonus.sgzb.base.domain.MaTypeHisNum;
import java.util.List;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeHisPriceMapper.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.mapper;
import com.bonus.sgzb.base.damain.MaTypeHisPrice;
import com.bonus.sgzb.base.domain.MaTypeHisPrice;
import java.util.List;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.mapper;
import com.bonus.sgzb.base.damain.MaType;
import com.bonus.sgzb.base.domain.MaType;
import java.util.List;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.service;
import com.bonus.sgzb.base.damain.MaPropInfo;
import com.bonus.sgzb.base.domain.MaPropInfo;
import java.util.List;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IPartTypeService.java
View File

@ -1,7 +1,7 @@
package com.bonus.sgzb.base.service;
import com.bonus.sgzb.base.damain.MaPartType;
import com.bonus.sgzb.base.domain.MaPartType;
import java.util.List;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.service;
import com.bonus.sgzb.base.damain.MaType;
import com.bonus.sgzb.base.domain.MaType;
import java.util.List;

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IhouseService.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.service;
import com.bonus.sgzb.base.damain.MaHouse;
import com.bonus.sgzb.base.domain.MaHouse;
import java.util.List;
@ -54,4 +54,6 @@ public interface IhouseService {
* @return
*/
boolean hasChildByHouseId(Long houseId);
List<MaHouse> getHouseTree(MaHouse house);
}

5
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaHouseSetService.java
View File

@ -1,13 +1,12 @@
package com.bonus.sgzb.base.service;
import com.bonus.sgzb.base.damain.MaHouse;
import com.bonus.sgzb.base.damain.MaHouseSet;
import com.bonus.sgzb.base.domain.MaHouseSet;
import java.util.List;
public interface MaHouseSetService {
public List<MaHouse> getHouseSetList(MaHouseSet maHouseSet);
public List<MaHouseSet> getHouseSetList(MaHouseSet maHouseSet);
public int maHouseSetAdd(MaHouseSet maHouseSet);

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaHouseShelService.java
View File

@ -1,7 +1,7 @@
package com.bonus.sgzb.base.service;
import com.bonus.sgzb.base.damain.MaHouseShel;
import com.bonus.sgzb.base.domain.MaHouseShel;
import java.util.List;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaMachineService.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.service;
import com.bonus.sgzb.base.damain.MaMachine;
import com.bonus.sgzb.base.domain.MaMachine;
import java.util.List;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaTypeHisNumService.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.service;
import com.bonus.sgzb.base.damain.MaTypeHisNum;
import com.bonus.sgzb.base.domain.MaTypeHisNum;
import java.util.List;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaTypeHisPriceService.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.service;
import com.bonus.sgzb.base.damain.MaTypeHisPrice;
import com.bonus.sgzb.base.domain.MaTypeHisPrice;
import java.util.List;

19
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseServiceImpl.java
View File

@ -3,12 +3,13 @@ package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.common.core.constant.UserConstants;
import com.bonus.sgzb.common.core.exception.ServiceException;
import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.base.damain.MaHouse;
import com.bonus.sgzb.base.domain.MaHouse;
import com.bonus.sgzb.base.mapper.MaHouseMapper;
import com.bonus.sgzb.base.service.IhouseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
@ -93,7 +94,21 @@ public class MaHouseServiceImpl implements IhouseService {
*/
@Override
public boolean hasChildByHouseId(Long houseId) {
int result = houseMapper.hasChildByHouseId(houseId);
Integer result = houseMapper.hasChildByHouseId(houseId);
return result > 0;
}
/**
* 查询货架列表组织树
* @param house 货架信息
* @return 结果
*/
@Override
public List<MaHouse> getHouseTree(MaHouse house) {
List<MaHouse> houseList = houseMapper.selectHouseParent(0L);
for (MaHouse maHouse : houseList) {
houseMapper.selectHouseParent(0L);
}
return null;
}
}

5
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseSetImpl.java
View File

@ -1,7 +1,6 @@
package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.base.damain.MaHouse;
import com.bonus.sgzb.base.damain.MaHouseSet;
import com.bonus.sgzb.base.domain.MaHouseSet;
import com.bonus.sgzb.base.mapper.MaHouseSetMapper;
import com.bonus.sgzb.base.service.MaHouseSetService;
import org.springframework.beans.factory.annotation.Autowired;
@ -16,7 +15,7 @@ public class MaHouseSetImpl implements MaHouseSetService {
private MaHouseSetMapper maHouseSetMapper;
@Override
public List<MaHouse> getHouseSetList(MaHouseSet maHouseSet) {
public List<MaHouseSet> getHouseSetList(MaHouseSet maHouseSet) {
return maHouseSetMapper.getHouseSetList(maHouseSet);
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseShelServiceImpl.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.base.damain.MaHouseShel;
import com.bonus.sgzb.base.domain.MaHouseShel;
import com.bonus.sgzb.base.mapper.MaHouseShelMapper;
import com.bonus.sgzb.base.service.MaHouseShelService;
import org.springframework.stereotype.Service;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.base.damain.MaMachine;
import com.bonus.sgzb.base.domain.MaMachine;
import com.bonus.sgzb.base.mapper.MaMachineMapper;
import com.bonus.sgzb.base.service.MaMachineService;
import org.springframework.beans.factory.annotation.Autowired;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPartTypeServiceImpl.java
View File

@ -2,7 +2,7 @@ package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.common.core.constant.UserConstants;
import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.base.damain.MaPartType;
import com.bonus.sgzb.base.domain.MaPartType;
import com.bonus.sgzb.base.mapper.MaPartTypeMapper;
import com.bonus.sgzb.base.service.IPartTypeService;
import org.springframework.beans.factory.annotation.Autowired;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java
View File

@ -4,7 +4,7 @@ import com.bonus.sgzb.common.core.constant.UserConstants;
import com.bonus.sgzb.common.core.exception.ServiceException;
import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.common.core.utils.bean.BeanValidators;
import com.bonus.sgzb.base.damain.MaPropInfo;
import com.bonus.sgzb.base.domain.MaPropInfo;
import com.bonus.sgzb.base.mapper.MaPropInfoMapper;
import com.bonus.sgzb.base.service.IMaPropInfoService;
import lombok.extern.slf4j.Slf4j;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeHisNumServiceImpl.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.base.damain.MaTypeHisNum;
import com.bonus.sgzb.base.domain.MaTypeHisNum;
import com.bonus.sgzb.base.mapper.MaTypeHisNumMapper;
import com.bonus.sgzb.base.service.MaTypeHisNumService;
import org.springframework.beans.factory.annotation.Autowired;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeHisPriceServiceImpl.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.base.damain.MaTypeHisPrice;
import com.bonus.sgzb.base.domain.MaTypeHisPrice;
import com.bonus.sgzb.base.mapper.MaTypeHisPriceMapper;
import com.bonus.sgzb.base.service.MaTypeHisPriceService;
import org.springframework.beans.factory.annotation.Autowired;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java
View File

@ -1,7 +1,7 @@
package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.base.damain.MaType;
import com.bonus.sgzb.base.domain.MaType;
import com.bonus.sgzb.base.mapper.MaTypeMapper;
import com.bonus.sgzb.base.service.ITypeService;
import org.springframework.beans.factory.annotation.Autowired;

34
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseMapper.xml
View File

@ -4,25 +4,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.base.mapper.MaHouseMapper">
<resultMap type="com.bonus.sgzb.base.damain.MaHouse" id="SysHouseResult">
<resultMap type="com.bonus.sgzb.base.domain.MaHouse" id="SysHouseResult">
<id property="houseId" column="house_id" />
<result property="houseName" column="house_name" />
<result property="parentId" column="parent_id" />
<result property="status" column="status" />
<result property="deptId" column="dept_id" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="companyId" column="company_id" />
<result property="sort" column="sort" />
</resultMap>
<sql id="selectHouseVo">
select house_id, house_name, parent_id, status, dept_id, del_flag, create_by, create_time, remark, company_id
select house_id, house_name, parent_id, status, dept_id, del_flag, create_by, create_time, remark, company_id, sort
from ma_house_info
</sql>
<insert id="insertHouse" parameterType="com.bonus.sgzb.base.damain.MaHouse" useGeneratedKeys="true" keyProperty="houseId">
<insert id="insertHouse" parameterType="com.bonus.sgzb.base.domain.MaHouse" useGeneratedKeys="true" keyProperty="houseId">
insert into ma_house_info(
<if test="houseId != null and houseId != 0">house_id,</if>
<if test="houseName != null and houseName != ''">house_name,</if>
@ -68,13 +71,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update ma_house_info set del_flag = '2' where house_id = #{houseId}
</delete>
<select id="checkHouseNameUnique" resultType="com.bonus.sgzb.base.damain.MaHouse">
<include refid="selectHouseVo"/>
where house_name=#{houseName} limit 1
</select>
<select id="selectHouseList" resultType="com.bonus.sgzb.base.damain.MaHouse">
<include refid="selectHouseVo"/>
<select id="selectHouseList" parameterType="com.bonus.sgzb.base.domain.MaHouse" resultMap="SysHouseResult">
select house_id, house_name, parent_id, status, dept_id, del_flag, create_by, create_time, remark, company_id, sort
from ma_house_info
<where>
<if test="houseName != null and houseName != ''">
AND house_name like concat('%', #{houseName}, '%')
@ -82,18 +82,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectHouseById" resultType="com.bonus.sgzb.base.damain.MaHouse">
<select id="selectHouseById" parameterType="com.bonus.sgzb.base.domain.MaHouse" resultMap="SysHouseResult">
<include refid="selectHouseVo"/>
where house_id = #{houseId}
order by sort
</select>
<select id="hasChildByHouseId" resultType="java.lang.Integer">
<select id="hasChildByHouseId" parameterType="Long">
select count(1) from ma_house_info
where del_flag = '0' and parent_id = #{houseId} limit 1
</select>
<select id="selectHouse" resultType="com.bonus.sgzb.base.damain.MaHouse">
<select id="selectHouse" parameterType="com.bonus.sgzb.base.domain.MaHouse" resultMap="SysHouseResult">
<include refid="selectHouseVo"/>
</select>
<select id="selectHouseParent" parameterType="com.bonus.sgzb.base.domain.MaHouse" resultMap="SysHouseResult">
<include refid="selectHouseVo"/>
where parent_id = #{parentId}
order by sort
</select>
<select id="checkHouseNameUnique" parameterType= "String" resultMap="SysHouseResult">
<include refid="selectHouseVo"/>
where house_name=#{houseName} limit 1
</select>
</mapper>

6
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml
View File

@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.base.mapper.MaHouseSetMapper">
<resultMap type="com.bonus.sgzb.base.damain.MaHouseSet" id="SysHouseSetResult">
<resultMap type="com.bonus.sgzb.base.domain.MaHouseSet" id="SysHouseSetResult">
<id property="houseId" column="house_id" />
<result property="typeId" column="type_id" />
<result property="maId" column="ma_id" />
@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from ma_house_set
</sql>
<insert id="maHouseSetAdd" parameterType="com.bonus.sgzb.base.damain.MaHouseSet" >
<insert id="maHouseSetAdd" parameterType="com.bonus.sgzb.base.domain.MaHouseSet" >
insert into ma_house_set(
<if test="houseId != null and houseId != 0">house_id,</if>
<if test="typeId != null and typeId != ''">type_id,</if>
@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getHouseSetList" resultType="com.bonus.sgzb.base.damain.MaHouseSet">
<select id="getHouseSetList" resultType="com.bonus.sgzb.base.domain.MaHouseSet">
select house_id, type_id, ma_id, num, status, dept_id, del_flag, create_by, create_time, update_by,update_time,remark,company_id
from ma_house_set
<where>

2
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseShelMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.bonus.sgzb.base.mapper.MaHouseShelMapper">
<resultMap id="BaseResultMap" type="com.bonus.sgzb.base.damain.MaHouseShel">
<resultMap id="BaseResultMap" type="com.bonus.sgzb.base.domain.MaHouseShel">
<id column="shelve_id" property="shelveId" jdbcType="BIGINT"/>
<result column="shelve_name" property="shelveName" jdbcType="VARCHAR"/>
<result column="parent_id" property="parentId" jdbcType="BIGINT"/>

8
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
View File

@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.base.mapper.MaMachineMapper">
<resultMap type="com.bonus.sgzb.base.damain.MaMachine" id="MaMachineResult">
<resultMap type="com.bonus.sgzb.base.domain.MaMachine" id="MaMachineResult">
<id property="maId" column="ma_id" />
<result property="typeId" column="type_id" />
<result property="maCode" column="ma_code" />
@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="getMaMachine" resultType="com.bonus.sgzb.base.damain.MaMachine">
<select id="getMaMachine" resultType="com.bonus.sgzb.base.domain.MaMachine">
select ma_id, type_id, ma_code, pre_code, ma_status, qr_code, buy_price, ma_vender, out_fac_time, out_fac_code,
assets_code, check_man, this_check_time, next_check_time, gps_code, rfid_code, erp_code, transfer_code,
@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<insert id="maMachineAdd" parameterType="com.bonus.sgzb.base.damain.MaMachine">
<insert id="maMachineAdd" parameterType="com.bonus.sgzb.base.domain.MaMachine">
insert into ma_machine (
<if test="typeId != null and typeId != '' ">type_id,</if>
<if test="maCode != null and maCode != '' ">ma_code,</if>
@ -164,7 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</insert>
<update id="updateMaMachine" parameterType="com.bonus.sgzb.base.damain.MaMachine">
<update id="updateMaMachine" parameterType="com.bonus.sgzb.base.domain.MaMachine">
update ma_machine
<set>
<if test="typeId != null and typeId != ''">type_id = #{typeId},</if>

10
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
View File

@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from ma_type
</sql>
<insert id="insertType" parameterType="com.bonus.sgzb.base.damain.MaType" useGeneratedKeys="true" keyProperty="typeId">
<insert id="insertType" parameterType="com.bonus.sgzb.base.domain.MaType" useGeneratedKeys="true" keyProperty="typeId">
insert into ma_type(
<if test="typeId != null and typeId != 0">type_id,</if>
<if test="typeName != null and typeName != ''">type_name,</if>
@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</insert>
<insert id="insertTypeFile" parameterType="com.bonus.sgzb.base.damain.MaTypeFile" useGeneratedKeys="true" keyProperty="typeId">
<insert id="insertTypeFile" parameterType="com.bonus.sgzb.base.domain.MaTypeFile" useGeneratedKeys="true" keyProperty="typeId">
insert into ma_type_file(
<if test="typeId != null and typeId != 0">type_id,</if>
<if test="maId != null and maId != ''">ma_id,</if>
@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update ma_type set del_flag = '2' where type_id = #{typeId}
</delete>
<select id="selectMaTypeList" resultType="com.bonus.sgzb.base.damain.MaType">
<select id="selectMaTypeList" resultType="com.bonus.sgzb.base.domain.MaType">
select m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.manage_type, m.lease_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load, m.holding_time, m.warn_num, mtf.file_name, mtf.file_url, su.user_name, mpi.prop_name, m.del_flag, m.create_by, m.create_time, m.remark, m.company_id
from ma_type m
left join ma_prop_set mps on m.type_id = mps.type_id
@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_user su on mtk.user_id = su.user_id
</select>
<select id="selectTypeList" resultType="com.bonus.sgzb.base.damain.MaType">
<select id="selectTypeList" resultType="com.bonus.sgzb.base.domain.MaType">
<include refid="selectMaTypeVo"/>
<where>
<if test="typeName != null and typeName != ''">
@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where del_flag = '0' and parent_id = #{typeId} limit 1
</select>
<select id="checkTypeNameUnique" resultType="com.bonus.sgzb.base.damain.MaType">
<select id="checkTypeNameUnique" resultType="com.bonus.sgzb.base.domain.MaType">
<include refid="selectMaTypeVo"/>
where type_name = #{typeName} limit 1
</select>

4
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPartTypeMapper.xml
View File

@ -46,12 +46,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update ma_part_type set del_flag = '2' where pa_id = #{paId}
</delete>
<select id="checkPartNameUnique" resultType="com.bonus.sgzb.base.damain.MaPartType">
<select id="checkPartNameUnique" resultType="com.bonus.sgzb.base.domain.MaPartType">
<include refid="selectMaPartTypeVo"/>
where pa_name = #{paName} limit 1
</select>
<select id="selectMaPartType" resultType="com.bonus.sgzb.base.damain.MaPartType">
<select id="selectMaPartType" resultType="com.bonus.sgzb.base.domain.MaPartType">
<include refid="selectMaPartTypeVo"/>
<where>
<if test="paName != null and paName != ''">

4
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml
View File

@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update ma_prop_info set del_flag = '2' where prop_id = #{propId}
</delete>
<select id="selectMaPropSet" resultType="com.bonus.sgzb.base.damain.MaPropInfo">
<select id="selectMaPropSet" resultType="com.bonus.sgzb.base.domain.MaPropInfo">
<include refid="selectMaPropInfoVo"/>
<where>
<if test="propName != null and propName != ''">
@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="checkPropNameUnique" resultType="com.bonus.sgzb.base.damain.MaPropInfo">
<select id="checkPropNameUnique" resultType="com.bonus.sgzb.base.domain.MaPropInfo">
<include refid="selectMaPropInfoVo"/>
where prop_name = #{propName} limit 1
</select>

8
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeHisNumMapper.xml
View File

@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.base.mapper.MaTypeHisNumMapper">
<resultMap type="com.bonus.sgzb.base.damain.MaTypeHisPrice" id="MaTypeHisNUmResult">
<resultMap type="com.bonus.sgzb.base.domain.MaTypeHisPrice" id="MaTypeHisNUmResult">
<id property="typeId" column="type_id" />
<result property="storageNum" column="storage_num" />
<result property="time" column="time" />
@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from ma_type_his_num
</sql>
<select id="getTypeHisNum" resultType="com.bonus.sgzb.base.damain.MaTypeHisNum">
<select id="getTypeHisNum" resultType="com.bonus.sgzb.base.domain.MaTypeHisNum">
select type_id, storage_num, time, status, company_id
from ma_type_his_num
@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<insert id="typeHisNumAdd" parameterType="com.bonus.sgzb.base.damain.MaTypeHisNum">
<insert id="typeHisNumAdd" parameterType="com.bonus.sgzb.base.domain.MaTypeHisNum">
insert into ma_type_his_num (
<if test="storageNum != null and storageNum != '' ">storage_num,</if>
<if test="time != null and time != '' ">time,</if>
@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</insert>
<update id="updateTypeHisNum" parameterType="com.bonus.sgzb.base.damain.MaTypeHisNum">
<update id="updateTypeHisNum" parameterType="com.bonus.sgzb.base.domain.MaTypeHisNum">
update ma_type_his_num
<set>
<if test="storageNum != null and storageNum != ''">storage_num = #{storageNum},</if>

8
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeHisPriceMapper.xml
View File

@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.base.mapper.MaTypeHisPriceMapper">
<resultMap type="com.bonus.sgzb.base.damain.MaTypeHisPrice" id="MaTypeHisPriceResult">
<resultMap type="com.bonus.sgzb.base.domain.MaTypeHisPrice" id="MaTypeHisPriceResult">
<id property="typeId" column="type_id" />
<result property="leasePrice" column="lease_price" />
<result property="time" column="time" />
@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from ma_type_his_price
</sql>
<select id="getTypeHisPrice" resultType="com.bonus.sgzb.base.damain.MaTypeHisPrice">
<select id="getTypeHisPrice" resultType="com.bonus.sgzb.base.domain.MaTypeHisPrice">
select type_id, lease_price, time, status, company_id
from ma_type_his_price
@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<insert id="typeHisPriceAdd" parameterType="com.bonus.sgzb.base.damain.MaTypeHisPrice">
<insert id="typeHisPriceAdd" parameterType="com.bonus.sgzb.base.domain.MaTypeHisPrice">
insert into ma_type_his_price (
<if test="leasePrice != null and leasePrice != '' ">ma_code,</if>
<if test="time != null and time != '' ">time,</if>
@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</insert>
<update id="updateTypeHisPrice" parameterType="com.bonus.sgzb.base.damain.MaTypeHisPrice">
<update id="updateTypeHisPrice" parameterType="com.bonus.sgzb.base.domain.MaTypeHisPrice">
update ma_type_his_price
<set>
<if test="leasePrice != null and leasePrice != ''">ma_code = #{leasePrice},</if>

16
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeMapper.xml
View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.base.mapper.MaTypeMapper">
<sql id="selectMaTypeVo">
select type_id, type_name, parent_id, status, num, unit_id, manage_type, lease_price, buy_price, pay_price, level, rated_load, test_load, holding_time, warn_num, del_flag, create_by, create_time, remark, company_id
from ma_type
</sql>
<select id="selectMaTypeList" resultType="com.bonus.sgzb.base.damain.MaType">
<include refid="selectMaTypeVo"/>
</select>
</mapper>