gaodd 4 роки тому
батько
коміт
8dc7b045b5

+ 10 - 9
src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -109,17 +109,9 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
109
             if(operationTime != null){
109
             if(operationTime != null){
110
             	processAudit.setOperationTime(operationTime);
110
             	processAudit.setOperationTime(operationTime);
111
             }
111
             }
112
-            if(houseId != 0 && houseId != null){
113
-            	processAudit.setHouseId(houseId);
114
-            }
112
+            
115
             processAudit.setSubData(subData);
113
             processAudit.setSubData(subData);
116
             processAudit.setType(type);
114
             processAudit.setType(type);
117
-            processAudit.setDepotId(depotId);
118
-            processAudit.setApplyPeople(applyPeople);
119
-            processAudit.setFromPeople(fromPeople);
120
-            processAudit.setToPeople(toPeople);
121
-            processAudit.setApplyTime(applyTime);
122
-            processAudit.setAuditState(0);//已提交
123
             processAudit.setOngoingStep(ongoingStep);
115
             processAudit.setOngoingStep(ongoingStep);
124
             processAudit.setIsAudit(isAudit);
116
             processAudit.setIsAudit(isAudit);
125
             if (type.equals("tf")) {
117
             if (type.equals("tf")) {
@@ -139,6 +131,15 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
139
             }
131
             }
140
 
132
 
141
             if(i == 0 ){
133
             if(i == 0 ){
134
+            	processAudit.setFromPeople(fromPeople);
135
+                processAudit.setToPeople(toPeople);
136
+                if(houseId != 0 && houseId != null){
137
+                	processAudit.setHouseId(houseId);
138
+                }
139
+                processAudit.setDepotId(depotId);
140
+                processAudit.setApplyPeople(applyPeople);
141
+                processAudit.setApplyTime(applyTime);
142
+                processAudit.setAuditState(0);//已提交
142
             	if(ongoingStep.equals(0+"")){//第一个带审批
143
             	if(ongoingStep.equals(0+"")){//第一个带审批
143
 	                processAudit.setResult(1);//第一条数据 保存并审批  1是0否
144
 	                processAudit.setResult(1);//第一条数据 保存并审批  1是0否
144
 	                processAudit.setProcessId(uuId);//唯一的流程标识
145
 	                processAudit.setProcessId(uuId);//唯一的流程标识