From 8cfdc3dc177f65a0333f3cab70b8fa27272b1dbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Tue, 24 Dec 2019 22:03:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E5=92=8C?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=9A=84sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/datasource/entities/DepotHead.java | 682 ------------------ .../datasource/entities/DepotHeadExample.java | 102 --- .../com/jsh/erp/datasource/entities/User.java | 308 -------- .../erp/datasource/entities/UserExample.java | 102 --- .../datasource/mappers/DepotHeadMapper.java | 66 -- .../datasource/mappers/DepotHeadMapperEx.java | 4 - .../erp/datasource/mappers/UserMapper.java | 66 -- .../erp/datasource/mappers/UserMapperEx.java | 4 - .../service/depotHead/DepotHeadService.java | 2 +- .../com/jsh/erp/service/user/UserService.java | 6 +- .../resources/mapper_xml/DepotHeadMapper.xml | 74 +- .../mapper_xml/DepotHeadMapperEx.xml | 24 - src/main/resources/mapper_xml/UserMapper.xml | 74 +- .../resources/mapper_xml/UserMapperEx.xml | 55 -- src/test/resources/generatorConfig.xml | 10 +- 15 files changed, 27 insertions(+), 1552 deletions(-) diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java b/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java index be2b19bd..23e3a308 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java +++ b/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java @@ -4,994 +4,312 @@ import java.math.BigDecimal; import java.util.Date; public class DepotHead { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.Id - * - * @mbggenerated - */ private Long id; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.Type - * - * @mbggenerated - */ private String type; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.SubType - * - * @mbggenerated - */ private String subtype; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.ProjectId - * - * @mbggenerated - */ private Long projectid; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.DefaultNumber - * - * @mbggenerated - */ private String defaultnumber; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.Number - * - * @mbggenerated - */ private String number; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.OperPersonName - * - * @mbggenerated - */ private String operpersonname; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.CreateTime - * - * @mbggenerated - */ private Date createtime; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.OperTime - * - * @mbggenerated - */ private Date opertime; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.OrganId - * - * @mbggenerated - */ private Long organid; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.HandsPersonId - * - * @mbggenerated - */ private Long handspersonid; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.AccountId - * - * @mbggenerated - */ private Long accountid; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.ChangeAmount - * - * @mbggenerated - */ private BigDecimal changeamount; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.AllocationProjectId - * - * @mbggenerated - */ private Long allocationprojectid; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.TotalPrice - * - * @mbggenerated - */ private BigDecimal totalprice; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.PayType - * - * @mbggenerated - */ private String paytype; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.Remark - * - * @mbggenerated - */ private String remark; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.Salesman - * - * @mbggenerated - */ private String salesman; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.AccountIdList - * - * @mbggenerated - */ private String accountidlist; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.AccountMoneyList - * - * @mbggenerated - */ private String accountmoneylist; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.Discount - * - * @mbggenerated - */ private BigDecimal discount; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.DiscountMoney - * - * @mbggenerated - */ private BigDecimal discountmoney; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.DiscountLastMoney - * - * @mbggenerated - */ private BigDecimal discountlastmoney; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.OtherMoney - * - * @mbggenerated - */ private BigDecimal othermoney; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.OtherMoneyList - * - * @mbggenerated - */ private String othermoneylist; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.OtherMoneyItem - * - * @mbggenerated - */ private String othermoneyitem; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.AccountDay - * - * @mbggenerated - */ private Integer accountday; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.Status - * - * @mbggenerated - */ private String status; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.LinkNumber - * - * @mbggenerated - */ private String linknumber; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.tenant_id - * - * @mbggenerated - */ private Long tenantId; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.delete_Flag - * - * @mbggenerated - */ private String deleteFlag; - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.Id - * - * @return the value of jsh_depothead.Id - * - * @mbggenerated - */ public Long getId() { return id; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.Id - * - * @param id the value for jsh_depothead.Id - * - * @mbggenerated - */ public void setId(Long id) { this.id = id; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.Type - * - * @return the value of jsh_depothead.Type - * - * @mbggenerated - */ public String getType() { return type; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.Type - * - * @param type the value for jsh_depothead.Type - * - * @mbggenerated - */ public void setType(String type) { this.type = type == null ? null : type.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.SubType - * - * @return the value of jsh_depothead.SubType - * - * @mbggenerated - */ public String getSubtype() { return subtype; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.SubType - * - * @param subtype the value for jsh_depothead.SubType - * - * @mbggenerated - */ public void setSubtype(String subtype) { this.subtype = subtype == null ? null : subtype.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.ProjectId - * - * @return the value of jsh_depothead.ProjectId - * - * @mbggenerated - */ public Long getProjectid() { return projectid; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.ProjectId - * - * @param projectid the value for jsh_depothead.ProjectId - * - * @mbggenerated - */ public void setProjectid(Long projectid) { this.projectid = projectid; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.DefaultNumber - * - * @return the value of jsh_depothead.DefaultNumber - * - * @mbggenerated - */ public String getDefaultnumber() { return defaultnumber; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.DefaultNumber - * - * @param defaultnumber the value for jsh_depothead.DefaultNumber - * - * @mbggenerated - */ public void setDefaultnumber(String defaultnumber) { this.defaultnumber = defaultnumber == null ? null : defaultnumber.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.Number - * - * @return the value of jsh_depothead.Number - * - * @mbggenerated - */ public String getNumber() { return number; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.Number - * - * @param number the value for jsh_depothead.Number - * - * @mbggenerated - */ public void setNumber(String number) { this.number = number == null ? null : number.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.OperPersonName - * - * @return the value of jsh_depothead.OperPersonName - * - * @mbggenerated - */ public String getOperpersonname() { return operpersonname; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.OperPersonName - * - * @param operpersonname the value for jsh_depothead.OperPersonName - * - * @mbggenerated - */ public void setOperpersonname(String operpersonname) { this.operpersonname = operpersonname == null ? null : operpersonname.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.CreateTime - * - * @return the value of jsh_depothead.CreateTime - * - * @mbggenerated - */ public Date getCreatetime() { return createtime; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.CreateTime - * - * @param createtime the value for jsh_depothead.CreateTime - * - * @mbggenerated - */ public void setCreatetime(Date createtime) { this.createtime = createtime; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.OperTime - * - * @return the value of jsh_depothead.OperTime - * - * @mbggenerated - */ public Date getOpertime() { return opertime; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.OperTime - * - * @param opertime the value for jsh_depothead.OperTime - * - * @mbggenerated - */ public void setOpertime(Date opertime) { this.opertime = opertime; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.OrganId - * - * @return the value of jsh_depothead.OrganId - * - * @mbggenerated - */ public Long getOrganid() { return organid; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.OrganId - * - * @param organid the value for jsh_depothead.OrganId - * - * @mbggenerated - */ public void setOrganid(Long organid) { this.organid = organid; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.HandsPersonId - * - * @return the value of jsh_depothead.HandsPersonId - * - * @mbggenerated - */ public Long getHandspersonid() { return handspersonid; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.HandsPersonId - * - * @param handspersonid the value for jsh_depothead.HandsPersonId - * - * @mbggenerated - */ public void setHandspersonid(Long handspersonid) { this.handspersonid = handspersonid; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.AccountId - * - * @return the value of jsh_depothead.AccountId - * - * @mbggenerated - */ public Long getAccountid() { return accountid; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.AccountId - * - * @param accountid the value for jsh_depothead.AccountId - * - * @mbggenerated - */ public void setAccountid(Long accountid) { this.accountid = accountid; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.ChangeAmount - * - * @return the value of jsh_depothead.ChangeAmount - * - * @mbggenerated - */ public BigDecimal getChangeamount() { return changeamount; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.ChangeAmount - * - * @param changeamount the value for jsh_depothead.ChangeAmount - * - * @mbggenerated - */ public void setChangeamount(BigDecimal changeamount) { this.changeamount = changeamount; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.AllocationProjectId - * - * @return the value of jsh_depothead.AllocationProjectId - * - * @mbggenerated - */ public Long getAllocationprojectid() { return allocationprojectid; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.AllocationProjectId - * - * @param allocationprojectid the value for jsh_depothead.AllocationProjectId - * - * @mbggenerated - */ public void setAllocationprojectid(Long allocationprojectid) { this.allocationprojectid = allocationprojectid; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.TotalPrice - * - * @return the value of jsh_depothead.TotalPrice - * - * @mbggenerated - */ public BigDecimal getTotalprice() { return totalprice; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.TotalPrice - * - * @param totalprice the value for jsh_depothead.TotalPrice - * - * @mbggenerated - */ public void setTotalprice(BigDecimal totalprice) { this.totalprice = totalprice; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.PayType - * - * @return the value of jsh_depothead.PayType - * - * @mbggenerated - */ public String getPaytype() { return paytype; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.PayType - * - * @param paytype the value for jsh_depothead.PayType - * - * @mbggenerated - */ public void setPaytype(String paytype) { this.paytype = paytype == null ? null : paytype.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.Remark - * - * @return the value of jsh_depothead.Remark - * - * @mbggenerated - */ public String getRemark() { return remark; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.Remark - * - * @param remark the value for jsh_depothead.Remark - * - * @mbggenerated - */ public void setRemark(String remark) { this.remark = remark == null ? null : remark.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.Salesman - * - * @return the value of jsh_depothead.Salesman - * - * @mbggenerated - */ public String getSalesman() { return salesman; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.Salesman - * - * @param salesman the value for jsh_depothead.Salesman - * - * @mbggenerated - */ public void setSalesman(String salesman) { this.salesman = salesman == null ? null : salesman.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.AccountIdList - * - * @return the value of jsh_depothead.AccountIdList - * - * @mbggenerated - */ public String getAccountidlist() { return accountidlist; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.AccountIdList - * - * @param accountidlist the value for jsh_depothead.AccountIdList - * - * @mbggenerated - */ public void setAccountidlist(String accountidlist) { this.accountidlist = accountidlist == null ? null : accountidlist.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.AccountMoneyList - * - * @return the value of jsh_depothead.AccountMoneyList - * - * @mbggenerated - */ public String getAccountmoneylist() { return accountmoneylist; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.AccountMoneyList - * - * @param accountmoneylist the value for jsh_depothead.AccountMoneyList - * - * @mbggenerated - */ public void setAccountmoneylist(String accountmoneylist) { this.accountmoneylist = accountmoneylist == null ? null : accountmoneylist.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.Discount - * - * @return the value of jsh_depothead.Discount - * - * @mbggenerated - */ public BigDecimal getDiscount() { return discount; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.Discount - * - * @param discount the value for jsh_depothead.Discount - * - * @mbggenerated - */ public void setDiscount(BigDecimal discount) { this.discount = discount; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.DiscountMoney - * - * @return the value of jsh_depothead.DiscountMoney - * - * @mbggenerated - */ public BigDecimal getDiscountmoney() { return discountmoney; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.DiscountMoney - * - * @param discountmoney the value for jsh_depothead.DiscountMoney - * - * @mbggenerated - */ public void setDiscountmoney(BigDecimal discountmoney) { this.discountmoney = discountmoney; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.DiscountLastMoney - * - * @return the value of jsh_depothead.DiscountLastMoney - * - * @mbggenerated - */ public BigDecimal getDiscountlastmoney() { return discountlastmoney; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.DiscountLastMoney - * - * @param discountlastmoney the value for jsh_depothead.DiscountLastMoney - * - * @mbggenerated - */ public void setDiscountlastmoney(BigDecimal discountlastmoney) { this.discountlastmoney = discountlastmoney; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.OtherMoney - * - * @return the value of jsh_depothead.OtherMoney - * - * @mbggenerated - */ public BigDecimal getOthermoney() { return othermoney; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.OtherMoney - * - * @param othermoney the value for jsh_depothead.OtherMoney - * - * @mbggenerated - */ public void setOthermoney(BigDecimal othermoney) { this.othermoney = othermoney; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.OtherMoneyList - * - * @return the value of jsh_depothead.OtherMoneyList - * - * @mbggenerated - */ public String getOthermoneylist() { return othermoneylist; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.OtherMoneyList - * - * @param othermoneylist the value for jsh_depothead.OtherMoneyList - * - * @mbggenerated - */ public void setOthermoneylist(String othermoneylist) { this.othermoneylist = othermoneylist == null ? null : othermoneylist.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.OtherMoneyItem - * - * @return the value of jsh_depothead.OtherMoneyItem - * - * @mbggenerated - */ public String getOthermoneyitem() { return othermoneyitem; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.OtherMoneyItem - * - * @param othermoneyitem the value for jsh_depothead.OtherMoneyItem - * - * @mbggenerated - */ public void setOthermoneyitem(String othermoneyitem) { this.othermoneyitem = othermoneyitem == null ? null : othermoneyitem.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.AccountDay - * - * @return the value of jsh_depothead.AccountDay - * - * @mbggenerated - */ public Integer getAccountday() { return accountday; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.AccountDay - * - * @param accountday the value for jsh_depothead.AccountDay - * - * @mbggenerated - */ public void setAccountday(Integer accountday) { this.accountday = accountday; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.Status - * - * @return the value of jsh_depothead.Status - * - * @mbggenerated - */ public String getStatus() { return status; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.Status - * - * @param status the value for jsh_depothead.Status - * - * @mbggenerated - */ public void setStatus(String status) { this.status = status == null ? null : status.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.LinkNumber - * - * @return the value of jsh_depothead.LinkNumber - * - * @mbggenerated - */ public String getLinknumber() { return linknumber; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.LinkNumber - * - * @param linknumber the value for jsh_depothead.LinkNumber - * - * @mbggenerated - */ public void setLinknumber(String linknumber) { this.linknumber = linknumber == null ? null : linknumber.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.tenant_id - * - * @return the value of jsh_depothead.tenant_id - * - * @mbggenerated - */ public Long getTenantId() { return tenantId; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.tenant_id - * - * @param tenantId the value for jsh_depothead.tenant_id - * - * @mbggenerated - */ public void setTenantId(Long tenantId) { this.tenantId = tenantId; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.delete_Flag - * - * @return the value of jsh_depothead.delete_Flag - * - * @mbggenerated - */ public String getDeleteFlag() { return deleteFlag; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.delete_Flag - * - * @param deleteFlag the value for jsh_depothead.delete_Flag - * - * @mbggenerated - */ public void setDeleteFlag(String deleteFlag) { this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); } diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java b/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java index 799810e9..18eac650 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java @@ -6,118 +6,46 @@ import java.util.Date; import java.util.List; public class DepotHeadExample { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_depothead - * - * @mbggenerated - */ protected String orderByClause; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_depothead - * - * @mbggenerated - */ protected boolean distinct; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_depothead - * - * @mbggenerated - */ protected List oredCriteria; - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ public DepotHeadExample() { oredCriteria = new ArrayList(); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ public void setOrderByClause(String orderByClause) { this.orderByClause = orderByClause; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ public String getOrderByClause() { return orderByClause; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ public void setDistinct(boolean distinct) { this.distinct = distinct; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ public boolean isDistinct() { return distinct; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ public List getOredCriteria() { return oredCriteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ public void or(Criteria criteria) { oredCriteria.add(criteria); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ public Criteria or() { Criteria criteria = createCriteriaInternal(); oredCriteria.add(criteria); return criteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ public Criteria createCriteria() { Criteria criteria = createCriteriaInternal(); if (oredCriteria.size() == 0) { @@ -126,35 +54,17 @@ public class DepotHeadExample { return criteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ protected Criteria createCriteriaInternal() { Criteria criteria = new Criteria(); return criteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ public void clear() { oredCriteria.clear(); orderByClause = null; distinct = false; } - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_depothead - * - * @mbggenerated - */ protected abstract static class GeneratedCriteria { protected List criteria; @@ -2207,12 +2117,6 @@ public class DepotHeadExample { } } - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_depothead - * - * @mbggenerated do_not_delete_during_merge - */ public static class Criteria extends GeneratedCriteria { protected Criteria() { @@ -2220,12 +2124,6 @@ public class DepotHeadExample { } } - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_depothead - * - * @mbggenerated - */ public static class Criterion { private String condition; diff --git a/src/main/java/com/jsh/erp/datasource/entities/User.java b/src/main/java/com/jsh/erp/datasource/entities/User.java index cb28bbf3..0c28e470 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/User.java +++ b/src/main/java/com/jsh/erp/datasource/entities/User.java @@ -1,450 +1,142 @@ package com.jsh.erp.datasource.entities; public class User { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.id - * - * @mbggenerated - */ private Long id; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.username - * - * @mbggenerated - */ private String username; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.loginame - * - * @mbggenerated - */ private String loginame; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.password - * - * @mbggenerated - */ private String password; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.position - * - * @mbggenerated - */ private String position; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.department - * - * @mbggenerated - */ private String department; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.email - * - * @mbggenerated - */ private String email; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.phonenum - * - * @mbggenerated - */ private String phonenum; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.ismanager - * - * @mbggenerated - */ private Byte ismanager; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.isystem - * - * @mbggenerated - */ private Byte isystem; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.Status - * - * @mbggenerated - */ private Byte status; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.description - * - * @mbggenerated - */ private String description; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.remark - * - * @mbggenerated - */ private String remark; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.tenant_id - * - * @mbggenerated - */ private Long tenantId; - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.id - * - * @return the value of jsh_user.id - * - * @mbggenerated - */ public Long getId() { return id; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.id - * - * @param id the value for jsh_user.id - * - * @mbggenerated - */ public void setId(Long id) { this.id = id; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.username - * - * @return the value of jsh_user.username - * - * @mbggenerated - */ public String getUsername() { return username; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.username - * - * @param username the value for jsh_user.username - * - * @mbggenerated - */ public void setUsername(String username) { this.username = username == null ? null : username.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.loginame - * - * @return the value of jsh_user.loginame - * - * @mbggenerated - */ public String getLoginame() { return loginame; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.loginame - * - * @param loginame the value for jsh_user.loginame - * - * @mbggenerated - */ public void setLoginame(String loginame) { this.loginame = loginame == null ? null : loginame.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.password - * - * @return the value of jsh_user.password - * - * @mbggenerated - */ public String getPassword() { return password; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.password - * - * @param password the value for jsh_user.password - * - * @mbggenerated - */ public void setPassword(String password) { this.password = password == null ? null : password.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.position - * - * @return the value of jsh_user.position - * - * @mbggenerated - */ public String getPosition() { return position; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.position - * - * @param position the value for jsh_user.position - * - * @mbggenerated - */ public void setPosition(String position) { this.position = position == null ? null : position.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.department - * - * @return the value of jsh_user.department - * - * @mbggenerated - */ public String getDepartment() { return department; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.department - * - * @param department the value for jsh_user.department - * - * @mbggenerated - */ public void setDepartment(String department) { this.department = department == null ? null : department.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.email - * - * @return the value of jsh_user.email - * - * @mbggenerated - */ public String getEmail() { return email; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.email - * - * @param email the value for jsh_user.email - * - * @mbggenerated - */ public void setEmail(String email) { this.email = email == null ? null : email.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.phonenum - * - * @return the value of jsh_user.phonenum - * - * @mbggenerated - */ public String getPhonenum() { return phonenum; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.phonenum - * - * @param phonenum the value for jsh_user.phonenum - * - * @mbggenerated - */ public void setPhonenum(String phonenum) { this.phonenum = phonenum == null ? null : phonenum.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.ismanager - * - * @return the value of jsh_user.ismanager - * - * @mbggenerated - */ public Byte getIsmanager() { return ismanager; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.ismanager - * - * @param ismanager the value for jsh_user.ismanager - * - * @mbggenerated - */ public void setIsmanager(Byte ismanager) { this.ismanager = ismanager; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.isystem - * - * @return the value of jsh_user.isystem - * - * @mbggenerated - */ public Byte getIsystem() { return isystem; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.isystem - * - * @param isystem the value for jsh_user.isystem - * - * @mbggenerated - */ public void setIsystem(Byte isystem) { this.isystem = isystem; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.Status - * - * @return the value of jsh_user.Status - * - * @mbggenerated - */ public Byte getStatus() { return status; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.Status - * - * @param status the value for jsh_user.Status - * - * @mbggenerated - */ public void setStatus(Byte status) { this.status = status; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.description - * - * @return the value of jsh_user.description - * - * @mbggenerated - */ public String getDescription() { return description; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.description - * - * @param description the value for jsh_user.description - * - * @mbggenerated - */ public void setDescription(String description) { this.description = description == null ? null : description.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.remark - * - * @return the value of jsh_user.remark - * - * @mbggenerated - */ public String getRemark() { return remark; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.remark - * - * @param remark the value for jsh_user.remark - * - * @mbggenerated - */ public void setRemark(String remark) { this.remark = remark == null ? null : remark.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.tenant_id - * - * @return the value of jsh_user.tenant_id - * - * @mbggenerated - */ public Long getTenantId() { return tenantId; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.tenant_id - * - * @param tenantId the value for jsh_user.tenant_id - * - * @mbggenerated - */ public void setTenantId(Long tenantId) { this.tenantId = tenantId; } diff --git a/src/main/java/com/jsh/erp/datasource/entities/UserExample.java b/src/main/java/com/jsh/erp/datasource/entities/UserExample.java index 4aa6854e..36f35c05 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/UserExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/UserExample.java @@ -4,118 +4,46 @@ import java.util.ArrayList; import java.util.List; public class UserExample { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_user - * - * @mbggenerated - */ protected String orderByClause; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_user - * - * @mbggenerated - */ protected boolean distinct; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_user - * - * @mbggenerated - */ protected List oredCriteria; - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ public UserExample() { oredCriteria = new ArrayList(); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ public void setOrderByClause(String orderByClause) { this.orderByClause = orderByClause; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ public String getOrderByClause() { return orderByClause; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ public void setDistinct(boolean distinct) { this.distinct = distinct; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ public boolean isDistinct() { return distinct; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ public List getOredCriteria() { return oredCriteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ public void or(Criteria criteria) { oredCriteria.add(criteria); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ public Criteria or() { Criteria criteria = createCriteriaInternal(); oredCriteria.add(criteria); return criteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ public Criteria createCriteria() { Criteria criteria = createCriteriaInternal(); if (oredCriteria.size() == 0) { @@ -124,35 +52,17 @@ public class UserExample { return criteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ protected Criteria createCriteriaInternal() { Criteria criteria = new Criteria(); return criteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ public void clear() { oredCriteria.clear(); orderByClause = null; distinct = false; } - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_user - * - * @mbggenerated - */ protected abstract static class GeneratedCriteria { protected List criteria; @@ -1125,12 +1035,6 @@ public class UserExample { } } - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_user - * - * @mbggenerated do_not_delete_during_merge - */ public static class Criteria extends GeneratedCriteria { protected Criteria() { @@ -1138,12 +1042,6 @@ public class UserExample { } } - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_user - * - * @mbggenerated - */ public static class Criterion { private String condition; diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java index 3a0badbf..88b65337 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java @@ -6,91 +6,25 @@ import java.util.List; import org.apache.ibatis.annotations.Param; public interface DepotHeadMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ int countByExample(DepotHeadExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ int deleteByExample(DepotHeadExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ int deleteByPrimaryKey(Long id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ int insert(DepotHead record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ int insertSelective(DepotHead record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ List selectByExample(DepotHeadExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ DepotHead selectByPrimaryKey(Long id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ int updateByExampleSelective(@Param("record") DepotHead record, @Param("example") DepotHeadExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ int updateByExample(@Param("record") DepotHead record, @Param("example") DepotHeadExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ int updateByPrimaryKeySelective(DepotHead record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ int updateByPrimaryKey(DepotHead record); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java index f2afcd23..210e27bc 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java @@ -102,10 +102,6 @@ public interface DepotHeadMapperEx { List getDetailByNumber( @Param("number") String number); - /** - * 新增单据主表信息,并反显单据主表id - * */ - int adddepotHead(DepotHead depotHead); void updateBuildOnlyNumber(); /** diff --git a/src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java index 6ea2ec35..6f0a8510 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java @@ -6,91 +6,25 @@ import java.util.List; import org.apache.ibatis.annotations.Param; public interface UserMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ int countByExample(UserExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ int deleteByExample(UserExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ int deleteByPrimaryKey(Long id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ int insert(User record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ int insertSelective(User record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ List selectByExample(UserExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ User selectByPrimaryKey(Long id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ int updateByExampleSelective(@Param("record") User record, @Param("example") UserExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ int updateByExample(@Param("record") User record, @Param("example") UserExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ int updateByPrimaryKeySelective(User record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ int updateByPrimaryKey(User record); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java index a589d240..8f8b0c9f 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java @@ -25,10 +25,6 @@ public interface UserMapperEx { List getUserList(Map parameterMap); - int addUser(UserEx ue); - - int updateUser(UserEx ue); - List getUserListByUserNameOrLoginName(@Param("userName") String userName, @Param("loginame") String loginame); diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 64fe04f0..9fcad5d3 100644 --- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -489,7 +489,7 @@ public class DepotHeadService { depotHead.setCreatetime(new Timestamp(System.currentTimeMillis())); depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT); try{ - depotHeadMapperEx.adddepotHead(depotHead); + depotHeadMapper.insertSelective(depotHead); }catch(Exception e){ JshException.writeFail(logger, e); } diff --git a/src/main/java/com/jsh/erp/service/user/UserService.java b/src/main/java/com/jsh/erp/service/user/UserService.java index 27573681..4d7f20dc 100644 --- a/src/main/java/com/jsh/erp/service/user/UserService.java +++ b/src/main/java/com/jsh/erp/service/user/UserService.java @@ -365,7 +365,7 @@ public class UserService { ue.setStatus(BusinessConstants.USER_STATUS_NORMAL); int result=0; try{ - result= userMapperEx.addUser(ue); + result= userMapper.insertSelective(ue); }catch(Exception e){ JshException.writeFail(logger, e); } @@ -396,7 +396,7 @@ public class UserService { ue.setStatus(BusinessConstants.USER_STATUS_NORMAL); int result=0; try{ - result= userMapperEx.addUser(ue); + result= userMapper.insertSelective(ue); }catch(Exception e){ JshException.writeFail(logger, e); } @@ -490,7 +490,7 @@ public class UserService { public UserEx updateUser(UserEx ue)throws Exception{ int result =0; try{ - result=userMapperEx.updateUser(ue); + result=userMapper.updateByPrimaryKeySelective(ue); }catch(Exception e){ JshException.writeFail(logger, e); } diff --git a/src/main/resources/mapper_xml/DepotHeadMapper.xml b/src/main/resources/mapper_xml/DepotHeadMapper.xml index 15f2cc9c..71e7ba82 100644 --- a/src/main/resources/mapper_xml/DepotHeadMapper.xml +++ b/src/main/resources/mapper_xml/DepotHeadMapper.xml @@ -2,10 +2,6 @@ - @@ -39,10 +35,6 @@ - @@ -72,10 +64,6 @@ - @@ -105,10 +93,6 @@ - Id, Type, SubType, ProjectId, DefaultNumber, Number, OperPersonName, CreateTime, OperTime, OrganId, HandsPersonId, AccountId, ChangeAmount, AllocationProjectId, TotalPrice, PayType, Remark, Salesman, AccountIdList, AccountMoneyList, Discount, DiscountMoney, @@ -116,10 +100,6 @@ LinkNumber, tenant_id, delete_Flag - delete from jsh_depothead where Id = #{id,jdbcType=BIGINT} - delete from jsh_depothead - + + SELECT LAST_INSERT_ID() + insert into jsh_depothead (Id, Type, SubType, ProjectId, DefaultNumber, Number, OperPersonName, CreateTime, OperTime, @@ -190,15 +157,12 @@ #{deleteFlag,jdbcType=VARCHAR}) - + + SELECT LAST_INSERT_ID() + insert into jsh_depothead - - Id, - + Id, Type, @@ -291,9 +255,7 @@ - - #{id,jdbcType=BIGINT}, - + #{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, @@ -387,20 +349,12 @@ - update jsh_depothead @@ -502,10 +456,6 @@ - update jsh_depothead set Id = #{record.id,jdbcType=BIGINT}, Type = #{record.type,jdbcType=VARCHAR}, @@ -543,10 +493,6 @@ - update jsh_depothead @@ -643,10 +589,6 @@ where Id = #{id,jdbcType=BIGINT} - update jsh_depothead set Type = #{type,jdbcType=VARCHAR}, SubType = #{subtype,jdbcType=VARCHAR}, diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index a79011da..d222bf83 100644 --- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -324,30 +324,6 @@ and ifnull(dh.delete_Flag,'0') !='1' - - insert into jsh_depothead (Type, SubType, - ProjectId, DefaultNumber, Number, - OperPersonName, CreateTime, OperTime, - OrganId, HandsPersonId, AccountId, - ChangeAmount, AllocationProjectId, TotalPrice, - PayType, Remark, Salesman, - AccountIdList, AccountMoneyList, Discount, - DiscountMoney, DiscountLastMoney, OtherMoney, - OtherMoneyList, OtherMoneyItem, AccountDay, - Status, LinkNumber) - values (#{type,jdbcType=VARCHAR}, #{subtype,jdbcType=VARCHAR}, - #{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, - #{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP}, - #{organid,jdbcType=BIGINT}, #{handspersonid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT}, - #{changeamount,jdbcType=DECIMAL}, #{allocationprojectid,jdbcType=BIGINT}, #{totalprice,jdbcType=DECIMAL}, - #{paytype,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{salesman,jdbcType=VARCHAR}, - #{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL}, - #{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, #{othermoney,jdbcType=DECIMAL}, - #{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER}, - #{status,jdbcType=VARCHAR}, #{linknumber,jdbcType=VARCHAR}) - - update jsh_sequence set current_val = current_val + 1 where seq_name = 'depot_number_seq' diff --git a/src/main/resources/mapper_xml/UserMapper.xml b/src/main/resources/mapper_xml/UserMapper.xml index cdc63932..943a8ec5 100644 --- a/src/main/resources/mapper_xml/UserMapper.xml +++ b/src/main/resources/mapper_xml/UserMapper.xml @@ -2,10 +2,6 @@ - @@ -22,10 +18,6 @@ - @@ -55,10 +47,6 @@ - @@ -88,18 +76,10 @@ - id, username, loginame, password, position, department, email, phonenum, ismanager, isystem, Status, description, remark, tenant_id - delete from jsh_user where id = #{id,jdbcType=BIGINT} - delete from jsh_user - + + SELECT LAST_INSERT_ID() + insert into jsh_user (id, username, loginame, password, position, department, email, phonenum, ismanager, @@ -158,15 +125,12 @@ #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}) - + + SELECT LAST_INSERT_ID() + insert into jsh_user - - id, - + id, username, @@ -208,9 +172,7 @@ - - #{id,jdbcType=BIGINT}, - + #{id,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, @@ -253,20 +215,12 @@ - update jsh_user @@ -317,10 +271,6 @@ - update jsh_user set id = #{record.id,jdbcType=BIGINT}, username = #{record.username,jdbcType=VARCHAR}, @@ -341,10 +291,6 @@ - update jsh_user @@ -390,10 +336,6 @@ where id = #{id,jdbcType=BIGINT} - update jsh_user set username = #{username,jdbcType=VARCHAR}, loginame = #{loginame,jdbcType=VARCHAR}, diff --git a/src/main/resources/mapper_xml/UserMapperEx.xml b/src/main/resources/mapper_xml/UserMapperEx.xml index 778ed9d5..17832994 100644 --- a/src/main/resources/mapper_xml/UserMapperEx.xml +++ b/src/main/resources/mapper_xml/UserMapperEx.xml @@ -54,61 +54,6 @@ order by user.id desc - - insert into jsh_user (username, loginame, - password, position, - email, phonenum, ismanager, - isystem, status, description, - remark) - values (#{username,jdbcType=VARCHAR}, #{loginame,jdbcType=VARCHAR}, - #{password,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, - #{email,jdbcType=VARCHAR}, #{phonenum,jdbcType=VARCHAR}, #{ismanager,jdbcType=TINYINT}, - #{isystem,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, #{description,jdbcType=VARCHAR}, - #{remark,jdbcType=VARCHAR}) - - - update jsh_user - - - username = #{username,jdbcType=VARCHAR}, - - - loginame = #{loginame,jdbcType=VARCHAR}, - - - password = #{password,jdbcType=VARCHAR}, - - - position = #{position,jdbcType=VARCHAR}, - - - department = #{department,jdbcType=VARCHAR}, - - - email = #{email,jdbcType=VARCHAR}, - - - phonenum = #{phonenum,jdbcType=VARCHAR}, - - - ismanager = #{ismanager,jdbcType=TINYINT}, - - - isystem = #{isystem,jdbcType=TINYINT}, - - - status = #{status,jdbcType=TINYINT}, - - - description = #{description,jdbcType=VARCHAR}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=BIGINT} -