瀏覽代碼

修改跳过的逻辑,修改审核列表查看通过的逻辑

anderx 1 月之前
父節點
當前提交
70ab3751c2

+ 10 - 1
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -714,7 +714,9 @@
         </if>
         <if test="type==1">
             left join admin_public_reviewer apr on a.aid=apr.aid
-            left join public_release_log prl on a.id=prl.prid and prl.aid=#{aid}
+            <if test="status==2">
+                left join public_release_log prl on a.id=prl.prid and prl.status=2
+            </if>
         </if>
         <if test="type==6">
             JOIN (
@@ -777,6 +779,13 @@
             <if test="statusType ==1">
                 and a.status in (0,1,2,4)
             </if>
+            <if test="stauts==0">
+                and a.status=0
+            </if>
+            <if test="status==1">
+                and a.status=1
+            </if>
+
         </if>
         <if test="type==1">
             and apr.reviewer_id = #{aid}

+ 9 - 4
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1234,7 +1234,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 							publicReleaseMapper.updateStatusByMainId(3,use.getId(),null,null);
 						}
 						addUserMidCount(id);
-						addpublicLog(id, status, "无需二级审核直接通过");
+						//添加审核日志,在当前时间加1秒作为显示
+						Date date1 = new Date();
+						date1.setTime(date1.getTime()+1000);
+						addpublicLog(id, 6, "无需二级审核直接通过",date1);
 					}else {
 						if(use.getProcessStatus()==0||use.getProcessStatus()==1){
 							//一级审核
@@ -1878,11 +1881,13 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		orderPublicReleaseLogMapper.insert(log);
 	}
 
-
+	private void addpublicLog(Integer id, Integer status, String remarks,Date date) {
+		PublicReleaseLog log = new PublicReleaseLog(id, TokenManager.getAdminId(), status, remarks, date);
+		publicReleaseLogMapper.insertSelective(log);
+	}
 
 	private void addpublicLog(Integer id, Integer status, String remarks) {
-		PublicReleaseLog log = new PublicReleaseLog(id, TokenManager.getAdminId(), status, remarks, new Date());
-		publicReleaseLogMapper.insertSelective(log);
+		addpublicLog(id, status, remarks,new Date());
 	}
 
 	@Override