设备台账

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

@@ -12,7 +12,9 @@ public enum EnumProcessModel {
 	sbcg("设备采购"),
 	sbwx("设备维修"),
 	sblygh("设备领用归还"),
-	sbbf("设备报废");
+	sbbf("设备报废"),
+	sbtz("设备台账"),
+	sbdwgl("设备定位管理");
 	
 	private String name;
 

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

@@ -11,6 +11,7 @@ import com.unissoft.dto.ProcessToBeDone;
 import com.unissoft.dto.SendNoticeVO;
 import com.unissoft.dto.SysNoticeVO;
 import com.unissoft.dto.ToBeDoneCallbackVO;
+import com.unissoft.equipmentStroe.service.EquipmentStroeService;
 import com.unissoft.feign.MessageFeign;
 import com.unissoft.feign.SystemFeign;
 import com.unissoft.mapper.*;
@@ -69,6 +70,9 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 
     @Autowired
     private RestTemplate restTemplate;
+    
+    @Autowired
+    private EquipmentStroeService quipmentStroeServicee;
 
 
     @Override
@@ -175,6 +179,16 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 processAudit.setProcessId(uuId); //多条数据时，流程标识取第一条的
             }
             processAuditMapper.insert(processAudit);
+            if(type.equals("sbwx") || type.equals("sbbf")){
+            	//修改器材库的状态
+            	EquipmentStroe entity = new EquipmentStroe();
+            	if(type.equals("sbwx")){
+            		entity.setState(1);
+            	}else if(type.equals("sbbf")){
+            		entity.setState(2);
+            	}
+            	quipmentStroeServicee.updateById(entity);
+            }
         }
         
         /*
@@ -279,23 +293,25 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             
             if("" != equipmentId+""){
             	ew.eq("equipment_id", equipmentId);
-            }
-            if (StringUtils.isNotBlank(object.optString("type"))) {
-            	if(object.optString("type").equals("xz") || object.optString("type").equals("sswx") || object.optString("type").equals("sbly")){
-            		ew.like("type",object.optString("type"));
-            		ew.eq("result", 1);//取第一条数据
-            	}else{
-            		ew.eq("type", object.optString("type"));
-                    if(object.optString("type").equals("yjbg")){//药剂保管
-                    	ew.eq("result", 2);//药剂保管d第一条数据
-                    }else{
-                    	ew.eq("result", 1);//取第一条数据
-                    }
-            	}
-            	
             }else{
-            	ew.eq("result", 1);//取第一条数据
+            	if (StringUtils.isNotBlank(object.optString("type"))) {
+                	if(object.optString("type").equals("xz") || object.optString("type").equals("sswx") || object.optString("type").equals("sbly")){
+                		ew.like("type",object.optString("type"));
+                		ew.eq("result", 1);//取第一条数据
+                	}else{
+                		ew.eq("type", object.optString("type"));
+                        if(object.optString("type").equals("yjbg")){//药剂保管
+                        	ew.eq("result", 2);//药剂保管d第一条数据
+                        }else{
+                        	ew.eq("result", 1);//取第一条数据
+                        }
+                	}
+                	
+                }else{
+                	ew.eq("result", 1);//取第一条数据
+                }
             }
+            
             if (StringUtils.isNotBlank(object.optString("houseId"))) {
                 ew.eq("house_id", object.optString("houseId"));
             }
@@ -1699,6 +1715,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         Integer depotId = jsStr.optInt("depotId");//库id
         Integer auditState = jsStr.optInt("auditState");//状态
         JSONArray jsonArray = jsStr.optJSONArray("subList");//子流程数据
+        Integer equipmentId = jsStr.optInt("equipmentId");//状态
+        String equipmentNameCode = jsStr.optString("equipmentNameCode");//状态
         JSONObject row = null;
         for (int i = 0; i < jsonArray.length(); i++) {
             row = jsonArray.getJSONObject(i);
@@ -1734,6 +1752,11 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             }else{//第一次新增
             	//第一条数据新增
                 ProcessAudit processAudit = new ProcessAudit();
+                if(type.equals("sbtz")){
+                	processAudit.setWorkName(EnumProcessModel.sbtz.getName());
+                }else if(type.equals("sbdwgl")){
+                	processAudit.setWorkName(EnumProcessModel.sbdwgl.getName());
+                }
                 processAudit.setType(type);
                 processAudit.setSubData(subData);
                 processAudit.setSubId(subId);
@@ -1746,6 +1769,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                 String dateString = formatter.format(date);
                 processAudit.setApplyTime(dateString);
+                processAudit.setEquipmentId(equipmentId);
+                processAudit.setEquipmentNameCode(equipmentNameCode);
                 processAuditMapper.insert(processAudit);
             }