Browse Source

客户转交设置检查

anderx 6 years ago
parent
commit
f4d1cad2f2

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

@@ -246,5 +246,7 @@ public interface UserMapper {
 	userDataListBo userDataStatisticsCount(@Param("depId")String depId);
 
 	int UserReceiveCount( @Param("aid")String aid);
+
+	int getAidAndUser(@Param("uid")String uid,@Param("aid") String aid);
 	
 }

+ 16 - 4
src/main/java/com/goafanti/common/mapper/TOrderInvoiceMapper.xml

@@ -716,12 +716,18 @@
   </select>
   
   <select id="approvalOrderInvoiceList" resultType="com.goafanti.order.bo.TOrderInvoiceBo">
-     select a.id,a.unit_name as unitName,a.order_no as orderNo,c.name,b.project_status as projectStatus,a.amount,
-     ifnull(d.sumAmount,0) as sumAmount, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')as createTime ,
+      	select a.id,a.unit_name as unitName,a.order_no as orderNo,c.name,b.project_status as projectStatus,a.amount,
+     ifnull(d.sumAmount,0) as sumAmount, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')as createTime ,a.status, a.approval,
      b.settlement_amount as settlementAmount, (b.total_amount-b.settlement_amount) as notAmount from t_order_invoice a 
 	left join t_order_new b on a.order_no=b.order_no left join admin c on b.salesman_id=c.id
 	left join (select order_no,sum(amount)as  sumAmount from t_order_invoice where status =2 group by order_no) d
-	on a.order_no=d.order_no where a.status =1 and a.approval =1
+	on a.order_no=d.order_no where a.status in(1,2)
+	<if test="approval ==null">
+	 and a.approval in(1,2)
+	</if>
+	<if test="approval != null">
+	 and a.approval = #{approval,jdbcType=INTEGER}
+	</if>
 	<if test="type !=null">
 	and a.type= #{type,jdbcType=INTEGER}
 	</if>
@@ -746,7 +752,13 @@
   <select id="approvalOrderInvoiceCount" resultType="java.lang.Integer">
   	   select count(*) from t_order_invoice a 
 	left join t_order_new b on a.order_no=b.order_no left join admin c on b.salesman_id=c.id
-	where a.status =1 and a.approval =1
+	where a.status in(1,2)
+	<if test="approval ==null">
+	 and a.approval in(1,2)
+	</if>
+	<if test="approval != null">
+	 and a.approval = #{approval,jdbcType=INTEGER}
+	</if>
 	<if test="type !=null">
 	and a.type= #{type,jdbcType=INTEGER}
 	</if>

+ 4 - 0
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1613,4 +1613,8 @@
 			transfer_time=now()
 		where aid=#{aid,jdbcType=VARCHAR}
   </update>
+  <select id="getAidAndUser" resultType="java.lang.Integer">
+  select count(*) from `user`
+	where aid=#{aid,jdbcType=VARCHAR} and id=#{uid,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 4 - 2
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -929,11 +929,13 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 			throw new BusinessException(new Error(ErrorConstants.CUSTOM_EREXCESS,""+(AFTConstants.USER_RCEIVE_MAX+1),""));
 			organizationContactBookMapper.updateAdmin(uid,TokenManager.getAdminId());
 		}else if(operatorType.equals(AFTConstants.USER_TRANSFER_TO_OTHER)){
-			user.setAid(String.valueOf(params[0]));
+			user.setAid(String.valueOf(TokenManager.getAdminId()));
 			user.setSource(3);//客户来源设置为转交
 			user.setTransferTime(now);
+			//查询这个客户是否是登陆人的客户
+			if(userMapper.getAidAndUser(uid,TokenManager.getAdminId())<=0)throw new BusinessException(new Error("请勿非法操作!","请勿非法操作!"));
 			flag = updateUserLock(uid,oldAid,UserLockReleaseStatus.LOCKED.getCode(),UserLockReleaseStatus.RELEASE.getCode()); //原用户释放客户
-			if(flag > 0 ) flag = addUserLock(uid,String.valueOf(params[0]),now); //指定用户锁定客户
+			if(flag > 0 ) flag = addUserLock(uid,TokenManager.getAdminId(),now); //指定用户锁定客户
 			if(flag <= 0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_TRANSFER_FAIL,""));
 		}
 		return userMapper.updateByPrimaryKeySelective(user);

+ 7 - 0
src/main/java/com/goafanti/order/bo/TOrderInvoiceBo.java

@@ -13,6 +13,7 @@ public class TOrderInvoiceBo {
 	private String notAmount;
 	private String settlementAmount;
 	private String rejectReason;
+	private Integer approval;
 	public Integer getId() {
 		return id;
 	}
@@ -86,6 +87,12 @@ public class TOrderInvoiceBo {
 	public void setRejectReason(String rejectReason) {
 		this.rejectReason = rejectReason;
 	}
+	public Integer getApproval() {
+		return approval;
+	}
+	public void setApproval(Integer approval) {
+		this.approval = approval;
+	}
 	
 	
 }

+ 2 - 2
src/main/java/com/goafanti/order/controller/OrderInvoiceApiController.java

@@ -114,10 +114,10 @@ public class OrderInvoiceApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/approvalOrderInvoiceList",method = RequestMethod.GET)
-	public Result approvalOrderInvoiceList(Integer type,String orderDep,String orderNo ,String name,Integer pageNo,Integer pageSize){
+	public Result approvalOrderInvoiceList(Integer approval,Integer type,String orderDep,String orderNo ,String name,Integer pageNo,Integer pageSize){
 		Result res = new Result();
 		
-		res.data(orderInvoiceService.approvalOrderInvoiceList(type, orderDep, orderNo , name,pageNo,pageSize));
+		res.data(orderInvoiceService.approvalOrderInvoiceList(approval,type, orderDep, orderNo , name,pageNo,pageSize));
 		return res;
 	}
 	

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

@@ -36,7 +36,7 @@ public interface OrderInvoiceService {
 
 	int updatefinanceExamine(Integer id, Integer examine, String reason);
 
-	Pagination<TOrderInvoiceBo> approvalOrderInvoiceList(Integer type, String orderDep, String orderNo, String name, Integer pageNo,
+	Pagination<TOrderInvoiceBo> approvalOrderInvoiceList(Integer approval,Integer type, String orderDep, String orderNo, String name, Integer pageNo,
 			Integer pageSize);
 
 	int updateapprovalExamine(Integer id, Integer examine, String reason);

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

@@ -112,7 +112,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TOrderInvoiceBo> approvalOrderInvoiceList(Integer type, String orderDep, String orderNo, String name,
+	public Pagination<TOrderInvoiceBo> approvalOrderInvoiceList(Integer approval,Integer type, String orderDep, String orderNo, String name,
 			Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
@@ -120,6 +120,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		if(StringUtils.isNotBlank(orderDep))params.put("orderDep", orderDep);
 		if(StringUtils.isNotBlank(orderNo))params.put("orderNo", orderNo);
 		if(StringUtils.isNotBlank(name))params.put("name", name);
+		if(approval!=null)params.put("approval", approval);
 		if(type!=null)params.put("type", type);
 		if (type ==1) {
 			//如果是省外则直接查本部门

+ 4 - 4
src/main/resources/props/config_local.properties

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com/1.1.08
-#avatar.host=//sb.jishutao.com
+static.host=//sb.jishutao.com/1.1.09
+avatar.host=//sb.jishutao.com
 
 #连测试
-avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.08
+#avatar.host=//static.jishutao.com
+#static.host=//static.jishutao.com/1.1.09
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload