Browse Source

营销经理审核BUG修复

anderx 2 years ago
parent
commit
4c3eef1d7a

+ 2 - 0
src/main/java/com/goafanti/common/dao/TOrderExamineMapper.java

@@ -23,4 +23,6 @@ public interface TOrderExamineMapper {
     void updateStatusByOrderNo(@Param("orderNo") String orderNo,@Param("status") Integer status);
 
     void insertBatch(@Param("list") List<TOrderExamine> list);
+
+    int selectByOrderNoAndAid(@Param("orderNo")String orderNo,@Param("aid") String aid);
 }

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

@@ -7,16 +7,17 @@ import org.apache.commons.lang3.StringUtils;
 
 
 public enum OrderLogProcess {
-//	流程1=提交,2=审核,3=驳回,4=特批,5=财务派单,6=财务首付,7=项目订单派单,8=项目派单,9=项目完成,0=发起退单,10=退单完成,11=财务全款,
+//	流程1=提交,2=审核,3=驳回,4=特批,5=财务审核 ,25=项目总监审核,6=财务首付,7=项目订单派单,8=项目派单,9=项目完成,0=发起退单,10=退单完成,11=财务全款,
 //	12=离职转交,13=发起会员项目,14=订单外包驳回,15=项目外包通过,16=项目外包驳回,17=订单离职转交,18=会员项目发起,19=会员财务通过,
 //	20=会员特批通过,21=会员财务驳回,22=会员特批驳回,23=会员项目完成
 	TJ(1, "营销员提交"),
 	SH(2, "管理员审核"),
 	BH(3, "驳回"),
 	TP(4, "特批通过"),
-	CWPD(5, "财务派单"),
+	CWSH(5, "财务审核"),
+	XMZJSH(25, "项目总监审核"),
 	CWSF(6, "财务首付"),
-	XMDDPD(7, "项目总监派单"),
+	XMZJPD(7, "项目总监派单"),
 	XMJLPD(8, "项目经理派单"),
 	XMWC(9, "项目完成"),
 	FQTD(0,"发起退单"),
@@ -35,7 +36,6 @@ public enum OrderLogProcess {
 	HYTPBH(22,"会员特批驳回"),
 	HYXMWC(23,"会员项目完成"),
 	DDZJ(24,"订单转交"),
-	XMZJSH(25, "项目总监审核"),
 	NOT(99,"未知"),
 	;
 

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TOrderExamineMapper.xml

@@ -106,6 +106,7 @@
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </select>
 
+
   <update id="updateStatusByOrderNo">
     update t_order_examine
     set status= #{status}
@@ -119,4 +120,9 @@
        #{item.aname,jdbcType=VARCHAR})
     </foreach>
   </insert>
+  <select id="selectByOrderNoAndAid" resultType="java.lang.Integer">
+    select count(*)
+    from t_order_examine where status=0
+    and order_no = #{orderNo} and aid= #{aid}
+  </select>
 </mapper>

+ 10 - 0
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -151,6 +151,16 @@ public class OrderListBo {
 
 	private String departmentId;
 
+	private Integer myExamine;
+
+	public Integer getMyExamine() {
+		return myExamine;
+	}
+
+	public void setMyExamine(Integer myExamine) {
+		this.myExamine = myExamine;
+	}
+
 	public String getExamineName() {
 		return examineName;
 	}

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

@@ -57,6 +57,10 @@ public class TOrderNewBo extends TOrderNew{
 	 * 是否变更 0否 1是
 	 */
 	private Integer ischange;
+	/**
+	 * 当前审核
+	 */
+	private Integer myExamine;
 	private Integer stopProject;
 
 	/**
@@ -89,6 +93,15 @@ public class TOrderNewBo extends TOrderNew{
 	 */
 	private String addDeductionOther;
 
+
+	public Integer getMyExamine() {
+		return myExamine;
+	}
+
+	public void setMyExamine(Integer myExamine) {
+		this.myExamine = myExamine;
+	}
+
 	public String getManagerId() {
 		return managerId;
 	}

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

@@ -114,7 +114,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			if(torder.getProcessStatus()<ProcessStatus.YPZXSGLY.getCode()) {
 				record.setProcessStatus(ProcessStatus.YPCWZY.getCode());
 			}
-			addOrderLog(orderNo, OrderLogProcess.CWPD.getCode(),null);
+			addOrderLog(orderNo, OrderLogProcess.CWSH.getCode(),null);
 			r = tOrderNewMapper.updateByPrimaryKeySelective(record);
 		}else{
 			//返回错误标志 提示订单编号或者财务专员选择错误
@@ -166,6 +166,14 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		}
 		Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("financeList", "financeCount", params, pageNo, pageSize);
 		result.put("pagination", data);
+		if (TokenManager.hasRole(AFTConstants.FINANCE)){
+			List<OrderListBo> list = (List<OrderListBo>) data.getList();
+			for (OrderListBo o : list) {
+				int i = tOrderExamineMapper.selectByOrderNoAndAid(o.getOrderNo(), TokenManager.getAdminId());
+				if (i==0) o.setMyExamine(0);
+				else o.setMyExamine(1);
+			}
+		}
 		Map<String, Object> count = tOrderNewMapper.countTotalAndActually(order,fids,listDep);
 		result.put("count", count);
 		return result;
@@ -493,7 +501,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		tl.setAid(TokenManager.getAdminId());
 		tl.setOrderNo(t.getOrderNo());
 		if (TokenManager.hasRole(AFTConstants.FINANCE)){
-			tl.setProcess(OrderLogProcess.CWPD.getCode());
+			tl.setProcess(OrderLogProcess.CWSH.getCode());
 		}else if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)){
 			tl.setProcess(OrderLogProcess.XMZJSH.getCode());
 		}

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

@@ -733,6 +733,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		TOrderNewBo tOrder= tOrderNewMapper.getOrderNewDetail(orderNo);
 		String url=pushOrderService.processStatusConstant(tOrder);
 		tOrder.setContractPictureUrl(url);
+		pushMyExamine(orderNo, tOrder);
 		if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE)||
 				tOrder.getSalesmanId().equals(TokenManager.getAdminId())) {
 
@@ -745,6 +746,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		return tOrder;
 	}
 
+	private void pushMyExamine(String orderNo, TOrderNewBo tOrder) {
+		if (TokenManager.hasRole(AFTConstants.FINANCE)||TokenManager.hasRole(AFTConstants.TECH_ADMIN)){
+			int i = tOrderExamineMapper.selectByOrderNoAndAid(orderNo, TokenManager.getAdminId());
+			if (i==0) tOrder.setMyExamine(0);
+			else tOrder.setMyExamine(1);
+		}
+	}
+
 	@Override
 	public int createOrderDun(String orderDun,String orderNo) {
 		List<TOrderDun> l=  JSON.parseArray(orderDun, TOrderDun.class);

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

@@ -150,7 +150,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			throw  new BusinessException(new Error("分配人员不存在!","分配人员不存在!"));
 		}
 		if (type==0) {
-			addOrderLog(t.getOrderNo(), OrderLogProcess.XMDDPD.getCode(),remarks);
+			addOrderLog(t.getOrderNo(), OrderLogProcess.XMZJPD.getCode(),remarks);
 			t.setManagerId(taskReceiverId);
 			t.setConsultantId(null);
 			//设置催款触发