Commit 30a8abd2 by huluobin

update

parent ceaa5629
...@@ -86,6 +86,12 @@ public abstract class AbstractCostPlanService implements CostPlanService { ...@@ -86,6 +86,12 @@ public abstract class AbstractCostPlanService implements CostPlanService {
costPlanDomain.setCreateUserid(user.getUserid()); costPlanDomain.setCreateUserid(user.getUserid());
costPlanDomain.setCreateUsername(user.getUsername()); costPlanDomain.setCreateUsername(user.getUsername());
costPlanDomain.setCreateTime(new Date()); costPlanDomain.setCreateTime(new Date());
CostTypeKindDomain costTypeKindDomain = costTypeKindDao.selectByKindNo(costPlanDomain.getKindNo());
costPlanDomain.setKindName(costTypeKindDomain.getKindName());
costPlanDomain.setTypeNo(costTypeKindDomain.getTypeNo());
costPlanDomain.setTypeName(costTypeKindDomain.getTypeName());
} }
@Override @Override
......
package com.blt.other.module.database.model; package com.blt.other.module.database.model;
import lombok.Data;
@Data
public class CostTypeKindDomain { public class CostTypeKindDomain {
private Integer id;// 费用种类 id private Integer id;// 费用种类 id
...@@ -18,146 +21,4 @@ public class CostTypeKindDomain { ...@@ -18,146 +21,4 @@ public class CostTypeKindDomain {
private String createUsername; // 创建人 private String createUsername; // 创建人
private String createUsercode; // 创建人编号 private String createUsercode; // 创建人编号
public String getBankName() {
return bankName;
}
public void setBankName(String bankName) {
this.bankName = bankName;
}
public String getBankCard() {
return bankCard;
}
public void setBankCard(String bankCard) {
this.bankCard = bankCard;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getKindNo() {
return kindNo;
}
public void setKindNo(String kindNo) {
this.kindNo = kindNo;
}
public String getKindName() {
return kindName;
}
public void setKindName(String kindName) {
this.kindName = kindName;
}
public String getTypeNo() {
return typeNo;
}
public void setTypeNo(String typeNo) {
this.typeNo = typeNo;
}
public String getTypeName() {
return typeName;
}
public void setTypeName(String typeName) {
this.typeName = typeName;
}
public String getCompanyNo() {
return companyNo;
}
public void setCompanyNo(String companyNo) {
this.companyNo = companyNo;
}
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public Integer getCostTypeStatus() {
return costTypeStatus;
}
public void setCostTypeStatus(Integer costTypeStatus) {
this.costTypeStatus = costTypeStatus;
}
public Integer getCostForm() {
return costForm;
}
public void setCostForm(Integer costForm) {
this.costForm = costForm;
}
public String getSubjectCode() {
return subjectCode;
}
public void setSubjectCode(String subjectCode) {
this.subjectCode = subjectCode;
}
public Integer getIsLend() {
return isLend;
}
public void setIsLend(Integer isLend) {
this.isLend = isLend;
}
public String getCreateUsername() {
return createUsername;
}
public void setCreateUsername(String createUsername) {
this.createUsername = createUsername;
}
public String getCreateUsercode() {
return createUsercode;
}
public void setCreateUsercode(String createUsercode) {
this.createUsercode = createUsercode;
}
@Override
public String toString() {
return "CostTypeKindDomain{" +
"id=" + id +
", kindNo='" + kindNo + '\'' +
", kindName='" + kindName + '\'' +
", typeNo='" + typeNo + '\'' +
", typeName='" + typeName + '\'' +
", companyNo='" + companyNo + '\'' +
", companyName='" + companyName + '\'' +
", costTypeStatus=" + costTypeStatus +
", bankName='" + bankName + '\'' +
", bankCard='" + bankCard + '\'' +
", costForm=" + costForm +
", subjectCode='" + subjectCode + '\'' +
", isLend=" + isLend +
", createUsername='" + createUsername + '\'' +
", createUsercode='" + createUsercode + '\'' +
'}';
}
} }
# shellcheck disable=SC2164 # shellcheck disable=SC2164
cd /home/ubuntu/data/other/dc-cost-system/cost-core cd /home/ubuntu/data/other/dc-cost-system/bailuntec-cost-core
git pull git pull
# 拉取开发分支代码 # 拉取开发分支代码
git checkout master git checkout master
...@@ -9,7 +9,7 @@ mvn clean package -Dmaven.test.skip=true -Dmaven.compile.fork=true ...@@ -9,7 +9,7 @@ mvn clean package -Dmaven.test.skip=true -Dmaven.compile.fork=true
# shellcheck disable=SC2009 # shellcheck disable=SC2009
ps -ef | grep cost-core | grep -v grep | grep prod | awk '{print $2}' | xargs kill -9 ps -ef | grep cost-core | grep -v grep | grep prod | awk '{print $2}' | xargs kill -9
# 运行 # 运行
nohup java -Xms512m -Xmx512m -Xss1M -jar -Dspring.profiles.active=prod /home/ubuntu/data/other/dc-cost-system/cost-core/target/cost-core-1.1.13.jar & \ nohup java -Xms512m -Xmx512m -Xss1M -jar -Dspring.profiles.active=prod /home/ubuntu/data/other/dc-cost-system/bailuntec-cost-core/target/bailuntec-cost-core-1.0-SNAPSHOT.jar & \
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment