gaodd лет назад: 4
Родитель
Сommit
0d0d0a8d8c
1 измененных файлов с 19 добавлено и 17 удалено
  1. 19 17
      src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

+ 19 - 17
src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -767,9 +767,9 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
767
         int depot = 0;
767
         int depot = 0;
768
         int ongoingStep = 0;
768
         int ongoingStep = 0;
769
         
769
         
770
-        if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq") || 
770
+        if(list.size()>0 && (list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq") || 
771
         		list.get(0).getType().equals("sswxjh") || list.get(0).getType().equals("sswxys") ||
771
         		list.get(0).getType().equals("sswxjh") || list.get(0).getType().equals("sswxys") ||
772
-        		list.get(0).getType().equals("sbly") || list.get(0).getType().equals("sblygh")){
772
+        		list.get(0).getType().equals("sbly") || list.get(0).getType().equals("sblygh"))){
773
             if(list.size()>0){
773
             if(list.size()>0){
774
             	 depot = list.get(0).getDepotId();
774
             	 depot = list.get(0).getDepotId();
775
                  ongoingStep = Integer.valueOf(list.get(0).getOngoingStep());
775
                  ongoingStep = Integer.valueOf(list.get(0).getOngoingStep());
@@ -800,14 +800,16 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
800
         //流程基础数据
800
         //流程基础数据
801
         List<Map<String, Object>> process = new ArrayList<>();
801
         List<Map<String, Object>> process = new ArrayList<>();
802
         QueryWrapper<ProcessMain> ew1 = new QueryWrapper<>();
802
         QueryWrapper<ProcessMain> ew1 = new QueryWrapper<>();
803
-        if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")){
804
-        	ew1.eq("type", "xz");
805
-        }else if(list.get(0).getType().equals("sswxjh") || list.get(0).getType().equals("sswxys")){
806
-        	ew1.eq("type", "sswx");
807
-        }else if(list.get(0).getType().equals("sblygh")){
808
-        	ew1.eq("type", "sbly");
809
-        }else{
810
-        	ew1.eq("type", list.get(0).getType());
803
+        if(list.size()>0){
804
+        	if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")){
805
+            	ew1.eq("type", "xz");
806
+            }else if(list.get(0).getType().equals("sswxjh") || list.get(0).getType().equals("sswxys")){
807
+            	ew1.eq("type", "sswx");
808
+            }else if(list.get(0).getType().equals("sblygh")){
809
+            	ew1.eq("type", "sbly");
810
+            }else{
811
+            	ew1.eq("type", list.get(0).getType());
812
+            }
811
         }
813
         }
812
         
814
         
813
         
815
         
@@ -837,9 +839,9 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
837
                 HashMap<String, Object> map1 = Maps.newHashMap();
839
                 HashMap<String, Object> map1 = Maps.newHashMap();
838
                 map1.put("step", mainList.get(i));//主表数据
840
                 map1.put("step", mainList.get(i));//主表数据
839
                 map1.put("list", subList);//子表数据
841
                 map1.put("list", subList);//子表数据
840
-                if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")
842
+                if(list.size()>0 && (list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")
841
                 		|| list.get(0).getType().equals("sswxjh") || list.get(0).getType().equals("sswxys")
843
                 		|| list.get(0).getType().equals("sswxjh") || list.get(0).getType().equals("sswxys")
842
-                		|| list.get(0).getType().equals("sbly") || list.get(0).getType().equals("sblygh")){
844
+                		|| list.get(0).getType().equals("sbly") || list.get(0).getType().equals("sblygh"))){
843
                     //审批人数据
845
                     //审批人数据
844
                     if(mainList.get(i).getExistProcess().equals(0)){
846
                     if(mainList.get(i).getExistProcess().equals(0)){
845
                     	if(auditFirst){
847
                     	if(auditFirst){
@@ -852,7 +854,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
852
                     }
854
                     }
853
                 }else{
855
                 }else{
854
                 	//审批数据
856
                 	//审批数据
855
-                	if(mainList.get(i).getExistProcess().equals(0)){
857
+                	if(mainList.get(i).getExistProcess().equals(0) && list.size()>0){
856
                     	List<ProcessBasis> pbList = processBasisService.getBasisByType(list.get(0).getType(), null, list.get(0).getDepotId());
858
                     	List<ProcessBasis> pbList = processBasisService.getBasisByType(list.get(0).getType(), null, list.get(0).getDepotId());
857
                     	if(pbList.size()>0){
859
                     	if(pbList.size()>0){
858
                     		//判断是否是通过
860
                     		//判断是否是通过
@@ -908,8 +910,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
908
             map1.put("list", subList);//子表数据
910
             map1.put("list", subList);//子表数据
909
             
911
             
910
           //审批流程信息
912
           //审批流程信息
911
-            if(list.get(0).getType().equals("tf") || list.get(0).getType().equals("yjly") || list.get(0).getType().equals("yjcg")
912
-            		|| list.get(0).getType().equals("sbcg")){
913
+            if(list.size()>0 && (list.get(0).getType().equals("tf") || list.get(0).getType().equals("yjly") || list.get(0).getType().equals("yjcg")
914
+            		|| list.get(0).getType().equals("sbcg"))){
913
             	List<ProcessBasis> pbList = processBasisService.getBasisByType(list.get(0).getType(), null, list.get(0).getDepotId());
915
             	List<ProcessBasis> pbList = processBasisService.getBasisByType(list.get(0).getType(), null, list.get(0).getDepotId());
914
                 if(pbList.size()>0){
916
                 if(pbList.size()>0){
915
                 	if(pbList.get(0).getType().equals("tf") || pbList.get(0).getType().equals("yjly")){
917
                 	if(pbList.get(0).getType().equals("tf") || pbList.get(0).getType().equals("yjly")){
@@ -979,8 +981,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
979
         map.put("process", process);
981
         map.put("process", process);
980
 
982
 
981
         //审批流程信息
983
         //审批流程信息
982
-        if(list.get(0).getType().equals("tf") || list.get(0).getType().equals("yjly") || list.get(0).getType().equals("yjcg")
983
-        		|| list.get(0).getType().equals("sbcg")){
984
+        if(list.size()>0 && (list.get(0).getType().equals("tf") || list.get(0).getType().equals("yjly") || list.get(0).getType().equals("yjcg")
985
+        		|| list.get(0).getType().equals("sbcg"))){
984
         	List<ProcessBasis> pbList = processBasisService.getBasisByType(list.get(0).getType(), null, list.get(0).getDepotId());
986
         	List<ProcessBasis> pbList = processBasisService.getBasisByType(list.get(0).getType(), null, list.get(0).getDepotId());
985
             if(pbList.size()>0){
987
             if(pbList.size()>0){
986
             	if(pbList.get(0).getType().equals("tf") || pbList.get(0).getType().equals("yjly")){
988
             	if(pbList.get(0).getType().equals("tf") || pbList.get(0).getType().equals("yjly")){