|
@@ -823,7 +823,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
|
|
823
|
map1.put("list", subList);//子表数据
|
823
|
map1.put("list", subList);//子表数据
|
|
824
|
if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")
|
824
|
if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")
|
|
825
|
|| list.get(0).getType().equals("sswxjh") || list.get(0).getType().equals("sswxys")
|
825
|
|| list.get(0).getType().equals("sswxjh") || list.get(0).getType().equals("sswxys")
|
|
826
|
- || list.get(0).getType().equals("sbly") || list.get(0).getType().equals("sblygh")){
|
|
|
|
|
|
826
|
+ || list.get(0).getType().equals("sbly") || list.get(0).getType().equals("sblygh")
|
|
|
|
827
|
+ || list.get(0).getType().equals("sbwx")){
|
|
827
|
|
828
|
|
|
828
|
//审批人数据
|
829
|
//审批人数据
|
|
829
|
if(mainList.get(i).getExistProcess().equals(0)){
|
830
|
if(mainList.get(i).getExistProcess().equals(0)){
|
|
@@ -857,7 +858,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
|
|
857
|
|
858
|
|
|
858
|
//审批流程信息
|
859
|
//审批流程信息
|
|
859
|
if(list.get(0).getType().equals("tf") || list.get(0).getType().equals("yjly") || list.get(0).getType().equals("yjcg")
|
860
|
if(list.get(0).getType().equals("tf") || list.get(0).getType().equals("yjly") || list.get(0).getType().equals("yjcg")
|
|
860
|
- || list.get(0).getType().equals("sbcg") || list.get(0).getType().equals("sbwx")){
|
|
|
|
|
|
861
|
+ || list.get(0).getType().equals("sbcg")){
|
|
861
|
List<ProcessBasis> pbList = processBasisService.getBasisByType(list.get(0).getType(), null, list.get(0).getDepotId());
|
862
|
List<ProcessBasis> pbList = processBasisService.getBasisByType(list.get(0).getType(), null, list.get(0).getDepotId());
|
|
862
|
if(pbList.size()>0){
|
863
|
if(pbList.size()>0){
|
|
863
|
if(pbList.get(0).getType().equals("tf") || pbList.get(0).getType().equals("yjly")){
|
864
|
if(pbList.get(0).getType().equals("tf") || pbList.get(0).getType().equals("yjly")){
|
|
@@ -928,7 +929,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
|
|
928
|
|
929
|
|
|
929
|
//审批流程信息
|
930
|
//审批流程信息
|
|
930
|
if(list.get(0).getType().equals("tf") || list.get(0).getType().equals("yjly") || list.get(0).getType().equals("yjcg")
|
931
|
if(list.get(0).getType().equals("tf") || list.get(0).getType().equals("yjly") || list.get(0).getType().equals("yjcg")
|
|
931
|
- || list.get(0).getType().equals("sbcg") ||list.get(0).getType().equals("sbwx")){
|
|
|
|
|
|
932
|
+ || list.get(0).getType().equals("sbcg")){
|
|
932
|
List<ProcessBasis> pbList = processBasisService.getBasisByType(list.get(0).getType(), null, list.get(0).getDepotId());
|
933
|
List<ProcessBasis> pbList = processBasisService.getBasisByType(list.get(0).getType(), null, list.get(0).getDepotId());
|
|
933
|
if(pbList.size()>0){
|
934
|
if(pbList.size()>0){
|
|
934
|
if(pbList.get(0).getType().equals("tf") || pbList.get(0).getType().equals("yjly")){
|
935
|
if(pbList.get(0).getType().equals("tf") || pbList.get(0).getType().equals("yjly")){
|