Parcourir la source

新增无限制公出列表

anderx il y a 1 an
Parent
commit
0274124b75

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

@@ -1052,8 +1052,20 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   </select>
 
   <sql id="selectOrderNewSql">
-    <if test="maxStatus !=null">
-      and toprc.max_status = #{maxStatus}
+    <if test="specially ==12">
+      <if test="maxStatus !=null">
+        and toprc.max_status = #{maxStatus}
+      </if>
+      <if test="manageType==0">
+        and toprc.max_process >= #{configType}
+        <if test="maxProcessStatus =0">
+          and toprc.max_process= #{configType}
+        </if>
+        <if test="maxProcessStatus =1">
+          and toprc.max_process > #{configType}
+          and toprc.max_process in (1,2,3,5)
+        </if>
+      </if>
     </if>
     <if test="specially ==7">
       and a.process_status > 5

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

@@ -25,10 +25,26 @@ public class InputOrderNewListBo {
     private Integer projectType;
     private Integer processStatus;
     private Integer tag;
+    /**
+     *  最大公出状态 0=未设置  1=已设置
+     */
     private Integer maxStatus;
+
+    /**
+     *  最大公出审核 0=未审核  1=已审核
+     */
+    private Integer maxProcessStatus;
     private  Integer pageNo;
     private Integer pageSize;
 
+    public Integer getMaxProcessStatus() {
+        return maxProcessStatus;
+    }
+
+    public void setMaxProcessStatus(Integer maxProcessStatus) {
+        this.maxProcessStatus = maxProcessStatus;
+    }
+
     public Integer getMaxStatus() {
         return maxStatus;
     }

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

@@ -327,7 +327,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 
 	/**
 	 * 		订单列表
-	 *  specially 0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询 6客服查询 7统计签单订单 8客户订单列表 9 复审订单 10 营销经理 11运营保障
+	 *  specially 0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询 6客服查询 7统计签单订单 8客户订单列表 9 复审订单 10 营销经理 11运营保障 12 公出最大值待审核
 	 *  distribution (咨询师管理列表 0 未分配 1部分 2全部
 	 *  amountStatus  0 10万元以下 1 10万~20万 2 20万~30万 3 30万~40万  4 40万以上
 	 * @return

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

@@ -150,6 +150,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	private TOrderApprovalMapper tOrderApprovalMapper;
 	@Autowired
 	private TOrderPublicReleaseCountMapper tOrderPublicReleaseCountMapper;
+	@Autowired
+	private PublicConfigMapper publicConfigMapper;
 
 
 	@Value(value = "${upload.path}")
@@ -1240,6 +1242,24 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			}else  {
 				params.put("manageType",0);
 			}
+		}else if (in.getSpecially()==12){
+			PublicConfig config=publicConfigMapper.queryById(1);
+			String aid=TokenManager.getAdminId();
+			int configType=9;
+			if (aid.equals(config.getTechAuditor())){
+				configType=1;
+			}else if (aid.equals(config.getFinanceAuditor())){
+				configType=2;
+			}else if (aid.equals(config.getOtherAuditor())){
+				configType=3;
+			}
+			params.put("configType", configType);
+			params.put("aid", aid);
+			if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)||TokenManager.hasRole(AFTConstants.SUPERADMIN)){
+				params.put("manageType",1);
+			}else  {
+				params.put("manageType",0);
+			}
 		}
 		params.put("specially", in.getSpecially());
 		if (StringUtils.isNotBlank(in.getName())) {