|
|
@@ -6,14 +6,7 @@ import java.io.UnsupportedEncodingException;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.Calendar;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.UUID;
|
|
|
+import java.util.*;
|
|
|
|
|
|
|
|
|
import javax.mail.MessagingException;
|
|
|
@@ -28,7 +21,10 @@ import com.goafanti.order.enums.*;
|
|
|
import com.goafanti.order.service.OrderProjectService;
|
|
|
import com.goafanti.organization.bo.*;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
+import com.google.gson.JsonArray;
|
|
|
+import com.google.gson.JsonObject;
|
|
|
import groovy.transform.Synchronized;
|
|
|
+import org.json.JSONObject;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -630,51 +626,28 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
params.put("name", in.getName());
|
|
|
}
|
|
|
// 计算出所有本部门及所属部门的ID
|
|
|
- List<String> departmentList = new ArrayList<>();
|
|
|
+ List<String>ls= JSON.parseArray(in.getDeps(),String.class);
|
|
|
+ List<String>departmentList=new ArrayList<>();
|
|
|
if(in.getSpecially()==1||in.getSpecially()==5) {
|
|
|
- if (in.getDeps()!=null){
|
|
|
- departmentList=departmentService.selectSubDeps(in.getDeps());
|
|
|
+ if (in.getDeps()!=null&&!ls.isEmpty()){
|
|
|
+ departmentList=departmentService.selectSubDeps(ls);
|
|
|
}else {
|
|
|
departmentList=departmentService.selectMyDeps();
|
|
|
}
|
|
|
- }
|
|
|
- if (in.getDeps()!=null) {
|
|
|
params.put("deps",departmentList);
|
|
|
+ }else {
|
|
|
+ if (in.getDeps()!=null&&!ls.isEmpty()) {
|
|
|
+ departmentList= ls;
|
|
|
+ params.put("deps",departmentList);
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
if (StringUtils.isNotBlank(in.getContractNo())) {
|
|
|
params.put("contractNo", in.getContractNo());
|
|
|
}
|
|
|
if (null!=in.getLiquidationStatus()) {
|
|
|
params.put("liquidationStatus", in.getLiquidationStatus());
|
|
|
-
|
|
|
- if (null !=in.getApproval()) {
|
|
|
- params.put("approval", in.getApproval());
|
|
|
- }
|
|
|
- if(null != in.getAmountStatus()) {
|
|
|
- params.put("amountStatus", in.getAmountStatus());
|
|
|
- }
|
|
|
- if (StringUtils.isNotBlank(in.getOrderNo())) {
|
|
|
- params.put("orderNo", in.getOrderNo());
|
|
|
- }
|
|
|
- if (StringUtils.isNotBlank(in.getStarTime())) {
|
|
|
- params.put("starTime", in.getStarTime());
|
|
|
- }
|
|
|
- if (StringUtils.isNotBlank(in.getEndTime())) {
|
|
|
- params.put("endTime", in.getEndTime()+" 23:59:59");
|
|
|
- }
|
|
|
- if (StringUtils.isNotBlank(in.getContractStart())) {
|
|
|
- params.put("contractStart", in.getContractStart());
|
|
|
- }
|
|
|
- if (StringUtils.isNotBlank(in.getContractEnd())) {
|
|
|
- params.put("contractEnd", in.getContractEnd()+" 23:59:59");
|
|
|
- }
|
|
|
- if(null != in.getProjectType()) {
|
|
|
- params.put("projectType",in.getProjectType());
|
|
|
- }
|
|
|
- if(null != in.getProcessStatus()) {
|
|
|
- params.put("processStatus",in.getProcessStatus());
|
|
|
- }
|
|
|
- } else {
|
|
|
+ }
|
|
|
if (null !=in.getApproval()) {
|
|
|
params.put("approval", in.getApproval());
|
|
|
}
|
|
|
@@ -702,7 +675,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if(null != in.getProcessStatus()) {
|
|
|
params.put("processStatus",in.getProcessStatus());
|
|
|
}
|
|
|
- }
|
|
|
params.put("outsource", in.getOutsource());
|
|
|
Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, in.getPageNo(), in.getPageSize());
|
|
|
return p;
|