Merge branch 'master' of http://101.36.160.140:21044/csc/csc-szls-business

src/main/java/com/unissoft/config/MySecurityMetadataSource.java

@@ -49,7 +49,10 @@ public class MySecurityMetadataSource implements FilterInvocationSecurityMetadat
                     configAttributes2.add(securityConfig);
                     linkedHashMap.put(urlPattern1, configAttributes2);
                 } else {
-                    linkedHashMap.get(urlPattern1).add(securityConfig);
+                    Collection<ConfigAttribute> configAttributes = linkedHashMap.get(urlPattern1);
+                    if(!configAttributes.contains(securityConfig)){
+                        configAttributes.add(securityConfig);
+                    }
                 }
             }
         }

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

@@ -2,8 +2,10 @@ package com.unissoft.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.unissoft.model.QuantityQuality;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -14,6 +16,7 @@ import java.util.List;
  * @author root
  * @since 2021-01-26
  */
+@Mapper
 public interface QuantityQualityMapper extends BaseMapper<QuantityQuality> {
-    public List<QuantityQuality> groudByType(@Param("depotId") String depotId, @Param("depotType") String depotType);
+    List<QuantityQuality> groudByType(@Param("depotId") String depotId, @Param("depotType") String depotType);
 }

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

@@ -16,11 +16,14 @@
         <result column="c_quality" property="cQuality" />
         <result column="c_character" property="cCharacter" />
         <result column="c_toxin_index" property="cToxinIndex" />
+        <result column="save_state" property="saveState" />
+        <result column="m_spare" property="mSpare" />
+        <result column="m_spare2" property="mSpare2" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        q_id, q_type, q_type_name, depot_ypte, depot_id, depot_name, warehouse_id, warehouse_name, create_time, c_quality, c_character, c_toxin_index
+        q_id, q_type, q_type_name, depot_ypte, depot_id, depot_name, warehouse_id, warehouse_name, create_time, c_quality, c_character, c_toxin_index, save_state, m_spare, m_spare2
     </sql>
 
     <select id="groudByType" resultMap="BaseResultMap">

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

@@ -32,8 +32,9 @@ FROM
 	sys_resource t1
 LEFT JOIN project t2 ON t1.`se_project_id` = t2.`id`
 LEFT JOIN sys_resource_role t3 ON t1.`se_id` = t3.`resource_id`
+LEFT JOIN sys_role r ON t3.role_id = r.r_id
 WHERE
 	t2.`code` = #{projectCode}
-AND t1.se_button != '' AND t1.se_button IS NOT NULL
+AND t1.se_button != '' AND t1.se_button IS NOT NULL AND t1.se_button != '/'
     </select>
 </mapper>

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

@@ -75,5 +75,15 @@ public class QuantityQuality implements Serializable {
     @TableField("c_toxin_index")
     private Integer cToxinIndex;
 
+    @ApiModelProperty(value = "0保存，1暂存")
+    @TableField("save_state")
+    private Integer saveState;
 
+    @ApiModelProperty(value = "备用1")
+    @TableField("m_spare")
+    private String mSpare;
+
+    @ApiModelProperty(value = "备用2")
+    @TableField("m_spare2")
+    private String mSpare2;
 }

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

@@ -120,9 +120,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.setHouseId(houseId);
             processAudit.setDepotId(depotId);
             processAudit.setApplyPeople(applyPeople);
             processAudit.setFromPeople(fromPeople);
@@ -168,12 +170,17 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         	sysNoticeVO.setNoticeModule("yjly");
         }
         //根据仓房id获取仓房名称
-        ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + houseId, String.class);
-        com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(forEntity.getBody());
-        BasicsWarehouse ware = com.alibaba.fastjson.JSONObject.toJavaObject(jsonObject, BasicsWarehouse.class);
-        if (null != ware) {
-            sysNoticeVO.setWarehouse(ware.gethName());
+        String houseName = "";
+        if(houseId != null && houseId != 0){
+        	ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + houseId, String.class);
+            com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(forEntity.getBody());
+            BasicsWarehouse ware = com.alibaba.fastjson.JSONObject.toJavaObject(jsonObject, BasicsWarehouse.class);
+            if (null != ware) {
+                sysNoticeVO.setWarehouse(ware.gethName());
+                houseName = ware.gethName() ;
+            }
         }
+        
         //获取申请人的信息
         ResponseEntity<String> userInfos = restTemplate.getForEntity(MyConstant.SYSTEM_USER + applyPeople, String.class);
         com.alibaba.fastjson.JSONObject jsonObjectuser = JSON.parseObject(userInfos.getBody());
@@ -184,7 +191,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             sysNoticeVO.setOrgName(userInfo.getDepotName());//申请人
             sysNoticeVO.setApplyDept(userInfo.getDepartmentName());//申请部门
             sysNoticeVO.setCreateBy(applyPeople);
-            sysNoticeVO.setContent(userInfo.getDepotName()+"-"+ware.gethName()+"-"+"请审批");
+            sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"请审批");
         }
        
         sendNoticeVO.setSysNoticeVO(sysNoticeVO);
@@ -326,12 +333,15 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         if (pageInfo.getTotal() > 0) {
             for (ProcessAudit processAudit : pageInfo.getRecords()) {
                 //根据仓房id获取仓房名称
-                ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + processAudit.getHouseId(), String.class);
-                com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(forEntity.getBody());
-                BasicsWarehouse ware = com.alibaba.fastjson.JSONObject.toJavaObject(jsonObject, BasicsWarehouse.class);
-                if (null != ware) {
-                    processAudit.setHouseName(ware.gethName());
-                }
+            	if(null != processAudit.getHouseId()){
+            		ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + processAudit.getHouseId(), String.class);
+                    com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(forEntity.getBody());
+                    BasicsWarehouse ware = com.alibaba.fastjson.JSONObject.toJavaObject(jsonObject, BasicsWarehouse.class);
+                    if (null != ware) {
+                        processAudit.setHouseName(ware.gethName());
+                    }
+            	}
+                
                 //获取申请人的信息
                 ResponseEntity<String> userInfos = restTemplate.getForEntity(MyConstant.SYSTEM_USER + processAudit.getApplyPeople(), String.class);
                 com.alibaba.fastjson.JSONObject jsonObjectuser = JSON.parseObject(userInfos.getBody());
@@ -384,12 +394,17 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
           	 sysNoticeVO.setNoticeModule("yjly");
          }
          //根据仓房id获取仓房名称
-         ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + processAudit.getHouseId(), String.class);
-         com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(forEntity.getBody());
-         BasicsWarehouse ware = com.alibaba.fastjson.JSONObject.toJavaObject(jsonObject, BasicsWarehouse.class);
-         if (null != ware) {
-             sysNoticeVO.setWarehouse(ware.gethName());
+         String houseName = "";
+         if(null != processAudit.getHouseId()){
+        	 ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + processAudit.getHouseId(), String.class);
+             com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(forEntity.getBody());
+             BasicsWarehouse ware = com.alibaba.fastjson.JSONObject.toJavaObject(jsonObject, BasicsWarehouse.class);
+             if (null != ware) {
+                 sysNoticeVO.setWarehouse(ware.gethName());
+                 houseName = ware.gethName();
+             }
          }
+         
          //获取申请人的信息
          ResponseEntity<String> userInfos = restTemplate.getForEntity(MyConstant.SYSTEM_USER + processAudit.getApplyPeople(), String.class);
          com.alibaba.fastjson.JSONObject jsonObjectuser = JSON.parseObject(userInfos.getBody());
@@ -456,7 +471,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                  /**
                   *  发送通知数据给下一审批人
                   */
-                 sysNoticeVO.setContent(userInfo.getDepotName()+"-"+ware.gethName()+"-"+"审批通过");
+                 sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"审批通过");
                  sysNoticeVO.setNoticeType(30);//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
                 //获取下一审批人的信息
                  ResponseEntity<String> userInfos1 = restTemplate.getForEntity(MyConstant.SYSTEM_USER + toPeople, String.class);
@@ -465,7 +480,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                  users.put(toPeople, userInfo1.getuName());
                  
              }else{//不通过 发送数据给申请人
-             	sysNoticeVO.setContent(userInfo.getDepotName()+"-"+ware.gethName()+"-"+"审批不通过");
+             	sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"审批不通过");
                  sysNoticeVO.setNoticeType(40);//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
                  users.put(processAudit.getApplyPeople(), userInfo.getuName());
              }
@@ -495,10 +510,10 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 
              if((int) auditState >= 3 || (int) auditState ==1){
              	sysNoticeVO.setNoticeType(30);//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
-             	sysNoticeVO.setContent(userInfo.getDepotName()+"-"+ware.gethName()+"-"+"审批通过");
+             	sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"审批通过");
              }else if((int) auditState == 2){
              	sysNoticeVO.setNoticeType(40);//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
-             	sysNoticeVO.setContent(userInfo.getDepotName()+"-"+ware.gethName()+"-"+"审批不通过");
+             	sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"审批不通过");
              }
              users.put(processAudit.getApplyPeople(), userInfo.getuName());
          }
@@ -628,64 +643,66 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 
         //审批流程信息
         List<ProcessBasis> pbList = processBasisService.getBasisByType(list.get(0).getType(), null, list.get(0).getDepotId());
-        if(pbList.get(0).getType().equals("tf")){
-        	 pbList.get(0).setAuditTime(list.get(0).getApplyTime());
-             pbList.get(0).setContent(list.get(0).getApplyPeople());
-             if (list.get(0).getAuditState().equals(0)) {
-                 //已申请，待第一个人审批
-                 pbList.get(1).setAuditState(0);
-                 pbList.get(1).setContent(list.get(0).getToPeople());
-             } else {
-                 //已审批
-                 pbList.get(1).setContent(list.get(0).getToPeople());
-                 pbList.get(1).setAuditTime(list.get(0).getAuditTime());
-                 if ((int) list.get(0).getAuditState() >= 3) {
-                     pbList.get(1).setAuditState(1);
-                 } else if (list.size() > 1 && list.get(0).getAuditState().equals(2)) {//两次审批 第一次通过 第二次不通过 第一条数据的状态是最新的2 则展示通过
-                     pbList.get(1).setAuditState(1);
-                 } else {
-                     pbList.get(1).setAuditState(list.get(0).getAuditState());
-                 }
-                 if (list.size() > 1) {
-                     pbList.get(2).setContent(list.get(1).getToPeople());
-                     pbList.get(2).setAuditTime(list.get(1).getAuditTime());
-                     pbList.get(2).setAuditState(list.get(1).getAuditState());
-                 }
-             }
-        }else{
-        	
-        	//判断是否是通过
-        	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(pbList.size()>0){
+        	if(pbList.get(0).getType().equals("tf") || pbList.get(0).getType().equals("yjly")){
+           	 pbList.get(0).setAuditTime(list.get(0).getApplyTime());
+                pbList.get(0).setContent(list.get(0).getApplyPeople());
+                if (list.get(0).getAuditState().equals(0)) {
+                    //已申请，待第一个人审批
+                    pbList.get(1).setAuditState(0);
+                    pbList.get(1).setContent(list.get(0).getToPeople());
+                } else {
+                    //已审批
+                    pbList.get(1).setContent(list.get(0).getToPeople());
+                    pbList.get(1).setAuditTime(list.get(0).getAuditTime());
+                    if ((int) list.get(0).getAuditState() >= 3) {
+                        pbList.get(1).setAuditState(1);
+                    } else if (list.size() > 1 && list.get(0).getAuditState().equals(2)) {//两次审批 第一次通过 第二次不通过 第一条数据的状态是最新的2 则展示通过
+                        pbList.get(1).setAuditState(1);
+                    } else {
+                        pbList.get(1).setAuditState(list.get(0).getAuditState());
+                    }
+                    if (list.size() > 1) {
+                        pbList.get(2).setContent(list.get(1).getToPeople());
+                        pbList.get(2).setAuditTime(list.get(1).getAuditTime());
+                        pbList.get(2).setAuditState(list.get(1).getAuditState());
+                    }
+                }
+           }else{
+           	
+           	//判断是否是通过
+           	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);
+           	}
+           	
+           }
+        	map.put("audit", pbList);
         }
-        map.put("audit", pbList);
 
         return map;
     }
@@ -720,12 +737,15 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         if (pageInfo.getTotal() > 0) {
             for (ProcessAudit processAudit : pageInfo.getRecords()) {
                 //根据仓房id获取仓房名称
-                ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + processAudit.getHouseId(), String.class);
-                com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(forEntity.getBody());
-                BasicsWarehouse ware = com.alibaba.fastjson.JSONObject.toJavaObject(jsonObject, BasicsWarehouse.class);
-                if (null != ware) {
-                    processAudit.setHouseName(ware.gethName());
-                }
+            	if(null != processAudit.getHouseId()){
+            		ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + processAudit.getHouseId(), String.class);
+                    com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(forEntity.getBody());
+                    BasicsWarehouse ware = com.alibaba.fastjson.JSONObject.toJavaObject(jsonObject, BasicsWarehouse.class);
+                    if (null != ware) {
+                        processAudit.setHouseName(ware.gethName());
+                    }
+            	}
+                
                 //获取申请人的信息
                 ResponseEntity<String> userInfos = restTemplate.getForEntity(MyConstant.SYSTEM_USER + processAudit.getApplyPeople(), String.class);
                 com.alibaba.fastjson.JSONObject jsonObjectuser = JSON.parseObject(userInfos.getBody());
@@ -777,12 +797,15 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         if (pageInfo.getTotal() > 0) {
             for (ProcessAudit processAudit : pageInfo.getRecords()) {
                 //根据仓房id获取仓房名称
-                ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + processAudit.getHouseId(), String.class);
-                com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(forEntity.getBody());
-                BasicsWarehouse ware = com.alibaba.fastjson.JSONObject.toJavaObject(jsonObject, BasicsWarehouse.class);
-                if (null != ware) {
-                    processAudit.setHouseName(ware.gethName());
-                }
+            	if(null != processAudit.getHouseId()){
+            		ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + processAudit.getHouseId(), String.class);
+                    com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(forEntity.getBody());
+                    BasicsWarehouse ware = com.alibaba.fastjson.JSONObject.toJavaObject(jsonObject, BasicsWarehouse.class);
+                    if (null != ware) {
+                        processAudit.setHouseName(ware.gethName());
+                    }
+            	}
+                
                 //获取申请人的信息
                 ResponseEntity<String> userInfos = restTemplate.getForEntity(MyConstant.SYSTEM_USER + processAudit.getApplyPeople(), String.class);
                 com.alibaba.fastjson.JSONObject jsonObjectuser = JSON.parseObject(userInfos.getBody());
@@ -1052,12 +1075,17 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
           	 sysNoticeVO.setNoticeModule("yjly");
          }
          //根据仓房id获取仓房名称
-         ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + processAudit.getHouseId(), String.class);
-         com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(forEntity.getBody());
-         BasicsWarehouse ware = com.alibaba.fastjson.JSONObject.toJavaObject(jsonObject, BasicsWarehouse.class);
-         if (null != ware) {
-             sysNoticeVO.setWarehouse(ware.gethName());
+         String houseName = "";
+         if(null != processAudit.getHouseId()){
+        	 ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + processAudit.getHouseId(), String.class);
+             com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(forEntity.getBody());
+             BasicsWarehouse ware = com.alibaba.fastjson.JSONObject.toJavaObject(jsonObject, BasicsWarehouse.class);
+             if (null != ware) {
+                 sysNoticeVO.setWarehouse(ware.gethName());
+                 houseName = ware.gethName();
+             }
          }
+         
          //获取申请人的信息
          ResponseEntity<String> userInfos = restTemplate.getForEntity(MyConstant.SYSTEM_USER + processAudit.getApplyPeople(), String.class);
          com.alibaba.fastjson.JSONObject jsonObjectuser = JSON.parseObject(userInfos.getBody());
@@ -1096,10 +1124,10 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 
              if((int) auditState >= 3 || (int) auditState ==1){
              	sysNoticeVO.setNoticeType(30);//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
-             	sysNoticeVO.setContent(userInfo.getDepotName()+"-"+ware.gethName()+"-"+"审批通过");
+             	sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"审批通过");
              }else if((int) auditState == 2){
              	sysNoticeVO.setNoticeType(40);//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
-             	sysNoticeVO.setContent(userInfo.getDepotName()+"-"+ware.gethName()+"-"+"审批不通过");
+             	sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"审批不通过");
              }
              users.put(processAudit.getApplyPeople(), userInfo.getuName());
         	 
@@ -1141,7 +1169,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                  /**
                   *  发送通知数据给下一审批人
                   */
-                 sysNoticeVO.setContent(userInfo.getDepotName()+"-"+ware.gethName()+"-"+"审批通过");
+                 sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"审批通过");
                  sysNoticeVO.setNoticeType(30);//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
                 //获取下一审批人的信息
                  ResponseEntity<String> userInfos1 = restTemplate.getForEntity(MyConstant.SYSTEM_USER + toPeople, String.class);
@@ -1153,7 +1181,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             	 allPaList.get(0).setAuditState(auditState);
                  allPaList.get(0).setOngoingStep(ongoingStep);
                  processAuditMapper.updateById(allPaList.get(0));
-             	 sysNoticeVO.setContent(userInfo.getDepotName()+"-"+ware.gethName()+"-"+"审批不通过");
+             	 sysNoticeVO.setContent(userInfo.getDepotName()+"-"+houseName+"-"+"审批不通过");
                  sysNoticeVO.setNoticeType(40);//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
                  users.put(processAudit.getApplyPeople(), userInfo.getuName());
              }
@@ -1172,56 +1200,64 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 		// TODO Auto-generated method stub
 		
         JSONObject jsStr = new JSONObject(parameter);
-        String processId = UUID.randomUUID().toString();//生成一个流程id
+        String processId = "";
+        if(null != jsStr.optString("processId") && "" != jsStr.optString("processId")){
+        	 processId = jsStr.optString("processId");//流程id 用于修改
+        }else{
+        	 processId = UUID.randomUUID().toString();//生成一个流程id
+        }
+        
         String type = jsStr.optString("type");//流程类型
-        Integer houseId = jsStr.optInt("houseId");//仓房id
         Integer depotId = jsStr.optInt("depotId");//库id
+        Integer auditState = jsStr.optInt("auditState");//状态
         JSONArray jsonArray = jsStr.optJSONArray("subList");//子流程数据
         JSONObject row = null;
         for (int i = 0; i < jsonArray.length(); i++) {
             row = jsonArray.getJSONObject(i);
             Integer subData = row.optInt("subData");//子流程数据
             String operationTime = row.optString("operationTime");//子流程的操作时间
-            Integer auditId = row.optInt("auditId");//每条数据的id
+            Integer subId = row.optInt("subId");//子流程id
             QueryWrapper<ProcessAudit> ew1 = new QueryWrapper<>();
             ew1.eq("process_id", processId);
             ew1.eq("type", type);
             List<ProcessAudit> list = processAuditMapper.selectList(ew1);
-            if (list.size() > 0) {
-            	if(null != auditId && 0 != auditId){
-            		 //修改
-            		for (ProcessAudit processAudit : list) {
-             		   if(processAudit.getId().equals(auditId)){
-             			  if (!processAudit.getSubData().equals(subData)) {
-             				   processAudit.setSubData(subData);
-             				   processAudit.setOperationTime(operationTime);
-                               processAuditMapper.updateById(processAudit);
-                          }
-                 	   }
- 			        }
-            	}else{
-            		//新增
-                    ProcessAudit processAudit = new ProcessAudit();
-                    processAudit.setType(type);
-                    processAudit.setSubData(subData);
-                    processAudit.setOperationTime(operationTime);
-                    processAudit.setHouseId(houseId);
-                    processAudit.setDepotId(depotId);
-                    processAudit.setProcessId(processId);
-                    processAuditMapper.insert(processAudit);
-            	}
-               
-                
-            } else {
-                //第一条数据新增
+            if(list.size() > 0){//修改
+            	QueryWrapper<ProcessAudit> ew2 = new QueryWrapper<>();
+            	ew2.eq("process_id", processId);
+            	ew2.eq("type", type);
+            	ew2.eq("sub_id", subId);
+                List<ProcessAudit> list1 = processAuditMapper.selectList(ew2);
+                if(list1.size()>0){
+                	for (ProcessAudit processAudit : list1) {
+                		if(processAudit.getSubId().equals(subId) && !processAudit.getSubData().equals(subData)){
+                			//修改
+                			processAudit.setSubData(subData);
+          				    processAudit.setOperationTime(operationTime);
+                            processAuditMapper.updateById(processAudit);
+                		}
+    				}
+                }else{
+                	//新增
+                    ProcessAudit processAudit1 = new ProcessAudit();
+                    processAudit1.setType(type);
+                    processAudit1.setSubId(subId);
+                    processAudit1.setSubData(subData);
+                    processAudit1.setOperationTime(operationTime);
+                    processAudit1.setDepotId(depotId);
+                    processAudit1.setProcessId(processId);
+                    processAuditMapper.insert(processAudit1);
+                }
+            }else{
+            	//第一条数据新增
                 ProcessAudit processAudit = new ProcessAudit();
                 processAudit.setType(type);
                 processAudit.setSubData(subData);
+                processAudit.setSubId(subId);
                 processAudit.setOperationTime(operationTime);
-                processAudit.setHouseId(houseId);
                 processAudit.setDepotId(depotId);
                 processAudit.setResult(2);//第一条数据 保存并审批  1是0否 2和流程无关的数据
                 processAudit.setProcessId(processId);
+                processAudit.setAuditState(auditState);
                 Date date = new Date();
                 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                 String dateString = formatter.format(date);
@@ -1230,6 +1266,16 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             }
 
         }
+        QueryWrapper<ProcessAudit> ew2 = new QueryWrapper<>();
+    	ew2.eq("process_id", processId);
+    	ew2.eq("type", type);
+    	ew2.eq("result", 2);
+        List<ProcessAudit> list2 = processAuditMapper.selectList(ew2);
+        if(!list2.get(0).getAuditState().equals(auditState)){
+        	//修改第一条数据的状态
+            list2.get(0).setAuditState(auditState);
+    		processAuditMapper.updateById(list2.get(0));
+        }
     
 	}