|  | @@ -415,15 +415,23 @@
 | 
											
												
													
														|  |      <select id="getAccountDailyProduceAuditCount"
 |  |      <select id="getAccountDailyProduceAuditCount"
 | 
											
												
													
														|  |              resultType="com.tzld.longarticle.recommend.server.model.vo.DailyAuditProduceExport">
 |  |              resultType="com.tzld.longarticle.recommend.server.model.vo.DailyAuditProduceExport">
 | 
											
												
													
														|  |          select audit.audit_account as name, audit.cnt as auditCount, auditPass.cnt as auditPassCount
 |  |          select audit.audit_account as name, audit.cnt as auditCount, auditPass.cnt as auditPassCount
 | 
											
												
													
														|  | -        from (select audit_account, count(1) as cnt
 |  | 
 | 
											
												
													
														|  | -              from produce_plan_exe_record
 |  | 
 | 
											
												
													
														|  | -              where audit_timestamp between #{startTimeStamp} and #{endTimeStamp}
 |  | 
 | 
											
												
													
														|  | -              group by audit_account) audit
 |  | 
 | 
											
												
													
														|  | -        left join (select audit_account, count(1) as cnt
 |  | 
 | 
											
												
													
														|  | -                from produce_plan_exe_record
 |  | 
 | 
											
												
													
														|  | -                where audit_timestamp between #{startTimeStamp} and #{endTimeStamp}
 |  | 
 | 
											
												
													
														|  | -                  and audit_status in (1, 4, 5, 6)
 |  | 
 | 
											
												
													
														|  | -                group by audit_account) auditPass
 |  | 
 | 
											
												
													
														|  | 
 |  | +        from (select prr.review_account as audit_account, count(1) as cnt
 | 
											
												
													
														|  | 
 |  | +              from produce_review_record prr
 | 
											
												
													
														|  | 
 |  | +               join produce_plan_exe_record pper on prr.plan_exe_id = pper.plan_exe_id
 | 
											
												
													
														|  | 
 |  | +               join produce_plan plan on pper.plan_id = plan.id
 | 
											
												
													
														|  | 
 |  | +              where plan.produce_modal = 3
 | 
											
												
													
														|  | 
 |  | +                and prr.review_type = 3
 | 
											
												
													
														|  | 
 |  | +                and prr.review_timestamp between #{startTimeStamp} and #{endTimeStamp}
 | 
											
												
													
														|  | 
 |  | +              GROUP BY prr.review_account) audit
 | 
											
												
													
														|  | 
 |  | +        left join (select prr.review_account as audit_account, count(1) as cnt
 | 
											
												
													
														|  | 
 |  | +                   from produce_review_record prr
 | 
											
												
													
														|  | 
 |  | +                    join produce_plan_exe_record pper on prr.plan_exe_id = pper.plan_exe_id
 | 
											
												
													
														|  | 
 |  | +                    join produce_plan plan on pper.plan_id = plan.id
 | 
											
												
													
														|  | 
 |  | +                   where plan.produce_modal = 3
 | 
											
												
													
														|  | 
 |  | +                     and prr.review_type = 3
 | 
											
												
													
														|  | 
 |  | +                     and prr.review_timestamp between #{startTimeStamp} and #{endTimeStamp}
 | 
											
												
													
														|  | 
 |  | +                     and prr.review_status = 1
 | 
											
												
													
														|  | 
 |  | +                   GROUP BY prr.review_account) auditPass
 | 
											
												
													
														|  |          on audit.audit_account = auditPass.audit_account
 |  |          on audit.audit_account = auditPass.audit_account
 | 
											
												
													
														|  |          where audit.audit_account != 'wangyunpeng'
 |  |          where audit.audit_account != 'wangyunpeng'
 | 
											
												
													
														|  |      </select>
 |  |      </select>
 |