Quellcode durchsuchen

Merge remote-tracking branch 'origin/master'

my-csc-config-file.git vor 4 Jahren
Ursprung
Commit
e25c318d7e

+ 7 - 9
src/main/java/com/unissoft/mapper/ProcessAuditMapper.java

@@ -1,24 +1,22 @@
1
 package com.unissoft.mapper;
1
 package com.unissoft.mapper;
2
 
2
 
3
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
 import com.unissoft.model.ProcessAudit;
3
 import com.unissoft.model.ProcessAudit;
5
-import org.springframework.stereotype.Repository;
6
 
4
 
7
 import java.util.List;
5
 import java.util.List;
8
 
6
 
7
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
8
+
9
 /**
9
 /**
10
  * <p>
10
  * <p>
11
- *  Mapper 接口
11
+ * 流程审批表 Mapper 接口
12
  * </p>
12
  * </p>
13
  *
13
  *
14
- * @author My SunShine
15
- * @since 2020-12-28
14
+ * @author My sunShine
15
+ * @since 2021-04-06
16
  */
16
  */
17
-@Repository
18
 public interface ProcessAuditMapper extends BaseMapper<ProcessAudit> {
17
 public interface ProcessAuditMapper extends BaseMapper<ProcessAudit> {
19
 
18
 
20
-    List<ProcessAudit> getToBeDone(List<Integer> list);
21
-
22
-    List<ProcessAudit> getCurrentMonthData();
19
+	 List<ProcessAudit> getToBeDone(List<Integer> list);
23
 
20
 
21
+	 List<ProcessAudit> getCurrentMonthData();
24
 }
22
 }

+ 4 - 3
src/main/java/com/unissoft/mapper/ProcessAuditMapper.xml

@@ -20,6 +20,7 @@
20
         <result column="audit_time" property="auditTime" />
20
         <result column="audit_time" property="auditTime" />
21
         <result column="process_id" property="processId" />
21
         <result column="process_id" property="processId" />
22
         <result column="ongoing_step" property="ongoingStep" />
22
         <result column="ongoing_step" property="ongoingStep" />
23
+        <result column="is_audit" property="isAudit" />
23
         <result column="apply_time" property="applyTime" />
24
         <result column="apply_time" property="applyTime" />
24
         <result column="work_name" property="workName" />
25
         <result column="work_name" property="workName" />
25
         <result column="start_date" property="startDate" />
26
         <result column="start_date" property="startDate" />
@@ -29,10 +30,10 @@
29
 
30
 
30
     <!-- 通用查询结果列 -->
31
     <!-- 通用查询结果列 -->
31
     <sql id="Base_Column_List">
32
     <sql id="Base_Column_List">
32
-        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
33
+        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
33
     </sql>
34
     </sql>
34
-
35
-    <select id="getToBeDone" parameterType="list" resultType="com.unissoft.model.ProcessAudit">
35
+    
36
+     <select id="getToBeDone" parameterType="list" resultType="com.unissoft.model.ProcessAudit">
36
         select
37
         select
37
         <include refid="Base_Column_List"/>
38
         <include refid="Base_Column_List"/>
38
         from process_audit pa
39
         from process_audit pa

+ 3 - 1
src/main/java/com/unissoft/model/EnumProcessModel.java

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

+ 198 - 180
src/main/java/com/unissoft/model/ProcessAudit.java

@@ -9,23 +9,27 @@ import com.baomidou.mybatisplus.annotation.TableField;
9
 import java.io.Serializable;
9
 import java.io.Serializable;
10
 import io.swagger.annotations.ApiModel;
10
 import io.swagger.annotations.ApiModel;
11
 import io.swagger.annotations.ApiModelProperty;
11
 import io.swagger.annotations.ApiModelProperty;
12
+import lombok.Data;
13
+import lombok.EqualsAndHashCode;
12
 
14
 
13
 /**
15
 /**
14
  * <p>
16
  * <p>
15
- * 
17
+ * 流程审批表
16
  * </p>
18
  * </p>
17
  *
19
  *
18
- * @author My SunShine
19
- * @since 2020-12-28
20
+ * @author My sunShine
21
+ * @since 2021-04-06
20
  */
22
  */
23
+@Data
24
+@EqualsAndHashCode(callSuper = false)
21
 @TableName("process_audit")
25
 @TableName("process_audit")
22
-@ApiModel(value="ProcessAudit对象", description="")
26
+@ApiModel(value="ProcessAudit对象", description="流程审批表")
23
 public class ProcessAudit implements Serializable {
27
 public class ProcessAudit implements Serializable {
24
 
28
 
25
     private static final long serialVersionUID = 1L;
29
     private static final long serialVersionUID = 1L;
26
 
30
 
27
     
31
     
28
-  //业务字段
32
+    //业务字段
29
     @TableField(exist = false)
33
     @TableField(exist = false)
30
     private String houseName;
34
     private String houseName;
31
     @TableField(exist = false)
35
     @TableField(exist = false)
@@ -83,7 +87,7 @@ public class ProcessAudit implements Serializable {
83
     @TableField("sub_id")
87
     @TableField("sub_id")
84
     private Integer subId;
88
     private Integer subId;
85
 
89
 
86
-    @ApiModelProperty(value = "子流程的数据(1:是,0:否)")
90
+    @ApiModelProperty(value = "子流程的数据(0:是,1:否)")
87
     @TableField("sub_data")
91
     @TableField("sub_data")
88
     private Integer subData;
92
     private Integer subData;
89
 
93
 
@@ -135,6 +139,10 @@ public class ProcessAudit implements Serializable {
135
     @TableField("ongoing_step")
139
     @TableField("ongoing_step")
136
     private String ongoingStep;
140
     private String ongoingStep;
137
 
141
 
142
+    @ApiModelProperty(value = "是否提交给总经理和分公司审批(0否1是)")
143
+    @TableField("is_audit")
144
+    private Integer isAudit;
145
+
138
     @ApiModelProperty(value = "申请时间")
146
     @ApiModelProperty(value = "申请时间")
139
     @TableField("apply_time")
147
     @TableField("apply_time")
140
     private String applyTime;
148
     private String applyTime;
@@ -143,6 +151,7 @@ public class ProcessAudit implements Serializable {
143
     @TableField("work_name")
151
     @TableField("work_name")
144
     private String workName;
152
     private String workName;
145
 
153
 
154
+    
146
     @ApiModelProperty(value = "办理开始时间")
155
     @ApiModelProperty(value = "办理开始时间")
147
     @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm",timezone="GMT+8")
156
     @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm",timezone="GMT+8")
148
     @TableField("start_date")
157
     @TableField("start_date")
@@ -157,178 +166,187 @@ public class ProcessAudit implements Serializable {
157
     @TableField("to_page")
166
     @TableField("to_page")
158
     private String toPage;
167
     private String toPage;
159
 
168
 
160
-    public Integer getId() {
161
-        return id;
162
-    }
163
-
164
-    public void setId(Integer id) {
165
-        this.id = id;
166
-    }
167
-    public Integer getMainId() {
168
-        return mainId;
169
-    }
170
-
171
-    public void setMainId(Integer mainId) {
172
-        this.mainId = mainId;
173
-    }
174
-    public Integer getSubId() {
175
-        return subId;
176
-    }
177
-
178
-    public void setSubId(Integer subId) {
179
-        this.subId = subId;
180
-    }
181
-    public Integer getSubData() {
182
-        return subData;
183
-    }
184
-
185
-    public void setSubData(Integer subData) {
186
-        this.subData = subData;
187
-    }
188
-    public Integer getAuditState() {
189
-        return auditState;
190
-    }
191
-
192
-    public void setAuditState(Integer auditState) {
193
-        this.auditState = auditState;
194
-    }
195
-    public String getOperationTime() {
196
-        return operationTime;
197
-    }
198
-
199
-    public void setOperationTime(String operationTime) {
200
-        this.operationTime = operationTime;
201
-    }
202
-    public String getType() {
203
-        return type;
204
-    }
205
-
206
-    public void setType(String type) {
207
-        this.type = type;
208
-    }
209
-    public Integer getHouseId() {
210
-        return houseId;
211
-    }
212
-
213
-    public void setHouseId(Integer houseId) {
214
-        this.houseId = houseId;
215
-    }
216
-    public Integer getDepotId() {
217
-        return depotId;
218
-    }
219
-
220
-    public void setDepotId(Integer depotId) {
221
-        this.depotId = depotId;
222
-    }
223
-    public Integer getFromPeople() {
224
-        return fromPeople;
225
-    }
226
-
227
-    public void setFromPeople(Integer fromPeople) {
228
-        this.fromPeople = fromPeople;
229
-    }
230
-    public Integer getToPeople() {
231
-        return toPeople;
232
-    }
233
-
234
-    public void setToPeople(Integer toPeople) {
235
-        this.toPeople = toPeople;
236
-    }
237
-    public Integer getResult() {
238
-        return result;
239
-    }
240
-
241
-    public void setResult(Integer result) {
242
-        this.result = result;
243
-    }
244
-    public Integer getApplyPeople() {
245
-        return applyPeople;
246
-    }
247
-
248
-    public void setApplyPeople(Integer applyPeople) {
249
-        this.applyPeople = applyPeople;
250
-    }
251
-    public String getAuditTime() {
252
-        return auditTime;
253
-    }
254
-
255
-    public void setAuditTime(String auditTime) {
256
-        this.auditTime = auditTime;
257
-    }
258
-    public String getProcessId() {
259
-        return processId;
260
-    }
261
-
262
-    public void setProcessId(String processId) {
263
-        this.processId = processId;
264
-    }
265
-    public String getOngoingStep() {
266
-        return ongoingStep;
267
-    }
268
-
269
-    public void setOngoingStep(String ongoingStep) {
270
-        this.ongoingStep = ongoingStep;
271
-    }
272
-    public String getApplyTime() {
273
-        return applyTime;
274
-    }
275
-
276
-    public void setApplyTime(String applyTime) {
277
-        this.applyTime = applyTime;
278
-    }
279
-    public String getWorkName() {
280
-        return workName;
281
-    }
282
-
283
-    public void setWorkName(String workName) {
284
-        this.workName = workName;
285
-    }
286
-    public Date getStartDate() {
287
-        return startDate;
288
-    }
289
-
290
-    public void setStartDate(Date startDate) {
291
-        this.startDate = startDate;
292
-    }
293
-    public Date getEndDate() {
294
-        return endDate;
295
-    }
296
-
297
-    public void setEndDate(Date endDate) {
298
-        this.endDate = endDate;
299
-    }
300
-    public String getToPage() {
301
-        return toPage;
302
-    }
303
-
304
-    public void setToPage(String toPage) {
305
-        this.toPage = toPage;
306
-    }
307
-
308
-    @Override
309
-    public String toString() {
310
-        return "ProcessAudit{" +
311
-            "id=" + id +
312
-            ", mainId=" + mainId +
313
-            ", subId=" + subId +
314
-            ", subData=" + subData +
315
-            ", auditState=" + auditState +
316
-            ", operationTime=" + operationTime +
317
-            ", type=" + type +
318
-            ", houseId=" + houseId +
319
-            ", depotId=" + depotId +
320
-            ", fromPeople=" + fromPeople +
321
-            ", toPeople=" + toPeople +
322
-            ", result=" + result +
323
-            ", applyPeople=" + applyPeople +
324
-            ", auditTime=" + auditTime +
325
-            ", processId=" + processId +
326
-            ", ongoingStep=" + ongoingStep +
327
-            ", applyTime=" + applyTime +
328
-            ", workName=" + workName +
329
-            ", startDate=" + startDate +
330
-            ", endDate=" + endDate +
331
-            ", toPage=" + toPage +
332
-        "}";
333
-    }
169
+
170
+
171
+
172
+
173
+	public Integer getId() {
174
+		return id;
175
+	}
176
+
177
+	public void setId(Integer id) {
178
+		this.id = id;
179
+	}
180
+
181
+	public Integer getMainId() {
182
+		return mainId;
183
+	}
184
+
185
+	public void setMainId(Integer mainId) {
186
+		this.mainId = mainId;
187
+	}
188
+
189
+	public Integer getSubId() {
190
+		return subId;
191
+	}
192
+
193
+	public void setSubId(Integer subId) {
194
+		this.subId = subId;
195
+	}
196
+
197
+	public Integer getSubData() {
198
+		return subData;
199
+	}
200
+
201
+	public void setSubData(Integer subData) {
202
+		this.subData = subData;
203
+	}
204
+
205
+	public Integer getAuditState() {
206
+		return auditState;
207
+	}
208
+
209
+	public void setAuditState(Integer auditState) {
210
+		this.auditState = auditState;
211
+	}
212
+
213
+	public String getOperationTime() {
214
+		return operationTime;
215
+	}
216
+
217
+	public void setOperationTime(String operationTime) {
218
+		this.operationTime = operationTime;
219
+	}
220
+
221
+	public String getType() {
222
+		return type;
223
+	}
224
+
225
+	public void setType(String type) {
226
+		this.type = type;
227
+	}
228
+
229
+	public Integer getHouseId() {
230
+		return houseId;
231
+	}
232
+
233
+	public void setHouseId(Integer houseId) {
234
+		this.houseId = houseId;
235
+	}
236
+
237
+	public Integer getDepotId() {
238
+		return depotId;
239
+	}
240
+
241
+	public void setDepotId(Integer depotId) {
242
+		this.depotId = depotId;
243
+	}
244
+
245
+	public Integer getFromPeople() {
246
+		return fromPeople;
247
+	}
248
+
249
+	public void setFromPeople(Integer fromPeople) {
250
+		this.fromPeople = fromPeople;
251
+	}
252
+
253
+	public Integer getToPeople() {
254
+		return toPeople;
255
+	}
256
+
257
+	public void setToPeople(Integer toPeople) {
258
+		this.toPeople = toPeople;
259
+	}
260
+
261
+	public Integer getResult() {
262
+		return result;
263
+	}
264
+
265
+	public void setResult(Integer result) {
266
+		this.result = result;
267
+	}
268
+
269
+	public Integer getApplyPeople() {
270
+		return applyPeople;
271
+	}
272
+
273
+	public void setApplyPeople(Integer applyPeople) {
274
+		this.applyPeople = applyPeople;
275
+	}
276
+
277
+	public String getAuditTime() {
278
+		return auditTime;
279
+	}
280
+
281
+	public void setAuditTime(String auditTime) {
282
+		this.auditTime = auditTime;
283
+	}
284
+
285
+	public String getProcessId() {
286
+		return processId;
287
+	}
288
+
289
+	public void setProcessId(String processId) {
290
+		this.processId = processId;
291
+	}
292
+
293
+	public String getOngoingStep() {
294
+		return ongoingStep;
295
+	}
296
+
297
+	public void setOngoingStep(String ongoingStep) {
298
+		this.ongoingStep = ongoingStep;
299
+	}
300
+
301
+	public Integer getIsAudit() {
302
+		return isAudit;
303
+	}
304
+
305
+	public void setIsAudit(Integer isAudit) {
306
+		this.isAudit = isAudit;
307
+	}
308
+
309
+	public String getApplyTime() {
310
+		return applyTime;
311
+	}
312
+
313
+	public void setApplyTime(String applyTime) {
314
+		this.applyTime = applyTime;
315
+	}
316
+
317
+	public String getWorkName() {
318
+		return workName;
319
+	}
320
+
321
+	public void setWorkName(String workName) {
322
+		this.workName = workName;
323
+	}
324
+
325
+	public Date getStartDate() {
326
+		return startDate;
327
+	}
328
+
329
+	public void setStartDate(Date startDate) {
330
+		this.startDate = startDate;
331
+	}
332
+
333
+	public Date getEndDate() {
334
+		return endDate;
335
+	}
336
+
337
+	public void setEndDate(Date endDate) {
338
+		this.endDate = endDate;
339
+	}
340
+
341
+	public String getToPage() {
342
+		return toPage;
343
+	}
344
+
345
+	public void setToPage(String toPage) {
346
+		this.toPage = toPage;
347
+	}
348
+    
349
+    
350
+
351
+
334
 }
352
 }

+ 16 - 1
src/main/java/com/unissoft/model/ProcessMain.java

@@ -22,7 +22,22 @@ public class ProcessMain implements Serializable {
22
 
22
 
23
     private static final long serialVersionUID = 1L;
23
     private static final long serialVersionUID = 1L;
24
 
24
 
25
-    @ApiModelProperty(value = "主流程表")
25
+    //业务数据
26
+    @TableField(exist = false)
27
+    private Integer isAudit;
28
+    
29
+    
30
+    
31
+    
32
+    public Integer getIsAudit() {
33
+		return isAudit;
34
+	}
35
+
36
+	public void setIsAudit(Integer isAudit) {
37
+		this.isAudit = isAudit;
38
+	}
39
+
40
+	@ApiModelProperty(value = "主流程表")
26
     @TableId(value = "id", type = IdType.AUTO)
41
     @TableId(value = "id", type = IdType.AUTO)
27
     private Integer id;
42
     private Integer id;
28
 
43
 

+ 87 - 33
src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -82,13 +82,15 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
82
         Integer applyPeople = jsStr.optInt("applyPeople");//申请人id
82
         Integer applyPeople = jsStr.optInt("applyPeople");//申请人id
83
         Integer fromPeople = jsStr.optInt("fromPeople");//提交人id
83
         Integer fromPeople = jsStr.optInt("fromPeople");//提交人id
84
         String applyTime = jsStr.optString("applyTime");//申请时间
84
         String applyTime = jsStr.optString("applyTime");//申请时间
85
+        Integer isAudit = jsStr.optInt("isAudit");//是否提交给总经理和分公司审批
85
         //获取审批人
86
         //获取审批人
86
         List<ProcessBasis> pbList = processBasisService.getBasisByType(type, null, depotId);
87
         List<ProcessBasis> pbList = processBasisService.getBasisByType(type, null, depotId);
87
         Integer toPeople = pbList.get(1).getContent();
88
         Integer toPeople = pbList.get(1).getContent();
88
 
89
 
89
         String ongoingStep = jsStr.optString("ongoingStep");//进行到哪一步的主流程id
90
         String ongoingStep = jsStr.optString("ongoingStep");//进行到哪一步的主流程id
90
     	org.json.JSONArray jsonArray = jsStr.optJSONArray("subList");//子流程数据
91
     	org.json.JSONArray jsonArray = jsStr.optJSONArray("subList");//子流程数据
91
-        JSONObject row = null;
92
+        JSONObject row = null; 
93
+        String uuId = UUID.randomUUID().toString();//唯一的流程标识
92
         for (int i = 0; i < jsonArray.length(); i++) {
94
         for (int i = 0; i < jsonArray.length(); i++) {
93
             row = jsonArray.getJSONObject(i);
95
             row = jsonArray.getJSONObject(i);
94
             Integer mainId = row.optInt("mainId");//主流程id
96
             Integer mainId = row.optInt("mainId");//主流程id
@@ -107,18 +109,11 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
107
             if(operationTime != null){
109
             if(operationTime != null){
108
             	processAudit.setOperationTime(operationTime);
110
             	processAudit.setOperationTime(operationTime);
109
             }
111
             }
110
-            if(houseId != 0 && houseId != null){
111
-            	processAudit.setHouseId(houseId);
112
-            }
112
+            
113
             processAudit.setSubData(subData);
113
             processAudit.setSubData(subData);
114
             processAudit.setType(type);
114
             processAudit.setType(type);
115
-            processAudit.setDepotId(depotId);
116
-            processAudit.setApplyPeople(applyPeople);
117
-            processAudit.setFromPeople(fromPeople);
118
-            processAudit.setToPeople(toPeople);
119
-            processAudit.setApplyTime(applyTime);
120
-            processAudit.setAuditState(0);//已提交
121
             processAudit.setOngoingStep(ongoingStep);
115
             processAudit.setOngoingStep(ongoingStep);
116
+            processAudit.setIsAudit(isAudit);
122
             if (type.equals("tf")) {
117
             if (type.equals("tf")) {
123
                 processAudit.setWorkName(EnumProcessModel.tf.getName());
118
                 processAudit.setWorkName(EnumProcessModel.tf.getName());
124
             }else if(type.equals("yjcg")){
119
             }else if(type.equals("yjcg")){
@@ -129,12 +124,25 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
129
             	processAudit.setWorkName(EnumProcessModel.xzjh.getName());
124
             	processAudit.setWorkName(EnumProcessModel.xzjh.getName());
130
             }else if(type.equals("xzsq")){
125
             }else if(type.equals("xzsq")){
131
             	processAudit.setWorkName(EnumProcessModel.xzsq.getName());
126
             	processAudit.setWorkName(EnumProcessModel.xzsq.getName());
127
+            }else if(type.equals("sswxjh")){
128
+            	processAudit.setWorkName(EnumProcessModel.sswxjh.getName());
129
+            }else if(type.equals("sswxys")){
130
+            	processAudit.setWorkName(EnumProcessModel.sswxys.getName());
132
             }
131
             }
133
 
132
 
134
             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);//已提交
135
             	if(ongoingStep.equals(0+"")){//第一个带审批
143
             	if(ongoingStep.equals(0+"")){//第一个带审批
136
 	                processAudit.setResult(1);//第一条数据 保存并审批  1是0否
144
 	                processAudit.setResult(1);//第一条数据 保存并审批  1是0否
137
-	                processAudit.setProcessId(UUID.randomUUID().toString());//唯一的流程标识
145
+	                processAudit.setProcessId(uuId);//唯一的流程标识
138
                 }else{ //其他步骤带审批的
146
                 }else{ //其他步骤带审批的
139
             		//修改第一条数据
147
             		//修改第一条数据
140
             		QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
148
             		QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
@@ -148,7 +156,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
148
                 }
156
                 }
149
             }else{
157
             }else{
150
             	processAudit.setResult(0);// 保存并审批  1是0否
158
             	processAudit.setResult(0);// 保存并审批  1是0否
151
-                processAudit.setProcessId((String) jsonArray.getJSONObject(0).get("processId")); //多条数据时,流程标识取第一条的
159
+                processAudit.setProcessId(uuId); //多条数据时,流程标识取第一条的
152
             }
160
             }
153
             processAuditMapper.insert(processAudit);
161
             processAuditMapper.insert(processAudit);
154
         }
162
         }
@@ -177,6 +185,12 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
177
         }else if(type.equals("xzsq")){
185
         }else if(type.equals("xzsq")){
178
         	sysNoticeVO.setTitle(EnumProcessModel.xzsq.getName());
186
         	sysNoticeVO.setTitle(EnumProcessModel.xzsq.getName());
179
         	sysNoticeVO.setNoticeModule("xzsq");
187
         	sysNoticeVO.setNoticeModule("xzsq");
188
+        }else if(type.equals("sswxjh")){
189
+        	sysNoticeVO.setTitle(EnumProcessModel.sswxjh.getName());
190
+        	sysNoticeVO.setNoticeModule("sswxjh");
191
+        }else if(type.equals("sswxys")){
192
+        	sysNoticeVO.setTitle(EnumProcessModel.sswxys.getName());
193
+        	sysNoticeVO.setNoticeModule("sswxys");
180
         }
194
         }
181
         
195
         
182
         //根据仓房id获取仓房名称
196
         //根据仓房id获取仓房名称
@@ -232,8 +246,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
232
         if (!StringUtils.isEmpty(pageParam.getCondition())) {
246
         if (!StringUtils.isEmpty(pageParam.getCondition())) {
233
             org.json.JSONObject object = new org.json.JSONObject(pageParam.getCondition());
247
             org.json.JSONObject object = new org.json.JSONObject(pageParam.getCondition());
234
             if (StringUtils.isNotBlank(object.optString("type"))) {
248
             if (StringUtils.isNotBlank(object.optString("type"))) {
235
-            	if(object.optString("type").equals("xz")){
236
-            		ew.like("type", "xz");
249
+            	if(object.optString("type").equals("xz") || object.optString("type").equals("sswx")){
250
+            		ew.like("type",object.optString("type"));
237
             		ew.eq("result", 1);//取第一条数据
251
             		ew.eq("result", 1);//取第一条数据
238
             	}else{
252
             	}else{
239
             		ew.eq("type", object.optString("type"));
253
             		ew.eq("type", object.optString("type"));
@@ -243,6 +257,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
243
                     	ew.eq("result", 1);//取第一条数据
257
                     	ew.eq("result", 1);//取第一条数据
244
                     }
258
                     }
245
             	}
259
             	}
260
+            	
246
             }else{
261
             }else{
247
             	ew.eq("result", 1);//取第一条数据
262
             	ew.eq("result", 1);//取第一条数据
248
             }
263
             }
@@ -429,6 +444,12 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
429
          }else if(processAudit.getType().equals("xzjh")){
444
          }else if(processAudit.getType().equals("xzjh")){
430
         	 sysNoticeVO.setTitle(EnumProcessModel.xzjh.getName());
445
         	 sysNoticeVO.setTitle(EnumProcessModel.xzjh.getName());
431
           	 sysNoticeVO.setNoticeModule("xzjh");
446
           	 sysNoticeVO.setNoticeModule("xzjh");
447
+         }else if(processAudit.getType().equals("sswxjh")){
448
+        	 sysNoticeVO.setTitle(EnumProcessModel.sswxjh.getName());
449
+          	 sysNoticeVO.setNoticeModule("sswxjh");
450
+         }else if(processAudit.getType().equals("sswxys")){
451
+        	 sysNoticeVO.setTitle(EnumProcessModel.sswxys.getName());
452
+          	 sysNoticeVO.setNoticeModule("sswxys");
432
          }
453
          }
433
          //根据仓房id获取仓房名称
454
          //根据仓房id获取仓房名称
434
          String houseName = "";
455
          String houseName = "";
@@ -512,6 +533,10 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
512
                 	 processAudit1.setWorkName(EnumProcessModel.xzsq.getName());
533
                 	 processAudit1.setWorkName(EnumProcessModel.xzsq.getName());
513
                  }else if(processAudit.getType().equals("xzjh")){
534
                  }else if(processAudit.getType().equals("xzjh")){
514
                 	 processAudit1.setWorkName(EnumProcessModel.xzjh.getName());
535
                 	 processAudit1.setWorkName(EnumProcessModel.xzjh.getName());
536
+                 }else if(processAudit.getType().equals("sswxjh")){
537
+                	 processAudit1.setWorkName(EnumProcessModel.sswxjh.getName());
538
+                 }else if(processAudit.getType().equals("sswxys")){
539
+                	 processAudit1.setWorkName(EnumProcessModel.sswxys.getName());
515
                  }
540
                  }
516
                  processAuditMapper.insert(processAudit1);
541
                  processAuditMapper.insert(processAudit1);
517
                  
542
                  
@@ -644,13 +669,20 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
644
         //根据唯一的流程标识 获取该流程下的所有数据
669
         //根据唯一的流程标识 获取该流程下的所有数据
645
         QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
670
         QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
646
         ew.eq("process_id", processId);
671
         ew.eq("process_id", processId);
672
+        ew.isNotNull("to_people");
673
+        ew.isNotNull("from_people");
647
         List<ProcessAudit> list = processAuditMapper.selectList(ew);
674
         List<ProcessAudit> list = processAuditMapper.selectList(ew);
648
-        map.put("data", list);
675
+        
676
+        QueryWrapper<ProcessAudit> we = new QueryWrapper<>();
677
+        we.eq("process_id", processId);
678
+        List<ProcessAudit> sonList = processAuditMapper.selectList(we);
679
+        //map.put("data", list);
649
         
680
         
650
         int depot = 0;
681
         int depot = 0;
651
         int ongoingStep = 0;
682
         int ongoingStep = 0;
652
         
683
         
653
-        if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")){
684
+        if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq") || 
685
+        		list.get(0).getType().equals("sswxjh") || list.get(0).getType().equals("sswxys")){
654
             if(list.size()>0){
686
             if(list.size()>0){
655
             	 depot = list.get(0).getDepotId();
687
             	 depot = list.get(0).getDepotId();
656
                  ongoingStep = Integer.valueOf(list.get(0).getOngoingStep());
688
                  ongoingStep = Integer.valueOf(list.get(0).getOngoingStep());
@@ -683,29 +715,42 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
683
         QueryWrapper<ProcessMain> ew1 = new QueryWrapper<>();
715
         QueryWrapper<ProcessMain> ew1 = new QueryWrapper<>();
684
         if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")){
716
         if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")){
685
         	ew1.eq("type", "xz");
717
         	ew1.eq("type", "xz");
718
+        }else if(list.get(0).getType().equals("sswxjh") || list.get(0).getType().equals("sswxys")){
719
+        	ew1.eq("type", "sswx");
686
         }else{
720
         }else{
687
         	ew1.eq("type", list.get(0).getType());
721
         	ew1.eq("type", list.get(0).getType());
688
         }
722
         }
689
         
723
         
724
+        
725
+        
690
         boolean auditFirst = true; 
726
         boolean auditFirst = true; 
691
         List<ProcessMain> mainList = processMainMapper.selectList(ew1);
727
         List<ProcessMain> mainList = processMainMapper.selectList(ew1);
692
         if(mainList.size()>0){
728
         if(mainList.size()>0){
693
         	for (int i = 0; i < mainList.size(); i++) {
729
         	for (int i = 0; i < mainList.size(); i++) {
730
+        		//是否是总经理和分管处审批
731
+        		QueryWrapper<ProcessAudit> e = new QueryWrapper<>();
732
+                e.eq("process_id", processId);
733
+                e.eq("main_id", mainList.get(i).getId());
734
+                List<ProcessAudit> auditList = processAuditMapper.selectList(e);
735
+                if(auditList.size()>0){
736
+                	mainList.get(i).setIsAudit(auditList.get(0).getIsAudit());
737
+                }
694
                 QueryWrapper<ProcessSub> ew2 = new QueryWrapper<>();
738
                 QueryWrapper<ProcessSub> ew2 = new QueryWrapper<>();
695
                 ew2.eq("zid", mainList.get(i).getId());
739
                 ew2.eq("zid", mainList.get(i).getId());
696
                 List<ProcessSub> subList = processSubMapper.selectList(ew2);
740
                 List<ProcessSub> subList = processSubMapper.selectList(ew2);
697
                 for (int j = 0; j < subList.size(); j++) {
741
                 for (int j = 0; j < subList.size(); j++) {
698
-                    for (int k = 0; k < list.size(); k++) {
699
-                        if (subList.get(j).getId().equals(list.get(k).getSubId())) {
700
-                            subList.get(j).setOperationTime(list.get(k).getOperationTime());
701
-                            subList.get(j).setSubData(list.get(k).getSubData());
742
+                    for (int k = 0; k < sonList.size(); k++) {
743
+                        if (subList.get(j).getId().equals(sonList.get(k).getSubId())) {
744
+                            subList.get(j).setOperationTime(sonList.get(k).getOperationTime());
745
+                            subList.get(j).setSubData(sonList.get(k).getSubData());
702
                         }
746
                         }
703
                     }
747
                     }
704
                 }
748
                 }
705
                 HashMap<String, Object> map1 = Maps.newHashMap();
749
                 HashMap<String, Object> map1 = Maps.newHashMap();
706
                 map1.put("step", mainList.get(i));//主表数据
750
                 map1.put("step", mainList.get(i));//主表数据
707
                 map1.put("list", subList);//子表数据
751
                 map1.put("list", subList);//子表数据
708
-                if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")){
752
+                if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")
753
+                		|| list.get(0).getType().equals("sswxjh") || list.get(0).getType().equals("sswxys")){
709
                 	
754
                 	
710
                     //审批人数据
755
                     //审批人数据
711
                     if(mainList.get(i).getExistProcess().equals(0)){
756
                     if(mainList.get(i).getExistProcess().equals(0)){
@@ -1217,6 +1262,12 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
1217
          }else if(processAudit.getType().equals("xzjh")){
1262
          }else if(processAudit.getType().equals("xzjh")){
1218
         	 sysNoticeVO.setTitle(EnumProcessModel.xzjh.getName());
1263
         	 sysNoticeVO.setTitle(EnumProcessModel.xzjh.getName());
1219
           	 sysNoticeVO.setNoticeModule("xzjh");
1264
           	 sysNoticeVO.setNoticeModule("xzjh");
1265
+         }else if(processAudit.getType().equals("sswxjh")){
1266
+        	 sysNoticeVO.setTitle(EnumProcessModel.sswxjh.getName());
1267
+          	 sysNoticeVO.setNoticeModule("sswxjh");
1268
+         }else if(processAudit.getType().equals("sswxys")){
1269
+        	 sysNoticeVO.setTitle(EnumProcessModel.sswxys.getName());
1270
+          	 sysNoticeVO.setNoticeModule("sswxys");
1220
          }
1271
          }
1221
          //根据仓房id获取仓房名称
1272
          //根据仓房id获取仓房名称
1222
          String houseName = "";
1273
          String houseName = "";
@@ -1319,6 +1370,10 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
1319
                 	 processAudit1.setWorkName(EnumProcessModel.yjly.getName());
1370
                 	 processAudit1.setWorkName(EnumProcessModel.yjly.getName());
1320
                  }else if(processAudit.getType().equals("xzjh")){
1371
                  }else if(processAudit.getType().equals("xzjh")){
1321
                 	 processAudit1.setWorkName(EnumProcessModel.xzjh.getName());
1372
                 	 processAudit1.setWorkName(EnumProcessModel.xzjh.getName());
1373
+                 }else if(processAudit.getType().equals("sswxjh")){
1374
+                	 processAudit1.setWorkName(EnumProcessModel.sswxjh.getName());
1375
+                 }else if(processAudit.getType().equals("sswxys")){
1376
+                	 processAudit1.setWorkName(EnumProcessModel.sswxys.getName());
1322
                  }
1377
                  }
1323
                  processAuditMapper.insert(processAudit1);
1378
                  processAuditMapper.insert(processAudit1);
1324
                  
1379
                  
@@ -1539,18 +1594,17 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
1539
                			if(j-1<=list.size()-1){
1594
                			if(j-1<=list.size()-1){
1540
                				// 业务
1595
                				// 业务
1541
                				ProcessAudit audit = list.get(j-1);
1596
                				ProcessAudit audit = list.get(j-1);
1542
-               				item.setAuditTime(audit.getAuditTime());
1543
-               				item.setContent(audit.getToPeople());
1544
-               				if(flag){//不通过
1545
-                       			if(j-1==list.size()-1){
1546
-                       				item.setAuditState(2);
1547
-                       			}else{
1548
-                       				item.setAuditState(1);
1549
-                       			}
1550
-                       		}else{
1551
-                       			item.setAuditState(audit.getAuditState());
1552
-                       		}
1553
-               				
1597
+               					item.setAuditTime(audit.getAuditTime());
1598
+                   				item.setContent(audit.getToPeople());
1599
+                   				if(flag){//不通过
1600
+                           			if(j-1==list.size()-1){
1601
+                           				item.setAuditState(2);
1602
+                           			}else{
1603
+                           				item.setAuditState(1);
1604
+                           			}
1605
+                           		}else{
1606
+                           			item.setAuditState(audit.getAuditState());
1607
+                           		}
1554
                			}
1608
                			}
1555
        			}
1609
        			}
1556
                	if(pbList.get(1).getAuditState().equals(4) || pbList.get(1).getAuditState().equals(3)){
1610
                	if(pbList.get(1).getAuditState().equals(4) || pbList.get(1).getAuditState().equals(3)){