设备领用归还

src/main/java/com/unissoft/model/EnumProcessModel.java

@@ -11,7 +11,8 @@ public enum EnumProcessModel {
 	sswxys("设施维修预算"),
 	sbcg("设备采购"),
 	sbwx("设备维修"),
-	sblygh("设备领用归还"),
+	sbly("设备领用申请"),
+	sbgh("设备资产转移申请"),
 	sbbf("设备报废"),
 	sbtz("设备台账"),
 	sbdwgl("设备定位管理");

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

@@ -138,11 +138,14 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             	processAudit.setWorkName(EnumProcessModel.sbcg.getName());
             }else if(type.equals("sbwx")){
             	processAudit.setWorkName(EnumProcessModel.sbwx.getName());
-            }else if(type.equals("sblygh")){
-            	processAudit.setWorkName(EnumProcessModel.sblygh.getName());
+            }else if(type.equals("sbly")){
+            	processAudit.setWorkName(EnumProcessModel.sbly.getName());
+            }else if(type.equals("sbgh")){
+            	processAudit.setWorkName(EnumProcessModel.sbgh.getName());
             }else if(type.equals("sbbf")){
             	processAudit.setWorkName(EnumProcessModel.sbbf.getName());
             }
+            
 
             if(i == 0 ){
             	processAudit.setFromPeople(fromPeople);
@@ -227,9 +230,12 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         }else if(type.equals("sbwx")){
         	sysNoticeVO.setTitle(EnumProcessModel.sbwx.getName());
         	sysNoticeVO.setNoticeModule("sbwx");
-        }else if(type.equals("sblygh")){
-        	sysNoticeVO.setTitle(EnumProcessModel.sblygh.getName());
-        	sysNoticeVO.setNoticeModule("sblygh");
+        }else if(type.equals("sbly")){
+        	sysNoticeVO.setTitle(EnumProcessModel.sbly.getName());
+        	sysNoticeVO.setNoticeModule("sbly");
+        }else if(type.equals("sbgh")){
+        	sysNoticeVO.setTitle(EnumProcessModel.sbgh.getName());
+        	sysNoticeVO.setNoticeModule("sbgh");
         }else if(type.equals("sbbf")){
         	sysNoticeVO.setTitle(EnumProcessModel.sbbf.getName());
         	sysNoticeVO.setNoticeModule("sbbf");
@@ -505,9 +511,12 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
          }else if(processAudit.getType().equals("sbwx")){
         	 sysNoticeVO.setTitle(EnumProcessModel.sbwx.getName());
           	 sysNoticeVO.setNoticeModule("sbwx");
-         }else if(processAudit.getType().equals("sblygh")){
-        	 sysNoticeVO.setTitle(EnumProcessModel.sblygh.getName());
-          	 sysNoticeVO.setNoticeModule("sblygh");
+         }else if(processAudit.getType().equals("sbly")){
+        	 sysNoticeVO.setTitle(EnumProcessModel.sbly.getName());
+          	 sysNoticeVO.setNoticeModule("sbly");
+         }else if(processAudit.getType().equals("sbgh")){
+        	 sysNoticeVO.setTitle(EnumProcessModel.sbgh.getName());
+          	 sysNoticeVO.setNoticeModule("sbgh");
          }else if(processAudit.getType().equals("sbbf")){
         	 sysNoticeVO.setTitle(EnumProcessModel.sbbf.getName());
           	 sysNoticeVO.setNoticeModule("sbbf");
@@ -622,6 +631,12 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                     	 processAudit1.setWorkName(EnumProcessModel.sbcg.getName());
                      }else if(processAudit.getType().equals("sbwx")){
                     	 processAudit1.setWorkName(EnumProcessModel.sbwx.getName());
+                     }else if(processAudit.getType().equals("sbbf")){
+                    	 processAudit1.setWorkName(EnumProcessModel.sbbf.getName());
+                     }else if(processAudit.getType().equals("sbly")){
+                    	 processAudit1.setWorkName(EnumProcessModel.sbly.getName());
+                     }else if(processAudit.getType().equals("sbgh")){
+                    	 processAudit1.setWorkName(EnumProcessModel.sbgh.getName());
                      }
                      processAuditMapper.insert(processAudit1);
                      
@@ -769,7 +784,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         
         if(list.size()>0 && (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("sbly") || list.get(0).getType().equals("sbgh"))){
             if(list.size()>0){
             	 depot = list.get(0).getDepotId();
                  ongoingStep = Integer.valueOf(list.get(0).getOngoingStep());
@@ -805,7 +820,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             	ew1.eq("type", "xz");
             }else if(list.get(0).getType().equals("sswxjh") || list.get(0).getType().equals("sswxys")){
             	ew1.eq("type", "sswx");
-            }else if(list.get(0).getType().equals("sblygh")){
+            }else if(list.get(0).getType().equals("sbly") || list.get(0).getType().equals("sbgh")){
             	ew1.eq("type", "sbly");
             }else{
             	ew1.eq("type", list.get(0).getType());
@@ -843,7 +858,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 map1.put("list", subList);//子表数据
                 if(list.size()>0 && (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("sbly") || list.get(0).getType().equals("sbgh"))){
                     //审批人数据
                     if(mainList.get(i).getExistProcess().equals(0)){
                     	if(auditFirst){