|
@@ -9,18 +9,15 @@ import java.util.*;
|
|
|
import javax.mail.MessagingException;
|
|
import javax.mail.MessagingException;
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
|
-import com.goafanti.admin.bo.AdminListBo;
|
|
|
|
|
import com.goafanti.admin.service.DepartmentService;
|
|
import com.goafanti.admin.service.DepartmentService;
|
|
|
import com.goafanti.common.bo.*;
|
|
import com.goafanti.common.bo.*;
|
|
|
import com.goafanti.common.bo.Error;
|
|
import com.goafanti.common.bo.Error;
|
|
|
import com.goafanti.common.dao.*;
|
|
import com.goafanti.common.dao.*;
|
|
|
-import com.goafanti.common.enums.OrderState;
|
|
|
|
|
import com.goafanti.common.model.*;
|
|
import com.goafanti.common.model.*;
|
|
|
import com.goafanti.common.utils.*;
|
|
import com.goafanti.common.utils.*;
|
|
|
import com.goafanti.common.utils.excel.NewExcelUtil;
|
|
import com.goafanti.common.utils.excel.NewExcelUtil;
|
|
|
import com.goafanti.order.bo.*;
|
|
import com.goafanti.order.bo.*;
|
|
|
import com.goafanti.order.enums.*;
|
|
import com.goafanti.order.enums.*;
|
|
|
-import com.goafanti.report.bo.SalesValues;
|
|
|
|
|
import org.apache.commons.collections4.map.HashedMap;
|
|
import org.apache.commons.collections4.map.HashedMap;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
@@ -46,8 +43,6 @@ import com.goafanti.order.service.OrderProjectService;
|
|
|
import com.goafanti.organization.bo.OutPaymentNode;
|
|
import com.goafanti.organization.bo.OutPaymentNode;
|
|
|
import com.goafanti.techproject.enums.TaskState;
|
|
import com.goafanti.techproject.enums.TaskState;
|
|
|
|
|
|
|
|
-import static javafx.scene.input.KeyCode.L;
|
|
|
|
|
-
|
|
|
|
|
@Service
|
|
@Service
|
|
|
public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> implements OrderProjectService {
|
|
public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> implements OrderProjectService {
|
|
|
@Autowired
|
|
@Autowired
|
|
@@ -1458,7 +1453,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
- public Object addProjectSotp(InputProjectSotp in) {
|
|
|
|
|
|
|
+ public Integer addProjectSotp(InputProjectSotp in) {
|
|
|
String[] split = in.getIds().split(",");
|
|
String[] split = in.getIds().split(",");
|
|
|
List<TaskSopt> list =new ArrayList<>();
|
|
List<TaskSopt> list =new ArrayList<>();
|
|
|
Date date = new Date();
|
|
Date date = new Date();
|
|
@@ -1483,5 +1478,32 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
return 1;
|
|
return 1;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public Pagination<?> selectProjectSotp(String orderNo, String userName, String depId, String contractNo, String projectName,
|
|
|
|
|
+ Integer status,String startTime,String endTime,String receiverId, Integer pageNo, Integer pageSize) {
|
|
|
|
|
+ Map<String,Object>params =new HashMap<>();
|
|
|
|
|
+ if (orderNo!=null)params.put("orderNo",orderNo);
|
|
|
|
|
+ if (userName!=null)params.put("userName",userName);
|
|
|
|
|
+ if (depId!=null)params.put("depId",depId);
|
|
|
|
|
+ if (contractNo!=null)params.put("contractNo",contractNo);
|
|
|
|
|
+ if (projectName!=null)params.put("projectName",projectName);
|
|
|
|
|
+ if (status!=null)params.put("status",status);
|
|
|
|
|
+ if (startTime!=null)params.put("startTime",startTime);
|
|
|
|
|
+ if (endTime!=null)params.put("endTime",endTime+" 23:59:59");
|
|
|
|
|
+ if (receiverId!=null)params.put("receiverId",receiverId);
|
|
|
|
|
+ if (TokenManager.hasRole(AFTConstants.SUPERADMIN)){
|
|
|
|
|
+ params.put("shiro",0);
|
|
|
|
|
+ }else if (TokenManager.hasRole(AFTConstants.SALESMAN)||TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)){
|
|
|
|
|
+ params.put("shiro",1);
|
|
|
|
|
+ params.put("aid",TokenManager.getAdminId());
|
|
|
|
|
+ }else if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
|
|
|
|
|
+ params.put("shiro",2);
|
|
|
|
|
+ params.put("deps",departmentService.selectMyDeps());
|
|
|
|
|
+ }else {
|
|
|
|
|
+ return new Pagination<>();
|
|
|
|
|
+ }
|
|
|
|
|
+ return findPage("selectProjectSotpList","selectProjectSotpCount",params,pageNo,pageSize);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
|
|
|
}
|
|
}
|