Merge remote-tracking branch 'origin/master'

src/main/java/com/unissoft/equipmentStroe/controller/EquipmentStroeController.java

@@ -29,7 +29,7 @@ public class EquipmentStroeController {
 
     @ApiOperation(value = "分页条件查询",
             notes = "提交参数：{\"pageIndex\":1,\"pageSize\":10,\"," +
-                    "\"condition\":\"{'table_name':'grain_condition_record'," +
+                    "\"condition\":\"{'table_name':'equipment_stroe'," +
                     "'field_name':'check_list'\"}")
     @PostMapping("/authority/getPage")
     public ResultView getPage(@RequestBody PageParam pageParam) {

src/main/java/com/unissoft/equipmentStroe/service/impl/EquipmentStroeServiceImpl.java

@@ -40,6 +40,7 @@ public class EquipmentStroeServiceImpl extends ServiceImpl<EquipmentStroeMapper,
             String equipmentNameCode = object.optString("equipment_name_code").trim();
             String standardsType = object.optString("standards_type").trim();
             String arrivalTime = object.optString("arrival_time").trim();
+            String state = object.optString("state").trim();
             if (!StringUtils.isEmpty(depotId)) {
                 ew.eq("depot_id", depotId);
             }
@@ -55,6 +56,9 @@ public class EquipmentStroeServiceImpl extends ServiceImpl<EquipmentStroeMapper,
             if (!StringUtils.isEmpty(standardsType)) {
                 ew.eq("standards_type", standardsType);
             }
+            if (!StringUtils.isEmpty(state)) {
+                ew.eq("state", state);
+            }
         }
         ew.orderByDesc("arrival_time");
         Page page = new Page();

src/main/java/com/unissoft/mapper/EquipmentStroeMapper.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- *  Mapper 接口
+ * 器材库 Mapper 接口
  * </p>
  *
- * @author root
- * @since 2020-12-15
+ * @author My sunShine
+ * @since 2021-04-15
  */
 public interface EquipmentStroeMapper extends BaseMapper<EquipmentStroe> {
 

src/main/java/com/unissoft/mapper/EquipmentStroeMapper.xml

@@ -18,11 +18,13 @@
         <result column="management" property="management" />
         <result column="leave_time" property="leaveTime" />
         <result column="enterprise_name" property="enterpriseName" />
+        <result column="registrant" property="registrant" />
+        <result column="state" property="state" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, depot_id, equipment_category, equipment_category_name, equipment_name_code, equipment_name, standards_type, manufacturer, asset_number, equipment_number, arrival_time, management, leave_time, enterprise_name
+        id, depot_id, equipment_category, equipment_category_name, equipment_name_code, equipment_name, standards_type, manufacturer, asset_number, equipment_number, arrival_time, management, leave_time, enterprise_name, registrant, state
     </sql>
 
 </mapper>

src/main/java/com/unissoft/mapper/ProcessAuditMapper.java

@@ -12,11 +12,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author My sunShine
- * @since 2021-04-06
+ * @since 2021-04-15
  */
 public interface ProcessAuditMapper extends BaseMapper<ProcessAudit> {
 
-	 List<ProcessAudit> getToBeDone(List<Integer> list);
+	List<ProcessAudit> getToBeDone(List<Integer> list);
 
-	 List<ProcessAudit> getCurrentMonthData();
+	List<ProcessAudit> getCurrentMonthData();
 }

src/main/java/com/unissoft/mapper/ProcessAuditMapper.xml

@@ -26,14 +26,17 @@
         <result column="start_date" property="startDate" />
         <result column="end_date" property="endDate" />
         <result column="to_page" property="toPage" />
+        <result column="equipment_name_code" property="equipmentNameCode" />
+        <result column="equipment_id" property="equipmentId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, main_id, sub_id, sub_data, audit_state, operation_time, type, house_id, depot_id, from_people, to_people, result, apply_people, audit_time, process_id, ongoing_step, is_audit, apply_time, work_name, start_date, end_date, to_page
+        id, main_id, sub_id, sub_data, audit_state, operation_time, type, house_id, depot_id, from_people, to_people, result, apply_people, audit_time, process_id, ongoing_step, is_audit, apply_time, work_name, start_date, end_date, to_page, equipment_name_code, equipment_id
     </sql>
     
-     <select id="getToBeDone" parameterType="list" resultType="com.unissoft.model.ProcessAudit">
+    
+    <select id="getToBeDone" parameterType="list" resultType="com.unissoft.model.ProcessAudit">
         select
         <include refid="Base_Column_List"/>
         from process_audit pa

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

@@ -9,7 +9,13 @@ public enum EnumProcessModel {
 	xzjh("熏蒸计划申请"),
 	sswxjh("设施维修计划"),
 	sswxys("设施维修预算"),
-	sbcg("设备采购");
+	sbcg("设备采购"),
+	sbwx("设备维修"),
+	sbly("设备领用申请"),
+	sbgh("设备资产转移申请"),
+	sbbf("设备报废"),
+	sbtz("设备台账"),
+	sbdwgl("设备定位管理");
 	
 	private String name;
 

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

@@ -1,25 +1,24 @@
 package com.unissoft.model;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
  * <p>
- * 
+ * 器材库
  * </p>
  *
- * @author root
- * @since 2020-12-15
+ * @author My sunShine
+ * @since 2021-04-15
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -29,7 +28,7 @@ public class EquipmentStroe implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "主键")
+    @ApiModelProperty(value = "器材库id")
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
@@ -37,7 +36,7 @@ public class EquipmentStroe implements Serializable {
     @TableField("depot_id")
     private Integer depotId;
 
-    @ApiModelProperty(value = "设备类别code")
+    @ApiModelProperty(value = "设备类别")
     @TableField("equipment_category")
     private String equipmentCategory;
 
@@ -71,7 +70,6 @@ public class EquipmentStroe implements Serializable {
 
     @ApiModelProperty(value = "到库时间")
     @TableField("arrival_time")
-//    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date arrivalTime;
 
@@ -90,6 +88,11 @@ public class EquipmentStroe implements Serializable {
 
     @ApiModelProperty(value = "登记人")
     @TableField("registrant")
-    private String egistrant;
+    private String registrant;
+
+    @ApiModelProperty(value = "该设备的状态(0:正常使用1:维修2:报废)")
+    @TableField("state")
+    private Integer state;
+
 
 }

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

@@ -18,7 +18,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author My sunShine
- * @since 2021-04-06
+ * @since 2021-04-15
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -151,21 +151,28 @@ public class ProcessAudit implements Serializable {
     @TableField("work_name")
     private String workName;
 
-    
     @ApiModelProperty(value = "办理开始时间")
-    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm",timezone="GMT+8")
     @TableField("start_date")
+    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm",timezone="GMT+8")
     private Date startDate;
 
     @ApiModelProperty(value = "办理结束时间")
-    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm",timezone="GMT+8")
     @TableField("end_date")
+    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm",timezone="GMT+8")
     private Date endDate;
 
     @ApiModelProperty(value = "办理页面url")
     @TableField("to_page")
     private String toPage;
 
+    @ApiModelProperty(value = "设备名称code")
+    @TableField("equipment_name_code")
+    private String equipmentNameCode;
+
+    @ApiModelProperty(value = "器材库的id")
+    @TableField("equipment_id")
+    private Integer equipmentId;
+
 
 
 
@@ -345,8 +352,22 @@ public class ProcessAudit implements Serializable {
 	public void setToPage(String toPage) {
 		this.toPage = toPage;
 	}
-    
-    
+
+	public String getEquipmentNameCode() {
+		return equipmentNameCode;
+	}
+
+	public void setEquipmentNameCode(String equipmentNameCode) {
+		this.equipmentNameCode = equipmentNameCode;
+	}
+
+	public Integer getEquipmentId() {
+		return equipmentId;
+	}
+
+	public void setEquipmentId(Integer equipmentId) {
+		this.equipmentId = equipmentId;
+	}
 
 
 }

src/main/java/com/unissoft/ventilation/controller/ProcessAuditController.java

@@ -51,7 +51,7 @@ public class ProcessAuditController {
 	/**
 	 * 机械通风列表
 	 */
-    @ApiOperation(value = "分页条件查询", notes = "提交参数(type、houseId、depotId必填,没有houseId的就不填)：{\"pageIndex\":1,\"pageSize\":10,  \"condition\":\"{\'type\':\'\',\'depotId\':\'\',\'houseId\':\'\',\'startTime\':\'\',\'endTime\':\'\'}\"}")
+    @ApiOperation(value = "分页条件查询", notes = "提交参数(type、houseId、depotId必填,没有houseId的就不填)：{\"pageIndex\":1,\"pageSize\":10,  \"condition\":\"{\'equipmentId\':\'\',\'type\':\'\',\'depotId\':\'\',\'houseId\':\'\',\'startTime\':\'\',\'endTime\':\'\'}\"}")
     @PostMapping("/getPage")
     public ResultView getPage(@RequestBody PageParam pageParam) throws Exception{
     	Page<ProcessAudit> page = processAuditService.getPage(pageParam);
@@ -63,12 +63,12 @@ public class ProcessAuditController {
      * @param id
      * @return
      */
-    @ApiOperation(value = "根据id和审批状态查询", notes = "")
+    /*@ApiOperation(value = "根据id和审批状态查询", notes = "")
     @GetMapping("/getById/{id}")
     public ResultView getById(@PathVariable Integer id) {
     	List<Map<String,Object>> list = processAuditService.getAllById(id);
         return ResultView.success(list);
-    }
+    }*/
     
     
     /**

src/main/java/com/unissoft/ventilation/controller/ProcessMainController.java

@@ -1,6 +1,8 @@
 package com.unissoft.ventilation.controller;
 
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -11,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import com.unissoft.model.ProcessSub;
 import com.unissoft.result.ResultView;
 import com.unissoft.ventilation.service.ProcessMainService;
 
@@ -35,7 +38,7 @@ public class ProcessMainController {
 	
 	
 	/**
-	 * 获取所有主流程和子流程的数据
+	 * 获取所有主流程和子流程的数据   (新增时)
 	 * @param parameter
 	 * @return
 	 */
@@ -46,4 +49,31 @@ public class ProcessMainController {
         return ResultView.success(list);
     }
 	
+	
+	public static void main(String[] args) {
+		List<ProcessSub> list = new ArrayList<ProcessSub>();
+		ProcessSub ProcessSub = new ProcessSub();
+		ProcessSub.setAuditId(1111);
+		ProcessSub.setTitle("测试1");
+		ProcessSub ProcessSub1 = new ProcessSub();
+		ProcessSub1.setAuditId(2222);
+		ProcessSub1.setTitle("测试2");
+		list.add(ProcessSub1);
+		list.add(ProcessSub);
+		list.forEach(obj -> System.out.println(obj.getTitle()));
+		
+		
+		/*List<String> books = new ArrayList<String>(3);
+        books.add("TEST1");
+        books.add("TEST2");
+        books.forEach(obj -> System.out.println(obj));*/
+        
+        Map maps = new HashMap();
+        maps.put(1, "test1");
+        maps.put(2, "test2");
+       // maps.forEach((k, v) -> System.out.println("Key : " + k + " Value : " + v));
+        maps.forEach((k,v)-> System.out.println("key:"+k+"value:"+v));
+
+	}
+	
 }

src/main/java/com/unissoft/ventilation/service/ProcessAuditService.java

@@ -26,7 +26,7 @@ public interface ProcessAuditService extends IService<ProcessAudit> {
 
 	Page<ProcessAudit> getPage(PageParam pageParam)throws Exception;
 
-	List<Map<String, Object>> getAllById(Integer id);
+	//List<Map<String, Object>> getAllById(Integer id);
 
 	void deleteById(Integer id);
 

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
@@ -83,6 +87,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         Integer fromPeople = jsStr.optInt("fromPeople");//提交人id
         String applyTime = jsStr.optString("applyTime");//申请时间
         Integer isAudit = jsStr.optInt("isAudit");//是否提交给总经理和分公司审批
+        String equipmentNameCode = jsStr.optString("equipmentNameCode");//设备名称code
+        Integer equipmentId = jsStr.optInt("equipmentId");//器材库的id
         //获取审批人
         List<ProcessBasis> pbList = processBasisService.getBasisByType(type, null, depotId);
         Integer toPeople = pbList.get(1).getContent();
@@ -130,7 +136,16 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             	processAudit.setWorkName(EnumProcessModel.sswxys.getName());
             }else if(type.equals("sbcg")){
             	processAudit.setWorkName(EnumProcessModel.sbcg.getName());
+            }else if(type.equals("sbwx")){
+            	processAudit.setWorkName(EnumProcessModel.sbwx.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);
@@ -138,6 +153,12 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 if(houseId != 0 && houseId != null){
                 	processAudit.setHouseId(houseId);
                 }
+                if(equipmentNameCode !=null && equipmentNameCode != ""){
+                	processAudit.setEquipmentNameCode(equipmentNameCode);
+                }
+                if(equipmentId != 0 && equipmentId != null){
+                	processAudit.setEquipmentId(equipmentId);
+                }
                 processAudit.setDepotId(depotId);
                 processAudit.setApplyPeople(applyPeople);
                 processAudit.setApplyTime(applyTime);
@@ -161,6 +182,19 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 processAudit.setProcessId(uuId); //多条数据时，流程标识取第一条的
             }
             processAuditMapper.insert(processAudit);
+            if(type.equals("sbwx") || type.equals("sbbf") || type.equals("sbly") || type.equals("sbgh")){
+            	//修改器材库的状态
+            	EquipmentStroe entity = new EquipmentStroe();
+            	entity.setId(equipmentId);
+            	if(type.equals("sbwx")){
+            		entity.setState(1);
+            	}else if(type.equals("sbbf")){
+            		entity.setState(2);
+            	}else{
+            		entity.setState(0);
+            	}
+            	quipmentStroeServicee.updateById(entity);
+            }
         }
         
         /*
@@ -196,6 +230,18 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         }else if(type.equals("sbcg")){
         	sysNoticeVO.setTitle(EnumProcessModel.sbcg.getName());
         	sysNoticeVO.setNoticeModule("sbcg");
+        }else if(type.equals("sbwx")){
+        	sysNoticeVO.setTitle(EnumProcessModel.sbwx.getName());
+        	sysNoticeVO.setNoticeModule("sbwx");
+        }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");
         }
         
         //根据仓房id获取仓房名称
@@ -250,40 +296,51 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         
         if (!StringUtils.isEmpty(pageParam.getCondition())) {
             org.json.JSONObject object = new org.json.JSONObject(pageParam.getCondition());
-            if (StringUtils.isNotBlank(object.optString("type"))) {
-            	if(object.optString("type").equals("xz") || object.optString("type").equals("sswx")){
-            		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);//取第一条数据
-                    }
-            	}
-            	
+            Integer equipmentId = object.optInt("equipmentId");
+            String startTime = object.optString("startTime");
+            String endTime = object.optString("endTime");
+            String type = object.optString("type");
+            String houseId = object.optString("houseId");
+            String depotId = object.optString("depotId");
+            
+            if("" != equipmentId+"" && equipmentId != 0){
+            	//ew.eq("equipment_id", equipmentId);
+            	ew.and(x -> x.eq("equipment_id", equipmentId).eq("result", 1).or().eq("equipment_id", equipmentId).eq("result", 2));
             }else{
-            	ew.eq("result", 1);//取第一条数据
+            	if (StringUtils.isNotBlank(type)) {
+                	if(type.equals("xz") || type.equals("sswx") || type.equals("sbly")){
+                		ew.like("type",type);
+                		ew.eq("result", 1);//取第一条数据
+                	}else{
+                		ew.eq("type", type);
+                        if(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"));
+            
+            if (StringUtils.isNotBlank(houseId)) {
+                ew.eq("house_id", houseId);
             }
-            if (StringUtils.isNotBlank(object.optString("depotId"))) {
-                ew.eq("depot_id", object.optString("depotId"));
+            if (StringUtils.isNotBlank(depotId)) {
+                ew.eq("depot_id", depotId);
             }
 
-            if (StringUtils.isNotBlank(object.optString("startTime")) || StringUtils.isNotBlank(object.optString("endTime"))) {
-                if (StringUtils.isNotBlank(object.optString("startTime")) && StringUtils.isNotBlank(object.optString("endTime")) &&
-                        object.optString("startTime").equals(object.optString("endTime"))) {
-                    ew.apply("date_format(apply_time,'%Y-%m-%d')='" + object.optString("startTime") + "'");
+            if (StringUtils.isNotBlank(startTime) || StringUtils.isNotBlank(endTime)) {
+                if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime) &&
+                        startTime.equals(endTime)) {
+                    ew.apply("date_format(apply_time,'%Y-%m-%d')='" + startTime + "'");
                 } else {
-                    ew.between("apply_time", object.optString("startTime"), object.optString("endTime"));
+                    ew.between("apply_time", startTime, endTime);
                 }
-
             }
 
-
         }
 
         ew.orderByDesc("id");
@@ -298,7 +355,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 
 
     //noUse
-    @Override
+/*@Override
     public List<Map<String, Object>> getAllById(Integer id) {
         // TODO Auto-generated method stub
         List<Map<String, Object>> list1 = new ArrayList<>();
@@ -339,7 +396,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         }
 
         return list1;
-    }
+    }*/
 
 
     /**
@@ -364,9 +421,10 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 
 
         org.json.JSONObject object = new org.json.JSONObject(pageParam.getCondition());
+        Integer userId = object.getInt("userId");
         QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(object.optString("userId"))) {
-            ew.eq("to_people", object.getInt("userId"));
+        if (StringUtils.isNotBlank(userId+"")) {
+            ew.eq("to_people", userId);
             ew.eq("audit_state", 0);//已提交
             //ew.and(x->x.eq("audit_state", 0).or().isNull("audit_state"));
         }
@@ -458,6 +516,18 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
          }else if(processAudit.getType().equals("sbcg")){
         	 sysNoticeVO.setTitle(EnumProcessModel.sbcg.getName());
           	 sysNoticeVO.setNoticeModule("sbcg");
+         }else if(processAudit.getType().equals("sbwx")){
+        	 sysNoticeVO.setTitle(EnumProcessModel.sbwx.getName());
+          	 sysNoticeVO.setNoticeModule("sbwx");
+         }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");
          }
          //根据仓房id获取仓房名称
          String houseName = "";
@@ -492,81 +562,110 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
          if (processAudit.getResult().equals(1) && processAudit.getAuditState().equals(0)) { //审批状态 是0 而且是第一条数据  就是第一次审批
              //第一个人审批
 
-             //获取审批人
-             QueryWrapper<ProcessBasis> ew = new QueryWrapper<>();
-             ew.eq("type", processAudit.getType());
-             List<ProcessBasis> list = processBasisMapper.selectList(ew);
-             List<Integer> idList = new ArrayList<>();
-             for (ProcessBasis processBasis : list) {
-                 idList.add(processBasis.getId());
-             }
-             QueryWrapper<ProcessBasisSon> ew1 = new QueryWrapper<>();
-             ew1.eq("depot_id", processAudit.getDepotId());
-             ew1.in("zid", idList);
-             List<ProcessBasisSon> sonList = processBasisSonMapper.selectList(ew1);
-             Integer toPeople = 0;
-             for (int i = 0; i < sonList.size(); i++) {
-                 if (sonList.get(i).getContent().equals(processAudit.getToPeople())) {
-                     toPeople = sonList.get(i + 1).getContent();//下一个审批人的id
-                     break;
-                 }
-             }
-
-             processAudit.setAuditState(auditState);
-             processAudit.setAuditTime(auditTime);
-             processAuditMapper.updateById(processAudit); //更改此条数据的审批状态
-             if (auditState.equals(1)) {//1审批通过:,2:审批不通过
-                 ProcessAudit processAudit1 = new ProcessAudit();
-                 processAudit1.setMainId(processAudit.getMainId());
-                 //processAudit1.setAuditState(auditState);
-                 //processAudit1.setOperationTime(processAudit.getOperationTime());
-                 processAudit1.setType(processAudit.getType());
-                 processAudit1.setHouseId(processAudit.getHouseId());
-                 processAudit1.setDepotId(processAudit.getDepotId());
-                 processAudit1.setFromPeople(processAudit.getToPeople());//当前审批人是下一个审批的提交人
-                 processAudit1.setToPeople(toPeople);
-                 processAudit1.setResult(0);
-                 processAudit1.setAuditState(0);//已提交待审批
-                 processAudit1.setApplyPeople(processAudit.getApplyPeople());
-                 processAudit1.setProcessId(processAudit.getProcessId());
-                 processAudit1.setApplyTime(processAudit.getApplyTime());
-                 processAudit1.setOngoingStep(ongoingStep);
-                 if (processAudit.getType().equals("tf")) {
-                     processAudit1.setWorkName(EnumProcessModel.tf.getName());
-                 }else if(processAudit.getType().equals("yjcg")){
-                	 processAudit1.setWorkName(EnumProcessModel.yjcg.getName());
-                 }else if(processAudit.getType().equals("yjly")){
-                	 processAudit1.setWorkName(EnumProcessModel.yjly.getName());
-                 }else if(processAudit.getType().equals("xzsq")){
-                	 processAudit1.setWorkName(EnumProcessModel.xzsq.getName());
-                 }else if(processAudit.getType().equals("xzjh")){
-                	 processAudit1.setWorkName(EnumProcessModel.xzjh.getName());
-                 }else if(processAudit.getType().equals("sswxjh")){
-                	 processAudit1.setWorkName(EnumProcessModel.sswxjh.getName());
-                 }else if(processAudit.getType().equals("sswxys")){
-                	 processAudit1.setWorkName(EnumProcessModel.sswxys.getName());
-                 }else if(processAudit.getType().equals("sbcg")){
-                	 processAudit1.setWorkName(EnumProcessModel.sbcg.getName());
-                 }
-                 processAuditMapper.insert(processAudit1);
+        	 if(processAudit.getType().equals("sbly")){//设备领用 只有一级审批
+        		 processAudit.setAuditState(auditState);
+                 processAudit.setAuditTime(auditTime);
+                 processAudit.setOngoingStep(ongoingStep);
+                 processAuditMapper.updateById(processAudit); //更改此条数据的审批状态
                  
                  /**
-                  *  发送通知数据给下一审批人
+                  * 发送通知数据给申请人
                   */
-                 sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"待审批");
-                 sysNoticeVO.setNoticeType(InformModel.TONGGUO.getcode());//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
-                //获取下一审批人的信息
-                 ResponseEntity<String> userInfos1 = restTemplate.getForEntity(MyConstant.SYSTEM_USER + toPeople, String.class);
-                 if(null != userInfos1 && null != userInfos1.getBody()){
-                	 com.alibaba.fastjson.JSONObject jsonObjectuser1 = JSON.parseObject(userInfos1.getBody());
-                     SysUserPO userInfo1 = com.alibaba.fastjson.JSONObject.toJavaObject(jsonObjectuser1, SysUserPO.class);
-                     users.put(toPeople, userInfo1.getuName());
+
+                 if((int) auditState >= 3 || (int) auditState ==1){
+                 	sysNoticeVO.setNoticeType(InformModel.TONGGUO.getcode());//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
+                 	sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"审批通过");
+                 }else if((int) auditState == 2){
+                 	sysNoticeVO.setNoticeType(InformModel.BUTONGGUO.getcode());//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
+                 	sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"审批不通过");
                  }
-             }else{//不通过 发送数据给申请人
-             	 sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"审批不通过");
-                 sysNoticeVO.setNoticeType(InformModel.BUTONGGUO.getcode());//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
                  users.put(processAudit.getApplyPeople(), userInfo.getuName());
-             }
+                 
+        	 }else{
+        		//获取审批人
+                 QueryWrapper<ProcessBasis> ew = new QueryWrapper<>();
+                 ew.eq("type", processAudit.getType());
+                 List<ProcessBasis> list = processBasisMapper.selectList(ew);
+                 List<Integer> idList = new ArrayList<>();
+                 for (ProcessBasis processBasis : list) {
+                     idList.add(processBasis.getId());
+                 }
+                 QueryWrapper<ProcessBasisSon> ew1 = new QueryWrapper<>();
+                 ew1.eq("depot_id", processAudit.getDepotId());
+                 ew1.in("zid", idList);
+                 List<ProcessBasisSon> sonList = processBasisSonMapper.selectList(ew1);
+                 Integer toPeople = 0;
+                 for (int i = 0; i < sonList.size(); i++) {
+                     if (sonList.get(i).getContent().equals(processAudit.getToPeople())) {
+                         toPeople = sonList.get(i + 1).getContent();//下一个审批人的id
+                         break;
+                     }
+                 }
+
+                 processAudit.setAuditState(auditState);
+                 processAudit.setAuditTime(auditTime);
+                 processAuditMapper.updateById(processAudit); //更改此条数据的审批状态
+                 if (auditState.equals(1)) {//1审批通过:,2:审批不通过
+                     ProcessAudit processAudit1 = new ProcessAudit();
+                     processAudit1.setMainId(processAudit.getMainId());
+                     //processAudit1.setAuditState(auditState);
+                     //processAudit1.setOperationTime(processAudit.getOperationTime());
+                     processAudit1.setType(processAudit.getType());
+                     processAudit1.setHouseId(processAudit.getHouseId());
+                     processAudit1.setDepotId(processAudit.getDepotId());
+                     processAudit1.setFromPeople(processAudit.getToPeople());//当前审批人是下一个审批的提交人
+                     processAudit1.setToPeople(toPeople);
+                     processAudit1.setResult(0);
+                     processAudit1.setAuditState(0);//已提交待审批
+                     processAudit1.setApplyPeople(processAudit.getApplyPeople());
+                     processAudit1.setProcessId(processAudit.getProcessId());
+                     processAudit1.setApplyTime(processAudit.getApplyTime());
+                     processAudit1.setOngoingStep(ongoingStep);
+                     if (processAudit.getType().equals("tf")) {
+                         processAudit1.setWorkName(EnumProcessModel.tf.getName());
+                     }else if(processAudit.getType().equals("yjcg")){
+                    	 processAudit1.setWorkName(EnumProcessModel.yjcg.getName());
+                     }else if(processAudit.getType().equals("yjly")){
+                    	 processAudit1.setWorkName(EnumProcessModel.yjly.getName());
+                     }else if(processAudit.getType().equals("xzsq")){
+                    	 processAudit1.setWorkName(EnumProcessModel.xzsq.getName());
+                     }else if(processAudit.getType().equals("xzjh")){
+                    	 processAudit1.setWorkName(EnumProcessModel.xzjh.getName());
+                     }else if(processAudit.getType().equals("sswxjh")){
+                    	 processAudit1.setWorkName(EnumProcessModel.sswxjh.getName());
+                     }else if(processAudit.getType().equals("sswxys")){
+                    	 processAudit1.setWorkName(EnumProcessModel.sswxys.getName());
+                     }else if(processAudit.getType().equals("sbcg")){
+                    	 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);
+                     
+                     /**
+                      *  发送通知数据给下一审批人
+                      */
+                     sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"待审批");
+                     sysNoticeVO.setNoticeType(InformModel.TONGGUO.getcode());//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
+                    //获取下一审批人的信息
+                     ResponseEntity<String> userInfos1 = restTemplate.getForEntity(MyConstant.SYSTEM_USER + toPeople, String.class);
+                     if(null != userInfos1 && null != userInfos1.getBody()){
+                    	 com.alibaba.fastjson.JSONObject jsonObjectuser1 = JSON.parseObject(userInfos1.getBody());
+                         SysUserPO userInfo1 = com.alibaba.fastjson.JSONObject.toJavaObject(jsonObjectuser1, SysUserPO.class);
+                         users.put(toPeople, userInfo1.getuName());
+                     }
+                 }else{//不通过 发送数据给申请人
+                 	 sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"审批不通过");
+                     sysNoticeVO.setNoticeType(InformModel.BUTONGGUO.getcode());//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
+                     users.put(processAudit.getApplyPeople(), userInfo.getuName());
+                 }
+        	 }
          } else {
              //第二个人审批
              //修改第一条数据的状态(历史数据的状态)
@@ -691,8 +790,9 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         int depot = 0;
         int ongoingStep = 0;
         
-        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")){
+        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("sbgh"))){
             if(list.size()>0){
             	 depot = list.get(0).getDepotId();
                  ongoingStep = Integer.valueOf(list.get(0).getOngoingStep());
@@ -723,16 +823,21 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         //流程基础数据
         List<Map<String, Object>> process = new ArrayList<>();
         QueryWrapper<ProcessMain> ew1 = new QueryWrapper<>();
-        if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")){
-        	ew1.eq("type", "xz");
-        }else if(list.get(0).getType().equals("sswxjh") || list.get(0).getType().equals("sswxys")){
-        	ew1.eq("type", "sswx");
+        if(list.size()>0){
+        	if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")){
+            	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("sbly") || list.get(0).getType().equals("sbgh")){
+            	ew1.eq("type", "sbly");
+            }else{
+            	ew1.eq("type", list.get(0).getType());
+            }
         }else{
-        	ew1.eq("type", list.get(0).getType());
+        	ew1.eq("type", sonList.get(0).getType());
         }
         
         
-        
         boolean auditFirst = true; 
         List<ProcessMain> mainList = processMainMapper.selectList(ew1);
         if(mainList.size()>0){
@@ -759,19 +864,55 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 HashMap<String, Object> map1 = Maps.newHashMap();
                 map1.put("step", mainList.get(i));//主表数据
                 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")){
-                	
+                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("sbgh"))){
                     //审批人数据
                     if(mainList.get(i).getExistProcess().equals(0)){
                     	if(auditFirst){
                     		createAudit( mainList, list, i, map1, depot, ongoingStep);
                     		auditFirst = false;
                     	}else{
-                    		createAudit( mainList, list2, i, map1,depot, ongoingStep);
-                    		
+                        	createAudit( mainList, list2, i, map1,depot, ongoingStep);
                     	}
                     }
+                }else{
+                	//审批数据
+                	if(mainList.get(i).getExistProcess().equals(0) && list.size()>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);
                 
@@ -779,7 +920,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         }else{
         	HashMap<String, Object> map1 = Maps.newHashMap();
         	QueryWrapper<ProcessSub> ew2 = new QueryWrapper<>();
-            ew2.eq("type", list.get(0).getType());
+            ew2.eq("type", sonList.get(0).getType());
             List<ProcessSub> subList = processSubMapper.selectList(ew2);
             for (int j = 0; j < subList.size(); j++) {
                 for (int k = 0; k < sonList.size(); k++) {
@@ -793,8 +934,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             map1.put("list", subList);//子表数据
             
           //审批流程信息
-            if(list.get(0).getType().equals("tf") || list.get(0).getType().equals("yjly") || list.get(0).getType().equals("yjcg")
-            		|| list.get(0).getType().equals("sbcg")){
+            if(list.size()>0 && (list.get(0).getType().equals("tf") || list.get(0).getType().equals("yjly") || list.get(0).getType().equals("yjcg")
+            		|| list.get(0).getType().equals("sbcg"))){
             	List<ProcessBasis> pbList = processBasisService.getBasisByType(list.get(0).getType(), null, list.get(0).getDepotId());
                 if(pbList.size()>0){
                 	if(pbList.get(0).getType().equals("tf") || pbList.get(0).getType().equals("yjly")){
@@ -864,8 +1005,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         map.put("process", process);
 
         //审批流程信息
-        if(list.get(0).getType().equals("tf") || list.get(0).getType().equals("yjly") || list.get(0).getType().equals("yjcg")
-        		|| list.get(0).getType().equals("sbcg")){
+        if(list.size()>0 && (list.get(0).getType().equals("tf") || list.get(0).getType().equals("yjly") || list.get(0).getType().equals("yjcg")
+        		|| list.get(0).getType().equals("sbcg"))){
         	List<ProcessBasis> pbList = processBasisService.getBasisByType(list.get(0).getType(), null, list.get(0).getDepotId());
             if(pbList.size()>0){
             	if(pbList.get(0).getType().equals("tf") || pbList.get(0).getType().equals("yjly")){
@@ -941,9 +1082,11 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 
         QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
         org.json.JSONObject object = new org.json.JSONObject(pageParam.getCondition());
-        if (StringUtils.isNotBlank(object.optString("userId"))) {
-            ew.eq("apply_people", object.optString("userId"));
-            ew.eq("from_people", object.optString("userId"));
+        String userId = object.optString("userId");
+
+        if (StringUtils.isNotBlank(userId)) {
+            ew.eq("apply_people", userId);
+            ew.eq("from_people", userId);
         }
         //ew.eq("result", 1);//整个流程的第一条数据
         //只获取审批的数据
@@ -1002,9 +1145,10 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 
         QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
         org.json.JSONObject object = new org.json.JSONObject(pageParam.getCondition());
-        if (StringUtils.isNotBlank(object.optString("userId"))) {
+        String userId = object.optString("userId");
+        if (StringUtils.isNotBlank(userId)) {
             //如果是第一个审批人 则第一条数据中状态不为0(提交)
-            ew.eq("to_people", object.optString("userId"));
+            ew.eq("to_people", userId);
             //ew.eq("result",1);//整个流程的第一条数据
             //ew.ne("audit_state",0);
 
@@ -1351,6 +1495,12 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
          }else if(processAudit.getType().equals("sbcg")){
         	 sysNoticeVO.setTitle(EnumProcessModel.sbcg.getName());
           	 sysNoticeVO.setNoticeModule("sbcg");
+         }else if(processAudit.getType().equals("sbwx")){
+        	 sysNoticeVO.setTitle(EnumProcessModel.sbwx.getName());
+          	 sysNoticeVO.setNoticeModule("sbwx");
+         }else if(processAudit.getType().equals("sbbf")){
+        	 sysNoticeVO.setTitle(EnumProcessModel.sbbf.getName());
+          	 sysNoticeVO.setNoticeModule("sbbf");
          }
          //根据仓房id获取仓房名称
          String houseName = "";
@@ -1459,6 +1609,10 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 	 processAudit1.setWorkName(EnumProcessModel.sswxys.getName());
                  }else if(processAudit.getType().equals("sbcg")){
                 	 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());
                  }
                  processAuditMapper.insert(processAudit1);
                  
@@ -1580,8 +1734,9 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 	public void drugDetailsAdd(String parameter) throws JSONException {
 		JSONObject jsStr = new JSONObject(parameter);
         String processId = "";
-        if(null != jsStr.optString("processId") && "" != jsStr.optString("processId")){
-        	 processId = jsStr.optString("processId");//流程id 用于修改
+        String receiveProcessId = jsStr.optString("processId");
+        if(null != receiveProcessId && !receiveProcessId.equals("")){
+        	 processId = receiveProcessId;//流程id 用于修改
         }else{
         	 processId = UUID.randomUUID().toString();//生成一个流程id
         }
@@ -1590,6 +1745,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);
@@ -1625,6 +1782,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);
@@ -1637,7 +1799,16 @@ 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);
+                if(type.equals("sbtz") || type.equals("sbdwgl")){
+                	//修改器材库的状态
+                	EquipmentStroe entity = new EquipmentStroe();
+                	entity.setId(equipmentId);
+                	entity.setState(0);
+                	quipmentStroeServicee.updateById(entity);
+                }
             }
             
         }
@@ -1664,38 +1835,41 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         	QueryWrapper<ProcessBasis> ew3 = new QueryWrapper<>();
             ew3.eq("main_id", mainList.get(i).getId());
             List<ProcessBasis> basisList = processBasisMapper.selectList(ew3);
-            List<ProcessBasis> pbList = processBasisService.getBasisByType(basisList.get(0).getType(), null, depot);
-            if(pbList.size()>0 && i <= Integer.valueOf(ongoingStep) && list.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);
-               	}
+            if(basisList.size()>0){
+                List<ProcessBasis> pbList = processBasisService.getBasisByType(basisList.get(0).getType(), null, depot);
+                if(pbList.size()>0 && i <= Integer.valueOf(ongoingStep) && list.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);
             }
-            map1.put("audit", pbList);
+            
 	}
 }