数据格式更改

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

@@ -793,8 +793,6 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         }
         
         
-        
-        
         boolean auditFirst = true; 
         List<ProcessMain> mainList = processMainMapper.selectList(ew1);
         if(mainList.size()>0){
@@ -823,9 +821,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 map1.put("list", subList);//子表数据
                 if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")
                 		|| list.get(0).getType().equals("sswxjh") || list.get(0).getType().equals("sswxys")
-                		|| list.get(0).getType().equals("sbly") || list.get(0).getType().equals("sblygh")
-                		|| list.get(0).getType().equals("sbwx")){
-                	
+                		|| list.get(0).getType().equals("sbly") || list.get(0).getType().equals("sblygh")){
                     //审批人数据
                     if(mainList.get(i).getExistProcess().equals(0)){
                     	if(auditFirst){
@@ -836,6 +832,43 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                     		
                     	}
                     }
+                }else{
+                	//审批数据
+                	if(mainList.get(i).getExistProcess().equals(0)){
+                    	List<ProcessBasis> pbList = processBasisService.getBasisByType(list.get(0).getType(), null, list.get(0).getDepotId());
+                    	if(pbList.size()>0){
+                    		//判断是否是通过
+                           	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);