From f42e2210ba2975944f699a0013b18480b981421b Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Mon, 25 Mar 2024 15:24:02 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/base/api/domain/SysDic.java | 123 +++--- .../app/mapper/LeaseOutDetailsMapper.java | 2 + .../impl/LeaseOutDetailsServiceImpl.java | 8 + .../base/controller/BmUnitInfoController.java | 2 +- .../bonus/sgzb/base/domain/BmProjectInfo.java | 18 +- .../bonus/sgzb/base/domain/BmProjectLot.java | 414 ++++++++++-------- .../bonus/sgzb/base/domain/BmUnitInfo.java | 31 +- .../bonus/sgzb/base/domain/MaPropInfo.java | 13 +- .../mapper/app/LeaseOutDetailsMapper.xml | 4 + .../com/bonus/sgzb/system/domain/SysPost.java | 1 - 10 files changed, 319 insertions(+), 297 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SysDic.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SysDic.java index 09096d2b..37f6a0e7 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SysDic.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SysDic.java @@ -11,137 +11,138 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author bonus * @date 2023-12-11 */ -public class SysDic extends BaseEntity -{ +public class SysDic extends BaseEntity { private static final long serialVersionUID = 1L; - /** $column.columnComment */ + /** + * $column.columnComment + */ private Long id; - /** 父id */ - @Excel(name = "父id") + /** + * 父id + */ private Long pId; - /** 编码 */ - @Excel(name = "编码") + /** + * 编码 + */ private String code; - /** 字典名称 */ - @Excel(name = "字典名称") + /** + * 字典名称 + */ + @Excel(name = "单位类型") private String name; - /** 描述 */ - @Excel(name = "描述") + /** + * 描述 + */ private String description; - /** 值 */ - @Excel(name = "值") + /** + * 值 + */ private String value; - /** 排序 */ - @Excel(name = "排序") + /** + * 排序 + */ private String sort; - /** 层级 */ - @Excel(name = "层级") + /** + * 层级 + */ private String level; - /** 状态 */ - @Excel(name = "状态") + /** + * 状态 + */ + @Excel(name = "状态", readConverterExp = "0=启用,1=不启用,2=删除") private String status; - /** 创建人 */ - @Excel(name = "创建人") + /** + * 创建人 + */ private String creator; - public void setId(Long id) - { + public void setId(Long id) { this.id = id; } - public Long getId() - { + public Long getId() { return id; } - public void setpId(Long pId) - { + + public void setpId(Long pId) { this.pId = pId; } - public Long getpId() - { + public Long getpId() { return pId; } - public void setCode(String code) - { + + public void setCode(String code) { this.code = code; } - public String getCode() - { + public String getCode() { return code; } - public void setName(String name) - { + + public void setName(String name) { this.name = name; } - public String getName() - { + public String getName() { return name; } - public void setDescription(String description) - { + + public void setDescription(String description) { this.description = description; } - public String getDescription() - { + public String getDescription() { return description; } - public void setValue(String value) - { + + public void setValue(String value) { this.value = value; } - public String getValue() - { + public String getValue() { return value; } - public void setSort(String sort) - { + + public void setSort(String sort) { this.sort = sort; } - public String getSort() - { + public String getSort() { return sort; } - public void setLevel(String level) - { + + public void setLevel(String level) { this.level = level; } - public String getLevel() - { + public String getLevel() { return level; } - public void setStatus(String status) - { + + public void setStatus(String status) { this.status = status; } - public String getStatus() - { + public String getStatus() { return status; } - public void setCreator(String creator) - { + + public void setCreator(String creator) { this.creator = creator; } - public String getCreator() - { + public String getCreator() { return creator; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java index 7d49de89..eee8621f 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java @@ -81,4 +81,6 @@ public interface LeaseOutDetailsMapper { SltAgreementInfo getSltAgreementInfo(LeaseOutDetails record); int updSltInfo(SltAgreementInfo sltAgreementInfo); + + MaType selectByTypeId(@Param("record") LeaseOutDetails record); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 79b76a6c..bb79d6dc 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -16,6 +16,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.Date; import java.util.List; import java.util.Objects; @@ -136,6 +137,13 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { if (record.getOutNum() == null || record.getOutNum() < outNum) { record.setOutNum(1.00); } + //先判断(ma_type 设备规格表)中的库存够不够出库的 + MaType maType = leaseOutDetailsMapper.selectByTypeId(record); + if (maType != null) { + if (maType.getNum() == null || maType.getNum().compareTo(BigDecimal.valueOf(record.getOutNum())) < 0) { + return AjaxResult.error("领料出库失败,机具库存不足"); + } + } // 首先更新领料任务详情表的领料数及状态 int updateLeaseApplyDetailsOutNum = leaseOutDetailsMapper.updateLeaseApplyDetailsOutNum(record); // 插入领料出库明细表 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java index 15254ca3..9ba1ad3b 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java @@ -147,7 +147,7 @@ public class BmUnitInfoController extends BaseController{ @PostMapping("/export") public void export(HttpServletResponse response, BmUnitInfo bmUnitInfo) { - List list = bmUnitInfoService.getUnitInfo(bmUnitInfo); + List list = bmUnitInfoService.getUnitInfoAll(bmUnitInfo); ExcelUtil util = new ExcelUtil(BmUnitInfo.class); util.exportExcel(response, list, "往来单位"); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java index 4e49bbbe..f29c2d71 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java @@ -9,7 +9,6 @@ import java.sql.Timestamp; @Data public class BmProjectInfo { /**工程ID*/ - @Excel(name = "工程ID") @ApiModelProperty(value = "工程ID") private long proId; /**工程项目名称*/ @@ -17,12 +16,12 @@ public class BmProjectInfo { @ApiModelProperty(value = "工程项目名称") private String proName; /**帐号状态（0正常 1停用）*/ - @Excel(name = "帐号状态（0正常 1停用）") + @Excel(name = "帐号状态",readConverterExp = "0=正常,1=停用") @ApiModelProperty(value = "帐号状态（0正常 1停用）") private String status; /**工程类型*/ - @Excel(name = "工程类型") + @ApiModelProperty(value = "工程类型") private long typeId; /**联系人*/ @@ -34,45 +33,38 @@ public class BmProjectInfo { @ApiModelProperty(value = "联系方式") private String telphone; /**所属上级*/ - @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 Timestamp createTime; /**更新者*/ - @Excel(name = "更新者") @ApiModelProperty(value = "更新者") private String updateBy; /**更新时间*/ - @Excel(name = "更新时间") @ApiModelProperty(value = "更新时间") private Timestamp updateTime; /**备注*/ - @Excel(name = "备注") @ApiModelProperty(value = "备注") private String remark; /**数据所属组织*/ - @Excel(name = "数据所属组织") @ApiModelProperty(value = "数据所属组织") private String companyId; /**数据所属组织*/ - @Excel(name = "所属组织名称") + @Excel(name = "所属上级") @ApiModelProperty(value = "所属组织名称") private String deptName; /**工程类型名称*/ - @Excel(name = "工程类型名称") + @Excel(name = "工程类型") @ApiModelProperty(value = "工程类型名称") private String typeName; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java index 0c2dbebf..dadb5301 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java @@ -6,236 +6,266 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.sql.Timestamp; + @Data public class BmProjectLot { - /**标段ID*/ - @Excel(name = "标段ID") - @ApiModelProperty(value = "标段ID") - private long lotId; - /**工程ID*/ - @Excel(name = "工程ID") - @ApiModelProperty(value = "工程ID") - private long proId; - /**标段工程项目名称*/ - @Excel(name = "标段工程项目名称") - @ApiModelProperty(value = "标段工程项目名称") - private String lotName; - /**帐号状态（0正常 1停用）*/ - @Excel(name = "帐号状态（0正常 1停用）") - @ApiModelProperty(value = "帐号状态（0正常 1停用）") - private String status; + /** + * 标段ID + */ + @ApiModelProperty(value = "标段ID") + private long lotId; + /** + * 工程ID + */ + @ApiModelProperty(value = "工程ID") + private long proId; + /** + * 标段工程项目名称 + */ + @Excel(name = "标段工程名称") + @ApiModelProperty(value = "标段工程名称") + private String lotName; + /** + * 帐号状态（0正常 1停用） + */ + @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用）") + @ApiModelProperty(value = "帐号状态（0正常 1停用）") + private String status; - /**工程类型*/ - @Excel(name = "工程类型") - @ApiModelProperty(value = "工程类型") - private long typeId; - /**联系人*/ - @Excel(name = "联系人") - @ApiModelProperty(value = "联系人") - private String linkMan; - /**联系方式*/ - @Excel(name = "联系方式") - @ApiModelProperty(value = "联系方式") - private String telphone; - /**所属工程*/ - @Excel(name = "所属工程") - @ApiModelProperty(value = "所属工程") - private String ownPro; - /**所属上级*/ - @Excel(name = "所属上级") - @ApiModelProperty(value = "所属上级") - private long deptId; - /**是否均摊财务帐（0不均摊，1均摊）*/ - @Excel(name = "是否均摊财务帐（0不均摊，1均摊）") - @ApiModelProperty(value = "是否均摊财务帐（0不均摊，1均摊））") - private String isShare; - /**经度*/ - @Excel(name = "经度") - @ApiModelProperty(value = "经度") - private String lon; - /**维度*/ - @Excel(name = "维度") - @ApiModelProperty(value = "维度") - private String lat; - /**删除标志（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 Timestamp createTime; - /**更新者*/ - @Excel(name = "更新者") - @ApiModelProperty(value = "更新者") - private String updateBy; - /**更新时间*/ - @Excel(name = "更新时间") - @ApiModelProperty(value = "更新时间") - private Timestamp updateTime; - /**备注*/ - @Excel(name = "备注") - @ApiModelProperty(value = "备注") - private String remark; - /**数据所属组织*/ - @Excel(name = "数据所属组织") - @ApiModelProperty(value = "数据所属组织") - private String companyId; - /**数据所属组织*/ - @Excel(name = "所属组织名称") - @ApiModelProperty(value = "所属组织名称") - private String deptName; + /** + * 工程类型 + */ - /**工程类型名称*/ - @Excel(name = "工程类型名称") - @ApiModelProperty(value = "工程类型名称") - private String typeName; + @ApiModelProperty(value = "工程类型") + private long typeId; + /** + * 联系人 + */ + @Excel(name = "联系人") + @ApiModelProperty(value = "联系人") + private String linkMan; + /** + * 联系方式 + */ + @Excel(name = "联系方式") + @ApiModelProperty(value = "联系方式") + private String telphone; + /** + * 所属工程 + */ + @Excel(name = "所属工程") + @ApiModelProperty(value = "所属工程") + private String ownPro; + /** + * 所属上级 + */ + @ApiModelProperty(value = "所属上级") + private long deptId; + /** + * 是否均摊财务帐（0不均摊，1均摊） + */ + @ApiModelProperty(value = "是否均摊财务帐（0不均摊，1均摊））") + private String isShare; + /** + * 经度 + */ + @ApiModelProperty(value = "经度") + private String lon; + /** + * 维度 + */ + @ApiModelProperty(value = "维度") + private String lat; + /** + * 删除标志（0代表存在 2代表删除） + */ + @ApiModelProperty(value = "除标志（0代表存在 2代表删除）") + private String delFlag; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private Timestamp createTime; + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + private String updateBy; + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + private Timestamp updateTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + /** + * 数据所属组织 + */ + @ApiModelProperty(value = "数据所属组织") + private String companyId; + /** + * 数据所属组织 + */ + @Excel(name = "所属上级") + @ApiModelProperty(value = "所属组织名称") + private String deptName; - public long getLotId() { - return lotId; - } + /** + * 工程类型名称 + */ + @Excel(name = "工程类型") + @ApiModelProperty(value = "工程类型名称") + private String typeName; - public void setLotId(long lotId) { - this.lotId = lotId; - } + public long getLotId() { + return lotId; + } - public long getProId() { - return proId; - } + public void setLotId(long lotId) { + this.lotId = lotId; + } - public void setProId(long proId) { - this.proId = proId; - } + public long getProId() { + return proId; + } - public String getLotName() { - return lotName; - } + public void setProId(long proId) { + this.proId = proId; + } - public void setLotName(String lotName) { - this.lotName = lotName; - } + public String getLotName() { + return lotName; + } - public String getStatus() { - return status; - } + public void setLotName(String lotName) { + this.lotName = lotName; + } - public void setStatus(String status) { - this.status = status; - } + public String getStatus() { + return status; + } - public long getTypeId() { - return typeId; - } + public void setStatus(String status) { + this.status = status; + } - public void setTypeId(long typeId) { - this.typeId = typeId; - } + public long getTypeId() { + return typeId; + } - public String getLinkMan() { - return linkMan; - } + public void setTypeId(long typeId) { + this.typeId = typeId; + } - public void setLinkMan(String linkMan) { - this.linkMan = linkMan; - } + public String getLinkMan() { + return linkMan; + } - public String getTelphone() { - return telphone; - } + public void setLinkMan(String linkMan) { + this.linkMan = linkMan; + } - public void setTelphone(String telphone) { - this.telphone = telphone; - } + public String getTelphone() { + return telphone; + } - public long getDeptId() { - return deptId; - } + public void setTelphone(String telphone) { + this.telphone = telphone; + } - public void setDeptId(long deptId) { - this.deptId = deptId; - } + public long getDeptId() { + return deptId; + } - public String getIsShare() { - return isShare; - } + public void setDeptId(long deptId) { + this.deptId = deptId; + } - public void setIsShare(String isShare) { - this.isShare = isShare; - } + public String getIsShare() { + return isShare; + } - public String getLon() { - return lon; - } + public void setIsShare(String isShare) { + this.isShare = isShare; + } - public void setLon(String lon) { - this.lon = lon; - } + public String getLon() { + return lon; + } - public String getLat() { - return lat; - } + public void setLon(String lon) { + this.lon = lon; + } - public void setLat(String lat) { - this.lat = lat; - } + public String getLat() { + return lat; + } - public String getDelFlag() { - return delFlag; - } + public void setLat(String lat) { + this.lat = lat; + } - public void setDelFlag(String delFlag) { - this.delFlag = delFlag; - } + public String getDelFlag() { + return delFlag; + } - public String getCreateBy() { - return createBy; - } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } - public void setCreateBy(String createBy) { - this.createBy = createBy; - } + public String getCreateBy() { + return createBy; + } - public Timestamp getCreateTime() { - return createTime; - } + public void setCreateBy(String createBy) { + this.createBy = createBy; + } - public void setCreateTime(Timestamp createTime) { - this.createTime = createTime; - } + public Timestamp getCreateTime() { + return createTime; + } - public String getUpdateBy() { - return updateBy; - } + public void setCreateTime(Timestamp createTime) { + this.createTime = createTime; + } - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; - } + public String getUpdateBy() { + return updateBy; + } - public Timestamp getUpdateTime() { - return updateTime; - } + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } - public void setUpdateTime(Timestamp updateTime) { - this.updateTime = updateTime; - } + public Timestamp getUpdateTime() { + return updateTime; + } - public String getRemark() { - return remark; - } + public void setUpdateTime(Timestamp updateTime) { + this.updateTime = updateTime; + } - public void setRemark(String remark) { - this.remark = remark; - } + public String getRemark() { + return remark; + } - public String getCompanyId() { - return companyId; - } + public void setRemark(String remark) { + this.remark = remark; + } - public void setCompanyId(String companyId) { - this.companyId = companyId; - } + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitInfo.java index 46182c78..bb001df3 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitInfo.java @@ -10,7 +10,6 @@ import java.sql.Timestamp; @Data public class BmUnitInfo { /**类型ID*/ -@Excel(name = "类型ID") @ApiModelProperty(value = "类型ID") private long unitId; /**单位类型名称*/ @@ -18,62 +17,56 @@ public class BmUnitInfo { @ApiModelProperty(value = "类型ID") private String unitName; /**帐号状态（0正常 1停用）*/ - @Excel(name = "帐号状态（0正常 1停用）") + @Excel(name = "帐号状态",readConverterExp ="0=正常,1=停用") @ApiModelProperty(value = "类型ID") private String status; /**单位类型*/ - @Excel(name = "单位类型") + @ApiModelProperty(value = "类型ID") private long typeId; /**联系人*/ @Excel(name = "联系人") - @ApiModelProperty(value = "类型ID") + @ApiModelProperty(value = "联系人") private String linkMan; /**联系方式*/ - @Excel(name = "联系方式") - @ApiModelProperty(value = "类型ID") + @Excel(name = "联系电话") + @ApiModelProperty(value = "联系电话") private String telphone; /**所属上级*/ - @Excel(name = "所属上级") @ApiModelProperty(value = "类型ID") private long deptId; /**删除标志（0代表存在 2代表删除）*/ private String delFlag; /**创建者*/ - @Excel(name = "创建者") @ApiModelProperty(value = "类型ID") private String createBy; /**创建时间*/ - @Excel(name = "创建时间") @ApiModelProperty(value = "类型ID") private Timestamp createTime; /**更新者*/ - @Excel(name = "更新者") @ApiModelProperty(value = "类型ID") private String updateBy; /**更新时间*/ - @Excel(name = "更新时间") @ApiModelProperty(value = "类型ID") private Timestamp updateTime; /**备注*/ - @Excel(name = "备注") @ApiModelProperty(value = "类型ID") private String remark; /**数据所属组织*/ - @Excel(name = "数据所属组织") @ApiModelProperty(value = "类型ID") private String companyId; @ApiModelProperty(value = "类型名称") + @Excel(name = "单位类型") private String typeName; - @Excel(name = "所属组织名称") - @ApiModelProperty(value = "所属组织名称") + @Excel(name = "所属上级") + @ApiModelProperty(value = "所属上级") private String deptName; - @Excel(name = "所属组织名称") - @ApiModelProperty(value = "所属组织名称") + + @ApiModelProperty(value = "用户id") private String userId; - @Excel(name = "所属组织名称") - @ApiModelProperty(value = "所属组织名称") + + @ApiModelProperty(value = "用户名") private String userName; public long getUnitId() { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPropInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPropInfo.java index 2fa3b5b9..634422da 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPropInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPropInfo.java @@ -9,12 +9,11 @@ public class MaPropInfo { /** * 资产ID */ - @Excel(name = "资产ID") private long propId; /** * 资产名称 */ - @Excel(name = "资产名称") + @Excel(name = "资产类型名称") private String propName; /** * 资产编号 @@ -24,11 +23,11 @@ public class MaPropInfo { /** * 帐号状态（0正常 1停用） */ + @Excel(name = "状态",readConverterExp = "0=正常,1=停用") private String status; /** * 组织ID */ - @Excel(name = "组织ID") private String deptId; /** * 删除标志（0代表存在 2代表删除） @@ -37,35 +36,29 @@ public class MaPropInfo { /** * 创建者 */ - @Excel(name = "创建者") private String createBy; /** * 创建时间 */ - @Excel(name = "创建时间") private java.sql.Timestamp createTime; /** * 更新者 */ - @Excel(name = "更新者") private String updateBy; /** * 更新时间 */ - @Excel(name = "更新时间") private java.sql.Timestamp updateTime; /** * 备注 */ - @Excel(name = "备注") private String remark; /** * 数据所属组织 */ - @Excel(name = "数据所属组织") private String companyId; - @Excel(name = "组织名称") + @Excel(name = "所属上级") private String deptName; public long getPropId() { diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml index 1b08f78c..6374f27f 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml @@ -172,6 +172,10 @@ AND DATE(start_time) = CURDATE(); + UPDATE diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SysPost.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SysPost.java index f49bd6ac..0593b3b6 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SysPost.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SysPost.java @@ -31,7 +31,6 @@ public class SysPost extends BaseEntity private String postName; /** 岗位排序 */ - @Excel(name = "岗位排序") private Integer postSort; /** 状态（0正常 1停用） */