|
@@ -969,7 +969,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
@SuppressWarnings("unchecked")
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
@Override
|
|
|
public Pagination<outOrderDunListBo> dunOrderNewList(String name, String orderNo,String contractNo, String starTime, String endTime,
|
|
public Pagination<outOrderDunListBo> dunOrderNewList(String name, String orderNo,String contractNo, String starTime, String endTime,
|
|
|
- Integer specially,String aid, String adminName,String depId,Integer newStatus,Integer approval,Integer amountStatus,Integer memberType,Integer pageNo, Integer pageSize) {
|
|
|
|
|
|
|
+ Integer specially,String aid, String adminName,String deps,Integer newStatus,Integer approval,Integer amountStatus,Integer memberType,Integer pageNo, Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
if(newStatus!=null&&newStatus==0) {
|
|
if(newStatus!=null&&newStatus==0) {
|
|
|
params.put("newStatus", 0);
|
|
params.put("newStatus", 0);
|
|
@@ -979,8 +979,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if (StringUtils.isNotBlank(name)) {
|
|
if (StringUtils.isNotBlank(name)) {
|
|
|
params.put("name", name);
|
|
params.put("name", name);
|
|
|
}
|
|
}
|
|
|
- if (StringUtils.isNotBlank(depId)) {
|
|
|
|
|
- params.put("depId", depId);
|
|
|
|
|
|
|
+ if (StringUtils.isNotBlank(deps)) {
|
|
|
|
|
+ params.put("deps", departmentService.parseArray(deps));
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isNotBlank(adminName)) {
|
|
if (StringUtils.isNotBlank(adminName)) {
|
|
|
params.put("adminName", adminName);
|
|
params.put("adminName", adminName);
|
|
@@ -1720,8 +1720,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if (StringUtils.isNotBlank(in.getName())) {
|
|
if (StringUtils.isNotBlank(in.getName())) {
|
|
|
params.put("name", in.getName());
|
|
params.put("name", in.getName());
|
|
|
}
|
|
}
|
|
|
- if (!in.getDeps().isEmpty()) {
|
|
|
|
|
- params.put("deps", in.getDeps());
|
|
|
|
|
|
|
+ if (in.getDeps()!=null) {
|
|
|
|
|
+ params.put("deps",departmentService.parseArray(in.getDeps()));
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isNotBlank(in.getAdminName())) {
|
|
if (StringUtils.isNotBlank(in.getAdminName())) {
|
|
|
params.put("adminName", in.getAdminName());
|
|
params.put("adminName", in.getAdminName());
|