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

优化报表的查询

Browse Source
This commit is contained in:
季圣华
2020-06-05 00:02:55 +08:00
parent c46ab52362
commit e8e43675fb
14 changed files with 225 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -285,20 +285,6 @@ public class DepotHeadService {
return result;
}
public List<DepotHead> findByMonth(String monthTime)throws Exception {
DepotHeadExample example = new DepotHeadExample();
monthTime = monthTime + "-31 23:59:59";
Date month = StringUtil.getDateByString(monthTime, null);
example.createCriteria().andOpertimeLessThanOrEqualTo(month).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
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{

8
src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View File

@@ -234,20 +234,20 @@ public class DepotItemService {
return list;
}
public List<DepotItemVo4WithInfoEx> findByAll(String headIds, String materialIds, Integer offset, Integer rows)throws Exception {
public List<DepotItemVo4WithInfoEx> findByAll(String name, String model, String endTime, Integer offset, Integer rows)throws Exception {
List<DepotItemVo4WithInfoEx> list =null;
try{
list = depotItemMapperEx.findByAll(headIds, materialIds, offset, rows);
list = depotItemMapperEx.findByAll(name, model, endTime, offset, rows);
}catch(Exception e){
JshException.readFail(logger, e);
}
return list;
}
public int findByAllCount(String headIds, String materialIds)throws Exception {
public int findByAllCount(String name, String model, String endTime)throws Exception {
int result=0;
try{
result = depotItemMapperEx.findByAllCount(headIds, materialIds);
result = depotItemMapperEx.findByAllCount(name, model, endTime);
}catch(Exception e){
JshException.readFail(logger, e);
}

20
src/main/java/com/jsh/erp/service/material/MaterialService.java
View File

@@ -317,26 +317,6 @@ public class MaterialService {
return list;
}
public List<MaterialVo4Unit> findBySelect()throws Exception{
List<MaterialVo4Unit> list =null;
try{
list= materialMapperEx.findBySelect();
}catch(Exception e){
JshException.readFail(logger, e);
}
return list;
}
public List<Material> findByOrder(String name, String model)throws Exception{
List<Material> list =null;
try{
list= materialMapperEx.findByOrder(name, model);
}catch(Exception e){
JshException.readFail(logger, e);
}
return list;
}
public List<MaterialVo4Unit> findBySelectWithBarCode(String q,Integer offset, Integer rows)throws Exception{
List<MaterialVo4Unit> list =null;
try{