Преглед на файлове

财务、复审、技术总监审核修改

anderx преди 1 година
родител
ревизия
074cdbe6f4

+ 3 - 2
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -955,10 +955,11 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   <select id="getSaleIdByOno" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
     select o.order_no orderNo ,o.salesman_id as salesmanId, a.name as salesmanName,e.name managerName,
            o.contract_no contractNo,a.email ,u.nickname as userName,o.order_dep orderDep,d.name departmentName,
-           d.finance_id  financeId,d.approval approvalStatus,d.approval_aid approvalAid,ad.name approvalName
+           d.finance_id  financeId,d.approval approvalStatus,d.approval_aid approvalAid,ad.name approvalName,
+           d.operation_guarantee_id operationGuaranteeId,f.name operationGuaranteeName
     from t_order_new o left join admin a on o.salesman_id = a.id left join `user` u on u.id = o.buyer_id
     left join department d on o.order_dep=d.id left join admin e on a.manager_id=e.id
-    left join admin ad on d.approval_aid=ad.id
+    left join admin ad on d.approval_aid=ad.id left join admin f on d.operation_guarantee_id=f.id
     where order_no = #{_parameter,jdbcType=VARCHAR}
   </select>
 

+ 18 - 0
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -94,6 +94,24 @@ public class TOrderNewBo extends TOrderNew{
 	private Integer approvalStatus;
 	private String approvalAid;
 	private String approvalName;
+	private String operationGuaranteeId;
+	private String operationGuaranteeName;
+
+	public String getOperationGuaranteeId() {
+		return operationGuaranteeId;
+	}
+
+	public void setOperationGuaranteeId(String operationGuaranteeId) {
+		this.operationGuaranteeId = operationGuaranteeId;
+	}
+
+	public String getOperationGuaranteeName() {
+		return operationGuaranteeName;
+	}
+
+	public void setOperationGuaranteeName(String operationGuaranteeName) {
+		this.operationGuaranteeName = operationGuaranteeName;
+	}
 
 	public String getApprovalName() {
 		return approvalName;

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

@@ -147,7 +147,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 		return res;
 	}
 	/**
-	 * 财务审核通过
+	 *  订单审核 财务审核
 	 */
 	@RequestMapping(value="/financeApproval", method = RequestMethod.POST)
 	public Result financeApproval(String orderNo,String remarks,String aid) {

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

@@ -18,17 +18,17 @@ public enum ProcessStatus {
 	/** 已派财务与技术总监**/
 	YPCW_JSZJ(3,"已派财务与技术总监"),
 	/**
-	 * 指定审核
+	 * 运营保障审核
 	 */
-//	CWZDSH(4,"财务指定审核人"),
+	YYBZSH(4,"运营保障审核"),
 	/** 已派特批审核 **/
-	YPTPSH(4,"已派特批审核"),
+	YPTPSH(5,"已派特批审核"),
 	/** 已派咨询师管理员 **/
-	YPZXSGLY(5,"已派咨询师管理员"),
+	YPZXSGLY(6,"已派咨询师管理员"),
 	/** 已部分派咨询师经理 **/
-	YBFPZXSGLY(6,"已部分分派咨询师经理"),
+	YBFPZXSGLY(7,"已部分分派咨询师经理"),
 	/** 已全部分派咨询师经理 **/
-	YQBFPZXSGLY(7,"已全部分派咨询师经理"),
+	YQBFPZXSGLY(8,"已全部分派咨询师经理"),
 
 
 	/** 无效 **/

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

@@ -520,6 +520,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 //				order.setProcessStatus(ProcessStatus.CWZDSH.getCode());
 //				pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_YES.getCode(),order, TokenManager.getAdminId(), use.getApproval());
 //			}else {
+
 				pushNoticeAndEmail(t, use);
 
 //			}
@@ -540,15 +541,20 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 
 
 
+
 	private void pushNoticeAndEmail(TOrderNew t, TOrderNew new1) {
 		List<String> aids = new ArrayList<>();
 		StringBuffer str= new StringBuffer();
 		boolean flag= false;
 		TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
+
+
 		//如果订单是特批
 		if (new1.getApproval()==ApprovalNewState.TPDSH.getCode()|| new1.getApproval()==ApprovalNewState.TPBH.getCode()) {
-			//未设置跳过
-			if (order.getApprovalStatus()==0){
+			if (order.getOperationGuaranteeId()!=null){
+				t.setProcessStatus(ProcessStatus.YYBZSH.getCode());
+				str.append(order.getApprovalName()).append(",");
+			} else if (order.getApprovalStatus()==0){
 				t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 				t.setApproval(ApprovalNewState.TPTG.getCode());
 				flag=true;
@@ -558,15 +564,21 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 				str.append(order.getApprovalName()).append(",");
 			}
 		}else if (new1.getApproval()==ApprovalNewState.DSZDSH.getCode()|| new1.getApproval()==ApprovalNewState.DSZBH.getCode()) {
-			t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
-			List<String> types=new ArrayList<>();
-			//董事长加助理
-			types.add(AFTConstants.APPROVAL_DECISION);
-			types.add(AFTConstants.APPROVAL_DECISION_ASSISTANT);
-			for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
-				aids.add(admin.getId());
-                str.append(admin.getName()).append(",");
-            }
+
+			if (order.getOperationGuaranteeId()!=null){
+				t.setProcessStatus(ProcessStatus.YYBZSH.getCode());
+				str.append(order.getApprovalName()).append(",");
+			}else {
+				t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
+				List<String> types=new ArrayList<>();
+				//董事长加助理
+				types.add(AFTConstants.APPROVAL_DECISION);
+				types.add(AFTConstants.APPROVAL_DECISION_ASSISTANT);
+				for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
+					aids.add(admin.getId());
+					str.append(admin.getName()).append(",");
+				}
+			}
 		}else  {
 			t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 		}