Merge remote-tracking branch 'origin/master'

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

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

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

@@ -20,6 +20,7 @@
         <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" />
@@ -29,10 +30,10 @@
 
     <!-- 通用查询结果列 -->
     <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, 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
     </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

@@ -6,7 +6,9 @@ public enum EnumProcessModel {
 	yjcg("药剂采购申请"),
 	yjly("药剂领用申请"),
 	xzsq("熏蒸散气申请"),
-	xzjh("熏蒸计划申请");
+	xzjh("熏蒸计划申请"),
+	sswxjh("设施维修计划"),
+	sswxys("设施维修预算");
 	
 	private String name;
 

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

@@ -9,23 +9,27 @@ 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 2020-12-28
+ * @author My sunShine
+ * @since 2021-04-06
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
 @TableName("process_audit")
-@ApiModel(value="ProcessAudit对象", description="")
+@ApiModel(value="ProcessAudit对象", description="流程审批表")
 public class ProcessAudit implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     
-  //业务字段
+    //业务字段
     @TableField(exist = false)
     private String houseName;
     @TableField(exist = false)
@@ -83,7 +87,7 @@ public class ProcessAudit implements Serializable {
     @TableField("sub_id")
     private Integer subId;
 
-    @ApiModelProperty(value = "子流程的数据(1:是，0:否)")
+    @ApiModelProperty(value = "子流程的数据(0:是，1:否)")
     @TableField("sub_data")
     private Integer subData;
 
@@ -135,6 +139,10 @@ public class ProcessAudit implements Serializable {
     @TableField("ongoing_step")
     private String ongoingStep;
 
+    @ApiModelProperty(value = "是否提交给总经理和分公司审批(0否1是)")
+    @TableField("is_audit")
+    private Integer isAudit;
+
     @ApiModelProperty(value = "申请时间")
     @TableField("apply_time")
     private String applyTime;
@@ -143,6 +151,7 @@ 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")
@@ -157,178 +166,187 @@ public class ProcessAudit implements Serializable {
     @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 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;
-    }
-
-    @Override
-    public String toString() {
-        return "ProcessAudit{" +
-            "id=" + id +
-            ", mainId=" + mainId +
-            ", subId=" + subId +
-            ", subData=" + subData +
-            ", auditState=" + auditState +
-            ", operationTime=" + operationTime +
-            ", type=" + type +
-            ", houseId=" + houseId +
-            ", depotId=" + depotId +
-            ", fromPeople=" + fromPeople +
-            ", toPeople=" + toPeople +
-            ", result=" + result +
-            ", applyPeople=" + applyPeople +
-            ", auditTime=" + auditTime +
-            ", processId=" + processId +
-            ", ongoingStep=" + ongoingStep +
-            ", applyTime=" + applyTime +
-            ", workName=" + workName +
-            ", startDate=" + startDate +
-            ", endDate=" + endDate +
-            ", toPage=" + 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/model/ProcessMain.java

@@ -22,7 +22,22 @@ public class ProcessMain implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "主流程表")
+    //业务数据
+    @TableField(exist = false)
+    private Integer isAudit;
+    
+    
+    
+    
+    public Integer getIsAudit() {
+		return isAudit;
+	}
+
+	public void setIsAudit(Integer isAudit) {
+		this.isAudit = isAudit;
+	}
+
+	@ApiModelProperty(value = "主流程表")
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

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

@@ -82,13 +82,15 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         Integer applyPeople = jsStr.optInt("applyPeople");//申请人id
         Integer fromPeople = jsStr.optInt("fromPeople");//提交人id
         String applyTime = jsStr.optString("applyTime");//申请时间
+        Integer isAudit = jsStr.optInt("isAudit");//是否提交给总经理和分公司审批
         //获取审批人
         List<ProcessBasis> pbList = processBasisService.getBasisByType(type, null, depotId);
         Integer toPeople = pbList.get(1).getContent();
 
         String ongoingStep = jsStr.optString("ongoingStep");//进行到哪一步的主流程id
     	org.json.JSONArray jsonArray = jsStr.optJSONArray("subList");//子流程数据
-        JSONObject row = null;
+        JSONObject row = null; 
+        String uuId = UUID.randomUUID().toString();//唯一的流程标识
         for (int i = 0; i < jsonArray.length(); i++) {
             row = jsonArray.getJSONObject(i);
             Integer mainId = row.optInt("mainId");//主流程id
@@ -107,18 +109,11 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             if(operationTime != null){
             	processAudit.setOperationTime(operationTime);
             }
-            if(houseId != 0 && houseId != null){
-            	processAudit.setHouseId(houseId);
-            }
+            
             processAudit.setSubData(subData);
             processAudit.setType(type);
-            processAudit.setDepotId(depotId);
-            processAudit.setApplyPeople(applyPeople);
-            processAudit.setFromPeople(fromPeople);
-            processAudit.setToPeople(toPeople);
-            processAudit.setApplyTime(applyTime);
-            processAudit.setAuditState(0);//已提交
             processAudit.setOngoingStep(ongoingStep);
+            processAudit.setIsAudit(isAudit);
             if (type.equals("tf")) {
                 processAudit.setWorkName(EnumProcessModel.tf.getName());
             }else if(type.equals("yjcg")){
@@ -129,12 +124,25 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             	processAudit.setWorkName(EnumProcessModel.xzjh.getName());
             }else if(type.equals("xzsq")){
             	processAudit.setWorkName(EnumProcessModel.xzsq.getName());
+            }else if(type.equals("sswxjh")){
+            	processAudit.setWorkName(EnumProcessModel.sswxjh.getName());
+            }else if(type.equals("sswxys")){
+            	processAudit.setWorkName(EnumProcessModel.sswxys.getName());
             }
 
             if(i == 0 ){
+            	processAudit.setFromPeople(fromPeople);
+                processAudit.setToPeople(toPeople);
+                if(houseId != 0 && houseId != null){
+                	processAudit.setHouseId(houseId);
+                }
+                processAudit.setDepotId(depotId);
+                processAudit.setApplyPeople(applyPeople);
+                processAudit.setApplyTime(applyTime);
+                processAudit.setAuditState(0);//已提交
             	if(ongoingStep.equals(0+"")){//第一个带审批
 	                processAudit.setResult(1);//第一条数据 保存并审批  1是0否
-	                processAudit.setProcessId(UUID.randomUUID().toString());//唯一的流程标识
+	                processAudit.setProcessId(uuId);//唯一的流程标识
                 }else{ //其他步骤带审批的
             		//修改第一条数据
             		QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
@@ -148,7 +156,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 }
             }else{
             	processAudit.setResult(0);// 保存并审批  1是0否
-                processAudit.setProcessId((String) jsonArray.getJSONObject(0).get("processId")); //多条数据时，流程标识取第一条的
+                processAudit.setProcessId(uuId); //多条数据时，流程标识取第一条的
             }
             processAuditMapper.insert(processAudit);
         }
@@ -177,6 +185,12 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         }else if(type.equals("xzsq")){
         	sysNoticeVO.setTitle(EnumProcessModel.xzsq.getName());
         	sysNoticeVO.setNoticeModule("xzsq");
+        }else if(type.equals("sswxjh")){
+        	sysNoticeVO.setTitle(EnumProcessModel.sswxjh.getName());
+        	sysNoticeVO.setNoticeModule("sswxjh");
+        }else if(type.equals("sswxys")){
+        	sysNoticeVO.setTitle(EnumProcessModel.sswxys.getName());
+        	sysNoticeVO.setNoticeModule("sswxys");
         }
         
         //根据仓房id获取仓房名称
@@ -232,8 +246,8 @@ 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")){
-            		ew.like("type", "xz");
+            	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"));
@@ -243,6 +257,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                     	ew.eq("result", 1);//取第一条数据
                     }
             	}
+            	
             }else{
             	ew.eq("result", 1);//取第一条数据
             }
@@ -429,6 +444,12 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
          }else if(processAudit.getType().equals("xzjh")){
         	 sysNoticeVO.setTitle(EnumProcessModel.xzjh.getName());
           	 sysNoticeVO.setNoticeModule("xzjh");
+         }else if(processAudit.getType().equals("sswxjh")){
+        	 sysNoticeVO.setTitle(EnumProcessModel.sswxjh.getName());
+          	 sysNoticeVO.setNoticeModule("sswxjh");
+         }else if(processAudit.getType().equals("sswxys")){
+        	 sysNoticeVO.setTitle(EnumProcessModel.sswxys.getName());
+          	 sysNoticeVO.setNoticeModule("sswxys");
          }
          //根据仓房id获取仓房名称
          String houseName = "";
@@ -512,6 +533,10 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 	 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());
                  }
                  processAuditMapper.insert(processAudit1);
                  
@@ -644,13 +669,20 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         //根据唯一的流程标识 获取该流程下的所有数据
         QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
         ew.eq("process_id", processId);
+        ew.isNotNull("to_people");
+        ew.isNotNull("from_people");
         List<ProcessAudit> list = processAuditMapper.selectList(ew);
-        map.put("data", list);
+        
+        QueryWrapper<ProcessAudit> we = new QueryWrapper<>();
+        we.eq("process_id", processId);
+        List<ProcessAudit> sonList = processAuditMapper.selectList(we);
+        //map.put("data", list);
         
         int depot = 0;
         int ongoingStep = 0;
         
-        if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")){
+        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){
             	 depot = list.get(0).getDepotId();
                  ongoingStep = Integer.valueOf(list.get(0).getOngoingStep());
@@ -683,29 +715,42 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         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");
         }else{
         	ew1.eq("type", list.get(0).getType());
         }
         
+        
+        
         boolean auditFirst = true; 
         List<ProcessMain> mainList = processMainMapper.selectList(ew1);
         if(mainList.size()>0){
         	for (int i = 0; i < mainList.size(); i++) {
+        		//是否是总经理和分管处审批
+        		QueryWrapper<ProcessAudit> e = new QueryWrapper<>();
+                e.eq("process_id", processId);
+                e.eq("main_id", mainList.get(i).getId());
+                List<ProcessAudit> auditList = processAuditMapper.selectList(e);
+                if(auditList.size()>0){
+                	mainList.get(i).setIsAudit(auditList.get(0).getIsAudit());
+                }
                 QueryWrapper<ProcessSub> ew2 = new QueryWrapper<>();
                 ew2.eq("zid", mainList.get(i).getId());
                 List<ProcessSub> subList = processSubMapper.selectList(ew2);
                 for (int j = 0; j < subList.size(); j++) {
-                    for (int k = 0; k < list.size(); k++) {
-                        if (subList.get(j).getId().equals(list.get(k).getSubId())) {
-                            subList.get(j).setOperationTime(list.get(k).getOperationTime());
-                            subList.get(j).setSubData(list.get(k).getSubData());
+                    for (int k = 0; k < sonList.size(); k++) {
+                        if (subList.get(j).getId().equals(sonList.get(k).getSubId())) {
+                            subList.get(j).setOperationTime(sonList.get(k).getOperationTime());
+                            subList.get(j).setSubData(sonList.get(k).getSubData());
                         }
                     }
                 }
                 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")){
+                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(mainList.get(i).getExistProcess().equals(0)){
@@ -1217,6 +1262,12 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
          }else if(processAudit.getType().equals("xzjh")){
         	 sysNoticeVO.setTitle(EnumProcessModel.xzjh.getName());
           	 sysNoticeVO.setNoticeModule("xzjh");
+         }else if(processAudit.getType().equals("sswxjh")){
+        	 sysNoticeVO.setTitle(EnumProcessModel.sswxjh.getName());
+          	 sysNoticeVO.setNoticeModule("sswxjh");
+         }else if(processAudit.getType().equals("sswxys")){
+        	 sysNoticeVO.setTitle(EnumProcessModel.sswxys.getName());
+          	 sysNoticeVO.setNoticeModule("sswxys");
          }
          //根据仓房id获取仓房名称
          String houseName = "";
@@ -1319,6 +1370,10 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 	 processAudit1.setWorkName(EnumProcessModel.yjly.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());
                  }
                  processAuditMapper.insert(processAudit1);
                  
@@ -1539,18 +1594,17 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                			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());
-                       		}
-               				
+               					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)){