Browse Source

新增无限制公出审核列表开发

anderx 1 year ago
parent
commit
9382ad011e

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

@@ -696,6 +696,9 @@
         <if test="type==1">
             left join admin_public_reviewer apr on a.aid=apr.aid
         </if>
+        <if test="type==7">
+            left join t_order_public_release_count opc on a.order_no=opc.order_no
+        </if>
         where 1=1
         <include refid="listPublicReleaseSql"/>
         ORDER BY (case when a.status=1 then 1 when a.status=2 then 2 when a.status=3 then 5
@@ -777,6 +780,9 @@
             where  pr.`type` =3 and apr.type = 1
             and apr.reviewer_id = #{aid})
         </if>
+        <if test="type==7">
+            and opc.max_process =#{configType}
+        </if>
         <if test="clockIn !=null">
             and a.clock_in =#{clockIn}
         </if>

+ 1 - 1
src/main/java/com/goafanti/weChat/bo/InputPublicReleaseList.java

@@ -5,7 +5,7 @@ public class InputPublicReleaseList {
 	private Integer pageSize;
 	private Integer pageNo;
 	/**
-	 * 查看类型 0我的公出 1公出审核 2管理员 3协单(技术财税总监看全部) 4 公出企业负责人审核 5 技术公出审核 6=协单审核
+	 * 查看类型 0我的公出 1公出审核 2管理员 3协单(技术财税总监看全部) 4 公出企业负责人审核 5 技术公出审核 6=协单审核 7=最大公出审核
 	 */
 	private Integer type;
 	private String clockTime;

+ 13 - 0
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -749,6 +749,19 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		Map<String,Object> map =new HashMap<String, Object>();
 		map.put("type", in.getType()==null?0:in.getType());
 		//先修改他人公出做测试
+		if (in.getType()==7){
+			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;
+			}
+			map.put("configType", configType);
+		}
 // 		if(in.getType()==4)map.put("type", 5);
 		if (in.getType()==3) {
 			in.setAssist(2);