设备维修

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

@@ -1,16 +0,0 @@
-package com.unissoft.mapper;
-
-import com.unissoft.model.EquipmentStroe;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author root
- * @since 2020-12-15
- */
-public interface EquipmentStroeMapper extends BaseMapper<EquipmentStroe> {
-
-}

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

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.unissoft.mapper.EquipmentStroeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.unissoft.model.EquipmentStroe">
-        <id column="id" property="id" />
-        <result column="depot_id" property="depotId" />
-        <result column="equipment_category" property="equipmentCategory" />
-        <result column="equipment_category_name" property="equipmentCategoryName" />
-        <result column="equipment_name_code" property="equipmentNameCode" />
-        <result column="equipment_name" property="equipmentName" />
-        <result column="standards_type" property="standardsType" />
-        <result column="manufacturer" property="manufacturer" />
-        <result column="asset_number" property="assetNumber" />
-        <result column="equipment_number" property="equipmentNumber" />
-        <result column="arrival_time" property="arrivalTime" />
-        <result column="management" property="management" />
-        <result column="leave_time" property="leaveTime" />
-        <result column="enterprise_name" property="enterpriseName" />
-    </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
-    </sql>
-
-</mapper>

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

@@ -1,22 +0,0 @@
-package com.unissoft.mapper;
-
-import com.unissoft.model.ProcessAudit;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 流程审批表 Mapper 接口
- * </p>
- *
- * @author My sunShine
- * @since 2021-04-06
- */
-public interface ProcessAuditMapper extends BaseMapper<ProcessAudit> {
-
-	 List<ProcessAudit> getToBeDone(List<Integer> list);
-
-	 List<ProcessAudit> getCurrentMonthData();
-}

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

@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.unissoft.mapper.ProcessAuditMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.unissoft.model.ProcessAudit">
-        <id column="id" property="id" />
-        <result column="main_id" property="mainId" />
-        <result column="sub_id" property="subId" />
-        <result column="sub_data" property="subData" />
-        <result column="audit_state" property="auditState" />
-        <result column="operation_time" property="operationTime" />
-        <result column="type" property="type" />
-        <result column="house_id" property="houseId" />
-        <result column="depot_id" property="depotId" />
-        <result column="from_people" property="fromPeople" />
-        <result column="to_people" property="toPeople" />
-        <result column="result" property="result" />
-        <result column="apply_people" property="applyPeople" />
-        <result column="audit_time" property="auditTime" />
-        <result column="process_id" property="processId" />
-        <result column="ongoing_step" property="ongoingStep" />
-        <result column="is_audit" property="isAudit" />
-        <result column="apply_time" property="applyTime" />
-        <result column="work_name" property="workName" />
-        <result column="start_date" property="startDate" />
-        <result column="end_date" property="endDate" />
-        <result column="to_page" property="toPage" />
-    </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
-    </sql>
-    
-     <select id="getToBeDone" parameterType="list" resultType="com.unissoft.model.ProcessAudit">
-        select
-        <include refid="Base_Column_List"/>
-        from process_audit pa
-        <where>
-            pa.audit_state = 0 and
-            <foreach item="item" collection="list" separator=" or " open="(" close=")" index="">
-                pa.id=#{item, jdbcType=NUMERIC}
-            </foreach>
-        </where>
-    </select>
-
-    <select id="getCurrentMonthData" resultType="com.unissoft.model.ProcessAudit">
-      SELECT
-	p.id,
-	p.main_id,
-	p.sub_id,
-	p.sub_data,
-	p.audit_state,
-	p.operation_time,
-	p.type,
-	p.house_id,
-	p.depot_id,
-	p.from_people,
-	p.to_people,
-	p.result,
-	p.apply_people,
-	p.audit_time,
-	p.process_id,
-	p.ongoing_step,
-	p.apply_time,
-	p.work_name,
-	p.start_date,
-	p.end_date,
-	p.to_page
-FROM
-	process_audit p
-LEFT JOIN basics_depot b ON p.depot_id = b.d_id
-WHERE
-	b.p_belonging = 0
-AND p.to_people IS NOT NULL
-AND p.audit_state IS NOT NULL
-AND p.end_date IS NOT NULL
-AND DATE_FORMAT(p.apply_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
-    </select>
-
-</mapper>

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

@@ -1,95 +0,0 @@
-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 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
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("equipment_stroe")
-@ApiModel(value="EquipmentStroe对象", description="器材库")
-public class EquipmentStroe implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "库区ID")
-    @TableField("depot_id")
-    private Integer depotId;
-
-    @ApiModelProperty(value = "设备类别code")
-    @TableField("equipment_category")
-    private String equipmentCategory;
-
-    @ApiModelProperty(value = "设备类别名称")
-    @TableField("equipment_category_name")
-    private String equipmentCategoryName;
-
-    @ApiModelProperty(value = "设备名称code")
-    @TableField("equipment_name_code")
-    private String equipmentNameCode;
-
-    @ApiModelProperty(value = "设备名称")
-    @TableField("equipment_name")
-    private String equipmentName;
-
-    @ApiModelProperty(value = "规格型号")
-    @TableField("standards_type")
-    private String standardsType;
-
-    @ApiModelProperty(value = "生产厂家")
-    @TableField("manufacturer")
-    private String manufacturer;
-
-    @ApiModelProperty(value = "资产编号")
-    @TableField("asset_number")
-    private String assetNumber;
-
-    @ApiModelProperty(value = "设备编号")
-    @TableField("equipment_number")
-    private String equipmentNumber;
-
-    @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;
-
-    @ApiModelProperty(value = "管理者")
-    @TableField("management")
-    private String management;
-
-    @ApiModelProperty(value = "出厂时间")
-    @TableField("leave_time")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date leaveTime;
-
-    @ApiModelProperty(value = "企业名称")
-    @TableField("enterprise_name")
-    private String enterpriseName;
-
-    @ApiModelProperty(value = "登记人")
-    @TableField("registrant")
-    private String egistrant;
-
-}

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

@@ -1,352 +0,0 @@
-package com.unissoft.model;
-
-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;
-
-/**
- * <p>
- * 流程审批表
- * </p>
- *
- * @author My sunShine
- * @since 2021-04-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("process_audit")
-@ApiModel(value="ProcessAudit对象", description="流程审批表")
-public class ProcessAudit implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    
-    //业务字段
-    @TableField(exist = false)
-    private String houseName;
-    @TableField(exist = false)
-	private String applyName;
-    @TableField(exist = false)
-	private String departmentName;
-    @TableField(exist = false)
-	private String companyName;
-	
-	
-	
-	
-
-    public String getHouseName() {
-		return houseName;
-	}
-
-	public void setHouseName(String houseName) {
-		this.houseName = houseName;
-	}
-
-	public String getApplyName() {
-		return applyName;
-	}
-
-	public void setApplyName(String applyName) {
-		this.applyName = applyName;
-	}
-
-	public String getDepartmentName() {
-		return departmentName;
-	}
-
-	public void setDepartmentName(String departmentName) {
-		this.departmentName = departmentName;
-	}
-
-	public String getCompanyName() {
-		return companyName;
-	}
-
-	public void setCompanyName(String companyName) {
-		this.companyName = companyName;
-	}
-	
-    @ApiModelProperty(value = "流程审批表")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "主流程id")
-    @TableField("main_id")
-    private Integer mainId;
-
-    @ApiModelProperty(value = "子流程的id")
-    @TableField("sub_id")
-    private Integer subId;
-
-    @ApiModelProperty(value = "子流程的数据(0:是，1:否)")
-    @TableField("sub_data")
-    private Integer subData;
-
-    @ApiModelProperty(value = "审批状态(0:提交,1审批通过:,2:审批不通过，3:审批完成进行中，4已完成）")
-    @TableField("audit_state")
-    private Integer auditState;
-
-    @ApiModelProperty(value = "子流程的操作时间")
-    @TableField("operation_time")
-    private String operationTime;
-
-    @ApiModelProperty(value = "流程类型(如:tf）")
-    @TableField("type")
-    private String type;
-
-    @ApiModelProperty(value = "仓房id")
-    @TableField("house_id")
-    private Integer houseId;
-
-    @ApiModelProperty(value = "库id")
-    @TableField("depot_id")
-    private Integer depotId;
-
-    @ApiModelProperty(value = "提交人")
-    @TableField("from_people")
-    private Integer fromPeople;
-
-    @ApiModelProperty(value = "审批人")
-    @TableField("to_people")
-    private Integer toPeople;
-
-    @ApiModelProperty(value = "是否是整个业务的首条记录（1是0否）")
-    @TableField("result")
-    private Integer result;
-
-    @ApiModelProperty(value = "申请人")
-    @TableField("apply_people")
-    private Integer applyPeople;
-
-    @ApiModelProperty(value = "审批时间")
-    @TableField("audit_time")
-    private String auditTime;
-
-    @ApiModelProperty(value = "每一个业务流程的流程标识")
-    @TableField("process_id")
-    private String processId;
-
-    @ApiModelProperty(value = "进行到哪一步的主流程id")
-    @TableField("ongoing_step")
-    private String ongoingStep;
-
-    @ApiModelProperty(value = "是否提交给总经理和分公司审批(0否1是)")
-    @TableField("is_audit")
-    private Integer isAudit;
-
-    @ApiModelProperty(value = "申请时间")
-    @TableField("apply_time")
-    private String applyTime;
-
-    @ApiModelProperty(value = "流程名称，如 科长每2周粮情检查，通风申请")
-    @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")
-    private Date startDate;
-
-    @ApiModelProperty(value = "办理结束时间")
-    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm",timezone="GMT+8")
-    @TableField("end_date")
-    private Date endDate;
-
-    @ApiModelProperty(value = "办理页面url")
-    @TableField("to_page")
-    private String toPage;
-
-
-
-
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public Integer getMainId() {
-		return mainId;
-	}
-
-	public void setMainId(Integer mainId) {
-		this.mainId = mainId;
-	}
-
-	public Integer getSubId() {
-		return subId;
-	}
-
-	public void setSubId(Integer subId) {
-		this.subId = subId;
-	}
-
-	public Integer getSubData() {
-		return subData;
-	}
-
-	public void setSubData(Integer subData) {
-		this.subData = subData;
-	}
-
-	public Integer getAuditState() {
-		return auditState;
-	}
-
-	public void setAuditState(Integer auditState) {
-		this.auditState = auditState;
-	}
-
-	public String getOperationTime() {
-		return operationTime;
-	}
-
-	public void setOperationTime(String operationTime) {
-		this.operationTime = operationTime;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public Integer getHouseId() {
-		return houseId;
-	}
-
-	public void setHouseId(Integer houseId) {
-		this.houseId = houseId;
-	}
-
-	public Integer getDepotId() {
-		return depotId;
-	}
-
-	public void setDepotId(Integer depotId) {
-		this.depotId = depotId;
-	}
-
-	public Integer getFromPeople() {
-		return fromPeople;
-	}
-
-	public void setFromPeople(Integer fromPeople) {
-		this.fromPeople = fromPeople;
-	}
-
-	public Integer getToPeople() {
-		return toPeople;
-	}
-
-	public void setToPeople(Integer toPeople) {
-		this.toPeople = toPeople;
-	}
-
-	public Integer getResult() {
-		return result;
-	}
-
-	public void setResult(Integer result) {
-		this.result = result;
-	}
-
-	public Integer getApplyPeople() {
-		return applyPeople;
-	}
-
-	public void setApplyPeople(Integer applyPeople) {
-		this.applyPeople = applyPeople;
-	}
-
-	public String getAuditTime() {
-		return auditTime;
-	}
-
-	public void setAuditTime(String auditTime) {
-		this.auditTime = auditTime;
-	}
-
-	public String getProcessId() {
-		return processId;
-	}
-
-	public void setProcessId(String processId) {
-		this.processId = processId;
-	}
-
-	public String getOngoingStep() {
-		return ongoingStep;
-	}
-
-	public void setOngoingStep(String ongoingStep) {
-		this.ongoingStep = ongoingStep;
-	}
-
-	public Integer getIsAudit() {
-		return isAudit;
-	}
-
-	public void setIsAudit(Integer isAudit) {
-		this.isAudit = isAudit;
-	}
-
-	public String getApplyTime() {
-		return applyTime;
-	}
-
-	public void setApplyTime(String applyTime) {
-		this.applyTime = applyTime;
-	}
-
-	public String getWorkName() {
-		return workName;
-	}
-
-	public void setWorkName(String workName) {
-		this.workName = workName;
-	}
-
-	public Date getStartDate() {
-		return startDate;
-	}
-
-	public void setStartDate(Date startDate) {
-		this.startDate = startDate;
-	}
-
-	public Date getEndDate() {
-		return endDate;
-	}
-
-	public void setEndDate(Date endDate) {
-		this.endDate = endDate;
-	}
-
-	public String getToPage() {
-		return toPage;
-	}
-
-	public void setToPage(String toPage) {
-		this.toPage = toPage;
-	}
-    
-    
-
-
-}

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/impl/ProcessAuditServiceImpl.java

@@ -83,6 +83,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,6 +132,12 @@ 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("sblygh")){
+            	processAudit.setWorkName(EnumProcessModel.sblygh.getName());
+            }else if(type.equals("sbbf")){
+            	processAudit.setWorkName(EnumProcessModel.sbbf.getName());
             }
 
             if(i == 0 ){
@@ -138,6 +146,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);
@@ -196,6 +210,15 @@ 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("sblygh")){
+        	sysNoticeVO.setTitle(EnumProcessModel.sblygh.getName());
+        	sysNoticeVO.setNoticeModule("sblygh");
+        }else if(type.equals("sbbf")){
+        	sysNoticeVO.setTitle(EnumProcessModel.sbbf.getName());
+        	sysNoticeVO.setNoticeModule("sbbf");
         }
         
         //根据仓房id获取仓房名称
@@ -251,7 +274,7 @@ 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")){
+            	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{
@@ -458,6 +481,15 @@ 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("sblygh")){
+        	 sysNoticeVO.setTitle(EnumProcessModel.sblygh.getName());
+          	 sysNoticeVO.setNoticeModule("sblygh");
+         }else if(processAudit.getType().equals("sbbf")){
+        	 sysNoticeVO.setTitle(EnumProcessModel.sbbf.getName());
+          	 sysNoticeVO.setNoticeModule("sbbf");
          }
          //根据仓房id获取仓房名称
          String houseName = "";
@@ -492,81 +524,102 @@ 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());
+                     }
+                     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 {
              //第二个人审批
              //修改第一条数据的状态(历史数据的状态)
@@ -692,7 +745,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         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")){
+        		list.get(0).getType().equals("sswxjh") || list.get(0).getType().equals("sswxys") ||
+        		list.get(0).getType().equals("sbly") || list.get(0).getType().equals("sblygh")){
             if(list.size()>0){
             	 depot = list.get(0).getDepotId();
                  ongoingStep = Integer.valueOf(list.get(0).getOngoingStep());
@@ -727,12 +781,15 @@ 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")){
+        	ew1.eq("type", "sbly");
         }else{
         	ew1.eq("type", list.get(0).getType());
         }
         
         
         
+        
         boolean auditFirst = true; 
         List<ProcessMain> mainList = processMainMapper.selectList(ew1);
         if(mainList.size()>0){
@@ -760,7 +817,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 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")){
+                		|| list.get(0).getType().equals("sswxjh") || list.get(0).getType().equals("sswxys")
+                		|| list.get(0).getType().equals("sbly") || list.get(0).getType().equals("sblygh")){
                 	
                     //审批人数据
                     if(mainList.get(i).getExistProcess().equals(0)){
@@ -794,7 +852,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             
           //审批流程信息
             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")){
+            		|| list.get(0).getType().equals("sbcg") || list.get(0).getType().equals("sbwx")){
             	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")){
@@ -1351,6 +1409,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 +1523,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);