Procházet zdrojové kódy

协单统计修改成只查看已审核的数据

anderx před 1 týdnem
rodič
revize
7f4f090db1

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

@@ -1308,7 +1308,7 @@
         from public_release a left join public_release_details b on a.id =b.prid
         from public_release a left join public_release_details b on a.id =b.prid
         left join public_assist_details c on a.id =c.prid
         left join public_assist_details c on a.id =c.prid
         left join user_mid d on b.uid =d.uid
         left join user_mid d on b.uid =d.uid
-        where a.assist =1
+        where a.assist =1 and a.status =2
         <include refid="findAssistListSql"/>
         <include refid="findAssistListSql"/>
         order by a.release_start desc
         order by a.release_start desc
         <if test="page_sql != null">
         <if test="page_sql != null">
@@ -1370,7 +1370,7 @@
     from public_release a left join public_release_details b on a.id =b.prid
     from public_release a left join public_release_details b on a.id =b.prid
     left join public_assist_details c on a.id =c.prid
     left join public_assist_details c on a.id =c.prid
     left join user_mid d on b.uid =d.uid
     left join user_mid d on b.uid =d.uid
-    where a.assist =1
+        where a.assist =1 and a.status =2
     <include refid="findAssistListSql"/>
     <include refid="findAssistListSql"/>
     </select>
     </select>
 </mapper>
 </mapper>

+ 1 - 2
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -2628,8 +2628,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					str.append(e.getReviewerName()+",");
 					str.append(e.getReviewerName()+",");
 				}
 				}
 				//业务公出且协单部分审核(看着流程有点问题)
 				//业务公出且协单部分审核(看着流程有点问题)
-			}else if ((out.getType()==0||out.getType()==5)
-					&& out.getAssistProcess()==2){
+			}else if (out.getType()==0&& out.getAssistProcess()==2){
 				//获取技术协单
 				//获取技术协单
 				List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(out.getId(), null, null);
 				List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(out.getId(), null, null);
 				List<String> names=new ArrayList<>();
 				List<String> names=new ArrayList<>();