Browse Source

版本切换 1.2.71

anderx 2 years ago
parent
commit
2a9bc54a59

+ 1 - 1
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -564,7 +564,7 @@ public class AsyncUtils {
 	}
 
 	public void updateFinanceExamine(String id) {
-		tOrderNewMapper.updateExamineById(id,ProcessStatus.YPCWZY.getCode());
+		tOrderNewMapper.updateExamineById(id,ProcessStatus.YPCW_JSZJ.getCode());
 		newOrderChangeMapper.updateExamineById(id,OrderChangeProcess.CWZY.getCode());
 	}
 

+ 16 - 23
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1,45 +1,38 @@
 package com.goafanti.customer.service.impl;
 
-import java.lang.reflect.InvocationTargetException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import javax.annotation.Resource;
-
 import com.goafanti.admin.bo.AdminListBo;
+import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.bo.userDaysBo;
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.*;
 import com.goafanti.common.enums.*;
+import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.*;
+import com.goafanti.common.utils.*;
 import com.goafanti.common.utils.excel.NewExcelUtil;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.*;
+import com.goafanti.customer.service.CustomerService;
 import com.goafanti.order.bo.TOrderNewBo;
+import com.goafanti.user.bo.OutUserChannel;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.ibatis.builder.BuilderException;
-import org.apache.poi.ss.formula.functions.T;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.goafanti.common.bo.Error;
-import com.goafanti.common.bo.userDaysBo;
-import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.error.BusinessException;
-import com.goafanti.common.utils.BeanUtilsExt;
-import com.goafanti.common.utils.DateUtils;
-import com.goafanti.common.utils.ExportExcelUtil;
-import com.goafanti.common.utils.PasswordUtil;
-import com.goafanti.common.utils.StringUtils;
-import com.goafanti.core.mybatis.BaseMybatisDao;
-import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.customer.service.CustomerService;
-import com.goafanti.user.bo.OutUserChannel;
+import javax.annotation.Resource;
+import java.lang.reflect.InvocationTargetException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Service
 public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements CustomerService {

+ 1 - 1
src/main/java/com/goafanti/order/enums/ProcessStatus.java

@@ -16,7 +16,7 @@ public enum ProcessStatus {
 	/** 已派营销管理员 **/
 	YPYXGLY(2,"已派营销管理员"),
 	/** 已派财务与技术总监**/
-	YPCWZY(3,"已派财务与技术总监"),
+	YPCW_JSZJ(3,"已派财务与技术总监"),
 	/** 已派特批审核 **/
 	YPTPSH(4,"已派特批审核"),
 	/** 已派咨询师管理员 **/

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -112,7 +112,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			record.setOrderNo(orderNo);
 			record.setFinanceId(financeId);
 			if(torder.getProcessStatus()<ProcessStatus.YPZXSGLY.getCode()) {
-				record.setProcessStatus(ProcessStatus.YPCWZY.getCode());
+				record.setProcessStatus(ProcessStatus.YPCW_JSZJ.getCode());
 			}
 			addOrderLog(orderNo, OrderLogProcess.CWSH.getCode(),null);
 			r = tOrderNewMapper.updateByPrimaryKeySelective(record);

+ 4 - 4
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -498,7 +498,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 					}else {
 						if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
 							addOrderLog(t2.getOrderNo(),OrderLogProcess.SH.getCode(), "管理员跳过自己审核");
-							t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
+							t.setProcessStatus(ProcessStatus.YPCW_JSZJ.getCode());
 							orderStatus=OrderNewState.QDSHTG.getCode();
 						}else {
 							addOrderLog(t2.getOrderNo(),OrderLogProcess.YXJLTT.getCode(), "无经理跳过审核");
@@ -549,7 +549,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 						if (!str.toString().contains(admin.getName()))str.append(admin.getName()).append(",");
 					}
 				}
-			}else  if (t.getProcessStatus()==ProcessStatus.YPCWZY.getCode()){
+			}else  if (t.getProcessStatus()==ProcessStatus.YPCW_JSZJ.getCode()){
 				type=NoticeStatus.ORDER_YES.getCode();
 				Department dep = departmentMapper.selectByPrimaryKey(t.getOrderDep());
 				aids.add(dep.getFinanceId());
@@ -1003,7 +1003,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				aids.addAll(adminMapper.listNameByDepAndName(t2.getOrderDep(), AFTConstants.SALESMAN_ADMIN));
 			}else if (t2.getProcessStatus()==ProcessStatus.YPYXGLY.getCode()){
 				tl.setProcess(OrderLogProcess.SH.getCode());
-				t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
+				t.setProcessStatus(ProcessStatus.YPCW_JSZJ.getCode());
 				//设置财务与技术总监通知
 				//为了处理旧数据,后期可以去掉新增
 				List<TOrderExamine> tOrderExamines = tOrderExamineMapper.selectByOrderNo(orderNo);
@@ -1068,7 +1068,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 					str=str.append(admin.getName()).append(",");
 				}
 			}
-		}else if (t.getProcessStatus()==ProcessStatus.YPCWZY.getCode()){
+		}else if (t.getProcessStatus()==ProcessStatus.YPCW_JSZJ.getCode()){
 			if (t.getOrderDep()!=null){
 				OrganizationListOut dep = departmentMapper.selectAllById(t.getOrderDep());
 				str=str.append(dep.getFinanceName()).append(",");

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OutsourceOrgServiceImpl.java

@@ -125,7 +125,7 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 			t.setOrderNo(o.getOrderNo());
 			if (o.getRefundStatus()==1) {
 				t.setOrderStatus(2);//订单审核标记通过
-				t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
+				t.setProcessStatus(ProcessStatus.YPCW_JSZJ.getCode());
 				addOrderLog(o.getOrderNo(),OrderLogProcess.WBTG.getCode(),o.getRemarks());
 				aids.add(departmentMapper.selectByPrimaryKey(t2.getOrderDep()).getFinanceId());
 				type=NoticeStatus.ORDER_OUTSOURCE_YES.getCode();

+ 4 - 9
src/main/java/com/goafanti/order/service/impl/PushOrderService.java

@@ -2,19 +2,12 @@ package com.goafanti.order.service.impl;
 
 
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.AdminMapper;
-
-import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.token.TokenManager;
-
 import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.enums.ApprovalNewState;
 import com.goafanti.order.enums.ProcessStatus;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 @Service
 public class PushOrderService {
     public static final String   DEFAULTS_URL="/image/noPermission.jpg";
@@ -54,9 +47,11 @@ public class PushOrderService {
             }
         }else if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)&&t.getProcessStatus()== ProcessStatus.YPYXGLY.getCode()){
             return  t.getContractPictureUrl();
-        }else if (TokenManager.hasRole(AFTConstants.FINANCE)&&t.getProcessStatus()== ProcessStatus.YPCWZY.getCode()){
+        }else if (TokenManager.hasRole(AFTConstants.FINANCE)&&(t.getProcessStatus()== ProcessStatus.YPCW_JSZJ.getCode())){
             return  t.getContractPictureUrl();
-        }else if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)&&t.getProcessStatus()== ProcessStatus.YPZXSGLY.getCode()){
+        }else if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)&&(
+                t.getProcessStatus()== ProcessStatus.YPCW_JSZJ.getCode()||t.getProcessStatus()== ProcessStatus.YPZXSGLY.getCode()
+                )){
             return  t.getContractPictureUrl();
         }else if (TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)){
             return  t.getContractPictureUrl();