Explorar o código

咨询师管理员审核列表修改

anderx %!s(int64=2) %!d(string=hai) anos
pai
achega
e7193133eb

+ 19 - 16
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1038,7 +1038,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
         </if>
       </if>
   	<if test="specially == 4">
-  	and a.process_status in (5,6,7,99)
+      and a.process_status in (3,5,6,7,99)
   	and a.order_status  in(1,2,3,4,6)
   	</if>
     <if test="deps!=null">
@@ -1047,16 +1047,16 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
         #{dep}
       </foreach>
     </if>
-    <if test="distribution == 4">
+    <if test="distribution == 0">
       and a.process_status = 3
     </if>
-  	<if test="distribution == 0">
-  	and a.process_status &lt; 6
-  	</if>
   	<if test="distribution == 1">
-  	and a.process_status = 6
+  	and a.process_status = 5
   	</if>
   	<if test="distribution == 2">
+  	and a.process_status = 6
+  	</if>
+  	<if test="distribution == 3">
   	and a.process_status = 7
   	</if>
   	<if test="name != null">
@@ -1207,7 +1207,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
        </if>
      </if>
   	<if test="specially == 4">
-  	and a.process_status in (5,6,7,99)
+  	and a.process_status in (3,5,6,7,99)
   	and a.order_status  in(1,2,3,4,6)
   	</if>
      <if test="deps!=null">
@@ -1216,15 +1216,18 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
          #{dep}
        </foreach>
      </if>
-  	<if test="distribution == 0">
-  	and a.process_status &lt; 6
-  	</if>
-  	<if test="distribution == 1">
-  	and a.process_status = 6
-  	</if>
-  	<if test="distribution == 2">
-  	and a.process_status = 7
-  	</if>
+     <if test="distribution == 0">
+       and a.process_status = 3
+     </if>
+     <if test="distribution == 1">
+       and a.process_status = 5
+     </if>
+     <if test="distribution == 2">
+       and a.process_status = 6
+     </if>
+     <if test="distribution == 3">
+       and a.process_status = 7
+     </if>
   	<if test="name != null">
   	and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>

+ 0 - 1
src/main/java/com/goafanti/order/bo/InputOrderNewListBo.java

@@ -1,6 +1,5 @@
 package com.goafanti.order.bo;
 
-import java.util.List;
 
 public class InputOrderNewListBo {
     private String aid;

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

@@ -171,8 +171,8 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			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);
+				if (i==0) o.setMyExamine(1);
+				else o.setMyExamine(0);
 			}
 		}
 		Map<String, Object> count = tOrderNewMapper.countTotalAndActually(order,fids,listDep);
@@ -571,7 +571,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	private boolean judgeOrderExamine(String orderNo) {
 		tOrderExamineMapper.updateStatusByOrderNo(orderNo,TokenManager.getAdminId(),1);
 		List<TOrderExamine> tOrderExamines = tOrderExamineMapper.selectByOrderNo(orderNo);
-		int max = tOrderExamines.size()+1;
+		int max = tOrderExamines.size();
 		int yes=0;
 		for (TOrderExamine e : tOrderExamines) {
 			if (e.getStatus()==1){

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

@@ -52,7 +52,6 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.order.service.OrderNewService;
-import com.goafanti.order.service.OrderService;
 import com.goafanti.patent.service.PatentNewService;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -749,8 +748,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	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);
+			if (i==0) tOrder.setMyExamine(1);
+			else tOrder.setMyExamine(0);
 		}
 	}
 
@@ -801,12 +800,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		Pagination<TOrderNewBo> x = addParams(in, params);
 		if (x != null) return x;
 		Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, in.getPageNo(), in.getPageSize());
-		if (TokenManager.hasRole(AFTConstants.FINANCE)){
+		if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)){
 			List<TOrderNewBo> list = (List<TOrderNewBo>) p.getList();
 			for (TOrderNewBo o : list) {
 				int i = tOrderExamineMapper.selectByOrderNoAndAid(o.getOrderNo(), TokenManager.getAdminId());
-				if (i==0) o.setMyExamine(0);
-				else o.setMyExamine(1);
+				if (i==0) o.setMyExamine(1);
+				else o.setMyExamine(0);
 			}
 		}