|
|
@@ -268,7 +268,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
}
|
|
|
|
|
|
private void projectDistributionPushUserMid(TOrderNew tn) {
|
|
|
- if (tn.getProcessStatus()==ProcessStatus.YPZXSGLY.getCode()){
|
|
|
+ if (Objects.equals(tn.getProcessStatus(), ProcessStatus.YPZXSGLY.getCode())){
|
|
|
UserMid um=new UserMid();
|
|
|
String taskNames=userMidMapper.getUserTaskNames(tn.getBuyerId());
|
|
|
UserMid use=userMidMapper.getUserDtails(tn.getBuyerId());
|
|
|
@@ -279,7 +279,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
um.setLastSalesType(tn.getSalesType());
|
|
|
}
|
|
|
BigDecimal signAmount;
|
|
|
- Integer signNumber;
|
|
|
+ int signNumber;
|
|
|
if (use!=null){
|
|
|
if (use.getFirstSigningTime() != null) {
|
|
|
um.setFirstSigningTime(use.getFirstSigningTime()); }
|
|
|
@@ -307,9 +307,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
|
|
|
/**
|
|
|
* 推动客户、业务渠道的锁定
|
|
|
- * @param t
|
|
|
- * @param tn
|
|
|
- * @param date
|
|
|
*/
|
|
|
private void pushUser(TOrderTask t, TOrderNew tn, Date date) {
|
|
|
if (userMapper.checkLock(tn.getBuyerId())<1) {
|
|
|
@@ -425,7 +422,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
if (i==taskBos.size()) {
|
|
|
processStatus=ProcessStatus.YQBFPZXSGLY.getCode();
|
|
|
}else if(i>0&&i<taskBos.size()){
|
|
|
- processStatus=ProcessStatus.YBFPZXSGLY.getCode();;
|
|
|
+ processStatus=ProcessStatus.YBFPZXSGLY.getCode();
|
|
|
}else if(i==0){
|
|
|
processStatus=ProcessStatus.YPZXSGLY.getCode();
|
|
|
}
|
|
|
@@ -444,10 +441,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
tTaskLogMapper.insertSelective(tl);
|
|
|
}
|
|
|
|
|
|
- @SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<TOrderTaskListBo> orderTaskList(inuptTaskListBo ib) {
|
|
|
- Map<String, Object> params = new HashMap<String, Object>();
|
|
|
+ Map<String, Object> params = new HashMap<>();
|
|
|
if(ib.getPageSize()==null||ib.getPageSize()<0)ib.setPageSize(10);
|
|
|
if(ib.getPageNo()==null||ib.getPageNo()<0)ib.setPageNo(1);
|
|
|
params.put("outsource", ib.getOutsource()==null?0:ib.getOutsource());
|
|
|
@@ -517,7 +513,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
t.setTimeRecord(JSON.toJSONString(map));
|
|
|
if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)
|
|
|
||TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE)
|
|
|
- ||TokenManager.getAdminId().equals(t.getTaskReceiver())) {
|
|
|
+ || Objects.equals(TokenManager.getAdminId(), t.getTaskReceiver())) {
|
|
|
return t;
|
|
|
}else {
|
|
|
t.setContacts("***");
|