purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

系统功能细节优化

Browse Source
This commit is contained in:
季圣华
2020-02-18 13:23:37 +08:00
parent 05dbdf8964
commit 3f76280df0
10 changed files with 47 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/jsh/erp/datasource/entities/DepotHead.java
View File

@@ -10,8 +10,6 @@ public class DepotHead {
private String subtype;
private Long projectid;
private String defaultnumber;
private String number;
@@ -30,8 +28,6 @@ public class DepotHead {
private BigDecimal changeamount;
private Long allocationprojectid;
private BigDecimal totalprice;
private String paytype;
@@ -90,14 +86,6 @@ public class DepotHead {
this.subtype = subtype == null ? null : subtype.trim();
}
public Long getProjectid() {
return projectid;
}
public void setProjectid(Long projectid) {
this.projectid = projectid;
}
public String getDefaultnumber() {
return defaultnumber;
}
@@ -170,14 +158,6 @@ public class DepotHead {
this.changeamount = changeamount;
}
public Long getAllocationprojectid() {
return allocationprojectid;
}
public void setAllocationprojectid(Long allocationprojectid) {
this.allocationprojectid = allocationprojectid;
}
public BigDecimal getTotalprice() {
return totalprice;
}

120
src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java
View File

@@ -306,66 +306,6 @@ public class DepotHeadExample {
return (Criteria) this;
}
public Criteria andProjectidIsNull() {
addCriterion("ProjectId is null");
return (Criteria) this;
}
public Criteria andProjectidIsNotNull() {
addCriterion("ProjectId is not null");
return (Criteria) this;
}
public Criteria andProjectidEqualTo(Long value) {
addCriterion("ProjectId =", value, "projectid");
return (Criteria) this;
}
public Criteria andProjectidNotEqualTo(Long value) {
addCriterion("ProjectId <>", value, "projectid");
return (Criteria) this;
}
public Criteria andProjectidGreaterThan(Long value) {
addCriterion("ProjectId >", value, "projectid");
return (Criteria) this;
}
public Criteria andProjectidGreaterThanOrEqualTo(Long value) {
addCriterion("ProjectId >=", value, "projectid");
return (Criteria) this;
}
public Criteria andProjectidLessThan(Long value) {
addCriterion("ProjectId <", value, "projectid");
return (Criteria) this;
}
public Criteria andProjectidLessThanOrEqualTo(Long value) {
addCriterion("ProjectId <=", value, "projectid");
return (Criteria) this;
}
public Criteria andProjectidIn(List<Long> values) {
addCriterion("ProjectId in", values, "projectid");
return (Criteria) this;
}
public Criteria andProjectidNotIn(List<Long> values) {
addCriterion("ProjectId not in", values, "projectid");
return (Criteria) this;
}
public Criteria andProjectidBetween(Long value1, Long value2) {
addCriterion("ProjectId between", value1, value2, "projectid");
return (Criteria) this;
}
public Criteria andProjectidNotBetween(Long value1, Long value2) {
addCriterion("ProjectId not between", value1, value2, "projectid");
return (Criteria) this;
}
public Criteria andDefaultnumberIsNull() {
addCriterion("DefaultNumber is null");
return (Criteria) this;
@@ -936,66 +876,6 @@ public class DepotHeadExample {
return (Criteria) this;
}
public Criteria andAllocationprojectidIsNull() {
addCriterion("AllocationProjectId is null");
return (Criteria) this;
}
public Criteria andAllocationprojectidIsNotNull() {
addCriterion("AllocationProjectId is not null");
return (Criteria) this;
}
public Criteria andAllocationprojectidEqualTo(Long value) {
addCriterion("AllocationProjectId =", value, "allocationprojectid");
return (Criteria) this;
}
public Criteria andAllocationprojectidNotEqualTo(Long value) {
addCriterion("AllocationProjectId <>", value, "allocationprojectid");
return (Criteria) this;
}
public Criteria andAllocationprojectidGreaterThan(Long value) {
addCriterion("AllocationProjectId >", value, "allocationprojectid");
return (Criteria) this;
}
public Criteria andAllocationprojectidGreaterThanOrEqualTo(Long value) {
addCriterion("AllocationProjectId >=", value, "allocationprojectid");
return (Criteria) this;
}
public Criteria andAllocationprojectidLessThan(Long value) {
addCriterion("AllocationProjectId <", value, "allocationprojectid");
return (Criteria) this;
}
public Criteria andAllocationprojectidLessThanOrEqualTo(Long value) {
addCriterion("AllocationProjectId <=", value, "allocationprojectid");
return (Criteria) this;
}
public Criteria andAllocationprojectidIn(List<Long> values) {
addCriterion("AllocationProjectId in", values, "allocationprojectid");
return (Criteria) this;
}
public Criteria andAllocationprojectidNotIn(List<Long> values) {
addCriterion("AllocationProjectId not in", values, "allocationprojectid");
return (Criteria) this;
}
public Criteria andAllocationprojectidBetween(Long value1, Long value2) {
addCriterion("AllocationProjectId between", value1, value2, "allocationprojectid");
return (Criteria) this;
}
public Criteria andAllocationprojectidNotBetween(Long value1, Long value2) {
addCriterion("AllocationProjectId not between", value1, value2, "allocationprojectid");
return (Criteria) this;
}
public Criteria andTotalpriceIsNull() {
addCriterion("TotalPrice is null");
return (Criteria) this;

22
src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -94,6 +94,14 @@ public class DepotHeadService {
}
if (null != list) {
for (DepotHeadVo4List dh : list) {
if(dh.getAccountidlist() != null) {
String accountidlistStr = dh.getAccountidlist().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setAccountidlist(accountidlistStr);
}
if(dh.getAccountmoneylist() != null) {
String accountmoneylistStr = dh.getAccountmoneylist().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setAccountmoneylist(accountmoneylistStr);
}
if(dh.getOthermoneylist() != null) {
String otherMoneyListStr = dh.getOthermoneylist().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setOthermoneylist(otherMoneyListStr);
@@ -291,20 +299,6 @@ public class DepotHeadService {
return list;
}
public List<DepotHead> getDepotHeadGiftOut(String projectId)throws Exception {
DepotHeadExample example = new DepotHeadExample();
if (projectId != null) {
example.createCriteria().andProjectidEqualTo(Long.parseLong(projectId));
}
List<DepotHead> list = null;
try{
list =depotHeadMapper.selectByExample(example);
}catch(Exception e){
JshException.readFail(logger, e);
}
return list;
}
public List<DepotHeadVo4InDetail> findByAll(String beginTime, String endTime, String type, Integer pid, String dids, Integer oId, Integer offset, Integer rows) throws Exception{
List<DepotHeadVo4InDetail> list = null;
try{