设备采购 审批数据

src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -782,22 +782,90 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             ew2.eq("type", list.get(0).getType());
             List<ProcessSub> subList = processSubMapper.selectList(ew2);
             for (int j = 0; j < subList.size(); j++) {
-                for (int k = 0; k < list.size(); k++) {
-                    if (subList.get(j).getId().equals(list.get(k).getSubId())) {
-                        subList.get(j).setOperationTime(list.get(k).getOperationTime());
-                        subList.get(j).setSubData(list.get(k).getSubData());
-                        subList.get(j).setAuditId(list.get(k).getId());
+                for (int k = 0; k < sonList.size(); k++) {
+                    if (subList.get(j).getId().equals(sonList.get(k).getSubId())) {
+                        subList.get(j).setOperationTime(sonList.get(k).getOperationTime());
+                        subList.get(j).setSubData(sonList.get(k).getSubData());
+                        subList.get(j).setAuditId(sonList.get(k).getId());
                     }
                 }
             }
             map1.put("list", subList);//子表数据
+            
+          //审批流程信息
+            if(list.get(0).getType().equals("tf") || list.get(0).getType().equals("yjly") || list.get(0).getType().equals("yjcg")
+            		|| list.get(0).getType().equals("sbcg")){
+            	List<ProcessBasis> pbList = processBasisService.getBasisByType(list.get(0).getType(), null, list.get(0).getDepotId());
+                if(pbList.size()>0){
+                	if(pbList.get(0).getType().equals("tf") || pbList.get(0).getType().equals("yjly")){
+                   	 pbList.get(0).setAuditTime(list.get(0).getApplyTime());
+                        pbList.get(0).setContent(list.get(0).getApplyPeople());
+                        if (list.get(0).getAuditState().equals(0)) {
+                            //已申请，待第一个人审批
+                            pbList.get(1).setAuditState(0);
+                            pbList.get(1).setContent(list.get(0).getToPeople());
+                        } else {
+                            //已审批
+                            pbList.get(1).setContent(list.get(0).getToPeople());
+                            pbList.get(1).setAuditTime(list.get(0).getAuditTime());
+                            if ((int) list.get(0).getAuditState() >= 3) {
+                                pbList.get(1).setAuditState(1);
+                            } else if (list.size() > 1 && list.get(0).getAuditState().equals(2)) {//两次审批 第一次通过 第二次不通过 第一条数据的状态是最新的2 则展示通过
+                                pbList.get(1).setAuditState(1);
+                            } else {
+                                pbList.get(1).setAuditState(list.get(0).getAuditState());
+                            }
+                            if (list.size() > 1) {
+                                pbList.get(2).setContent(list.get(1).getToPeople());
+                                pbList.get(2).setAuditTime(list.get(1).getAuditTime());
+                                pbList.get(2).setAuditState(list.get(1).getAuditState());
+                            }
+                        }
+                   }else{
+                   	
+                   	//判断是否是通过
+                   	boolean flag = list.get(0).getAuditState().equals(2);
+                   	//保管员
+           			pbList.get(0).setAuditTime(list.get(0).getApplyTime());//保管员的时间为 申请时间
+           			pbList.get(0).setContent(list.get(0).getApplyPeople());//保管员为申请人
+                   	for (int j = 0; j < pbList.size(); j++) {
+                   		    if(j==0)continue;//保管员 不做处理
+                   		    //审批人
+                   		    ProcessBasis item = pbList.get(j);
+                   			if(j-1<=list.size()-1){
+                   				// 业务
+                   				ProcessAudit audit = list.get(j-1);
+                   				item.setAuditTime(audit.getAuditTime());
+                   				item.setContent(audit.getToPeople());
+                   				if(flag){//不通过
+                           			if(j-1==list.size()-1){
+                           				item.setAuditState(2);
+                           			}else{
+                           				item.setAuditState(1);
+                           			}
+                           		}else{
+                           			item.setAuditState(audit.getAuditState());
+                           		}
+                   				
+                   			}
+           			}
+                   	if(pbList.get(1).getAuditState().equals(4) || pbList.get(1).getAuditState().equals(3)){
+                   		pbList.get(1).setAuditState(1);
+                   	}
+                   	
+                   }
+                	map1.put("audit", pbList);
+                }
+            }
+            
             process.add(map1);
         }
         
         map.put("process", process);
 
         //审批流程信息
-        if(list.get(0).getType().equals("tf") || list.get(0).getType().equals("yjly") || list.get(0).getType().equals("yjcg")){
+        if(list.get(0).getType().equals("tf") || list.get(0).getType().equals("yjly") || list.get(0).getType().equals("yjcg")
+        		|| list.get(0).getType().equals("sbcg")){
         	List<ProcessBasis> pbList = processBasisService.getBasisByType(list.get(0).getType(), null, list.get(0).getDepotId());
             if(pbList.size()>0){
             	if(pbList.get(0).getType().equals("tf") || pbList.get(0).getType().equals("yjly")){