Browse Source

流程修改

anderx 6 years ago
parent
commit
b8104dd4a1

+ 11 - 5
src/main/java/com/goafanti/common/enums/OrderLogProcess.java

@@ -9,10 +9,10 @@ import com.goafanti.order.enums.OrderNewState;
 
 public enum OrderLogProcess {
 //	流程 0开单 1提交 2审核 3驳回  4特批 5财务派单 6财务首付 7项目订单派单 8项目派单 9项目完成
-	TJ(1, "提交"),
-	SH(2, "审核"),
+	TJ(1, "营销员提交"),
+	SH(2, "管理员审核"),
 	BH(3, "驳回"),
-	TP(4, "特批"),
+	TP(4, "特批通过"),
 	CWPD(5, "财务派单"),
 	CWSF(6, "财务首付"),
 	XMDDPD(7, "项目订单派单"),
@@ -20,7 +20,12 @@ public enum OrderLogProcess {
 	XMWC(9, "项目完成"),
 	FQTD(0,"发起退单"),
 	WCTD(10,"退单完成"),
-	CWQK(11,"财务全款");
+	CWQK(11,"财务全款"),
+	FQWB(12,"发起外包"),
+	WBSH(13,"外包审核通过"),
+	WBBH(14,"外包审核驳回"),
+	NOT(99,"未知"),
+	;
 	
 	private OrderLogProcess(Integer code, String desc) {
 		this.code = code;
@@ -40,9 +45,10 @@ public enum OrderLogProcess {
                 return orderLogProcess.getDesc();
             }
         }
-        return  null;
+        return  NOT.getDesc();
     }
 	
+	
 	public static OrderLogProcess getStatus(Integer code) {
 		if (containsType(code)) {
 			return status.get(code);

+ 4 - 28
src/main/java/com/goafanti/order/bo/TOrderLogBo.java

@@ -3,45 +3,21 @@ package com.goafanti.order.bo;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.enums.OrderLogProcess;
 import com.goafanti.common.model.TOrderLog;
 
 //@SuppressWarnings("unused")
 public class TOrderLogBo extends TOrderLog{
+	@SuppressWarnings("unused")
 	private String processName;
 	private String adminName;
+	@SuppressWarnings("unused")
 	private String createDate;
 	
 	
 
 	public String getProcessName() {
-		switch (super.getProcess()) {
-		case 1:
-			return "提交";
-		case 2:
-			return "审核";
-		case 3:
-			return "驳回";
-		case 4:
-			return "特批";
-		case 5:
-			return "财务派单";
-		case 6:
-			return "财务首付";
-		case 7:
-			return "订单派单";
-		case 8:
-			return "项目派单";
-		case 9:
-			return "项目完成";
-		case 0:
-			return "发起退单";
-		case 10:
-		return "退单完成";
-		case 11:
-			return "财务全款";
-		default:
-			return "未知";
-		}
+		return OrderLogProcess.getValueByCode(super.getProcess());
 	}
 
 	public void setProcessName(String processName) {

+ 1 - 1
src/main/java/com/goafanti/order/controller/OutsourceOrgApiController.java

@@ -153,7 +153,7 @@ public class OutsourceOrgApiController extends CertifyApiController {
 	@RequestMapping(value="/auditOutsourceNew", method = RequestMethod.POST)
 	public Result auditOutsourceNew(OrderOutsourceDtails o){
 		Result res=new Result();
-		if (o.getId()==null||o.getRefundStatus()==null||o.getRemarks()==null) {
+		if (o.getId()==null||null==o.getRefundStatus()||StringUtils.isBlank(o.getRemarks())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "外包信息","外包信息"));
 			return res;
 		}

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

@@ -423,11 +423,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (orderStatus==OrderNewState.QDSHTG.getCode()) {
 			if (t2.getApproval()==ApprovalNewState.FTP.getCode()) {//如果通过分配给财务管理员
 				t.setProcessStatus(ProcessStatus.YPCWGLY.getCode());
-				addOrderLog(orderNo, OrderLogProcess.SH.getCode());
-			}else if (t2.getApproval()==ApprovalNewState.DSH.getCode()) {
+			}
+			if(outsource!=null&&outsource==1) {
+				t.setOutsource(outsource);
+				addOrderLog(orderNo, OrderLogProcess.FQWB.getCode());
+			}else {
 				addOrderLog(orderNo, OrderLogProcess.SH.getCode());
 			}
-			if(outsource!=null&&outsource==1)t.setOutsource(outsource);
 		}
 		if (outsource==0) {//非外包
 			if (orderStatus==OrderNewState.QDSHJJ.getCode()) {//如果不通过新增驳回
@@ -438,6 +440,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			t.setOrderStatus(orderStatus);
 		}else if (outsource==1) {//外包
 			o.setRefundStatus(0);
+			
 			if(o.getId()==null) {
 				o.setCreateTime(new Date());
 				tOrderOutsourceMapper.insertSelective(o);

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

@@ -11,12 +11,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.dao.OutsourceOrganizationMapper;
+import com.goafanti.common.dao.TOrderLogMapper;
 import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.dao.TOrderOutsourceMapper;
+import com.goafanti.common.enums.OrderLogProcess;
 import com.goafanti.common.model.OutsourceOrganization;
+import com.goafanti.common.model.TOrderLog;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.OrderOutsourceBo;
 import com.goafanti.order.bo.OrderOutsourceDtails;
 import com.goafanti.order.bo.OutsourceOrganizationBo;
@@ -32,6 +36,8 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 	private TOrderNewMapper	tOrderNewMapper;
 	@Autowired
 	private OrderService	orderService;
+	@Autowired
+	private TOrderLogMapper	tOrderLogMapper;
 	@Override
 	public int addOutsourceOrg(OutsourceOrganization o) {
 		return outsourceOrganizationMapper.insertSelective(o);
@@ -88,10 +94,22 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 			t.setOrderNo(o.getOrderNo());
 			t.setOrderStatus(2);//订单审核标记通过
 			t.setProcessStatus(2);//订单流程标记到财务
+			addOrderLog(o.getOrderNo(),OrderLogProcess.WBSH.getCode());
 			tOrderNewMapper.updateByPrimaryKeySelective(t);
+		}else {
+			addOrderLog(o.getOrderNo(),OrderLogProcess.WBBH.getCode());
 		}
 		return tOrderOutsourceMapper.updateByPrimaryKeySelective(o);
 	}
+	
+	public void addOrderLog(String orderNo, Integer code) {
+		TOrderLog tl=new TOrderLog();
+		tl.setOrderNo(orderNo);
+		tl.setProcess(code);
+		tl.setAid(TokenManager.getAdminId());
+		tOrderLogMapper.insertSelective(tl);
+		
+	}
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<OrderOutsourceBo> salesmanOrderOutsourceList(String name, String contractNo, String starTime,