```快速構建流程調整

src/main/java/org/springblade/bank/autodata/controller/AutoDataController.java

@@ -262,7 +262,7 @@ public class AutoDataController extends BladeController {
 			if (autoData.getApproveHistory() != null){
 				JSONArray jsonArray = JSONUtil.parseArray(autoData.getApproveHistory());
 				JSONArray jsonArray1 = JSONUtil.parseArray(struct.getSetting());
-				if (jsonArray.size() == jsonArray1.size()){
+				if ((jsonArray.size()+1) == jsonArray1.size()){
 					autoData.setProcessStatus(ProcessStatus.PASSED);
 				}else{
 					autoData.setProcessStatus(ProcessStatus.TOBEREVIEWED);
@@ -324,7 +324,7 @@ public class AutoDataController extends BladeController {
 		approveBean.setUserEhr(user.getEhr());
 		approveBean.setApprove(Approve.AGREE);
 		approveBean.setRemark(autoData.getRemark());
-		approveBean.setApproveTime(DateUtil.formatDate(DateUtil.now()));
+		approveBean.setApproveTime(DateUtil.format(DateUtil.now(), "yyyy-MM-dd HH:mm:ss"));
 
 		String approveHistory = oldData.getApproveHistory();
 		if (approveHistory == null){
@@ -384,7 +384,7 @@ public class AutoDataController extends BladeController {
 			approveBean.setUserEhr(user.getEhr());
 			approveBean.setApprove(Approve.REJECT);
 			approveBean.setRemark(autoData.getRemark());
-			approveBean.setApproveTime(DateUtil.formatDate(DateUtil.now()));
+			approveBean.setApproveTime(DateUtil.format(DateUtil.now(), "yyyy-MM-dd HH:mm:ss"));
 
 			String approveHistory = oldData.getApproveHistory();
 			if (approveHistory == null){
@@ -421,6 +421,7 @@ public class AutoDataController extends BladeController {
 				autoData.setApproveName(oldData.getApproveName() + "," + user.getName());
 				autoData.setApproveNo(oldData.getApproveNo() + "," + user.getEhr());
 			}
+			autoData.setProcessStatus(ProcessStatus.FAIL);
 
 			//審批記錄
 			ApproveBean approveBean = new ApproveBean();
@@ -429,7 +430,7 @@ public class AutoDataController extends BladeController {
 			approveBean.setUserEhr(user.getEhr());
 			approveBean.setApprove(Approve.DISAGREE);
 			approveBean.setRemark(autoData.getRemark());
-			approveBean.setApproveTime(DateUtil.formatDate(DateUtil.now()));
+			approveBean.setApproveTime(DateUtil.format(DateUtil.now(), "yyyy-MM-dd HH:mm:ss"));
 
 			String approveHistory = oldData.getApproveHistory();
 			if (approveHistory == null){
@@ -453,23 +454,4 @@ public class AutoDataController extends BladeController {
 		return R.status(autoDataService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	/*public static void main(String[] args) {
-		*//*String str = "[{\"id\":\"1432588697624535042\",\"name\":\"林嘉莉\",\"ehr\":\"0150800\"},{\"id\":\"1432588735327133698\",\"name\":\"陳麗華\",\"ehr\":\"0146072\"},{\"id\":\"1432588753018707969\",\"name\":\"盧思雅2\",\"ehr\":\"2064717\"}]";
-		JSONArray jsonArray = JSONUtil.parseArray(str);
-		String s = jsonArray.toJSONString(0);
-		System.out.println(s);*//*
-
-
-		JSONArray arr = new JSONArray();
-		Map<String, String > tobePerson = new HashMap<>();
-		tobePerson.put("id", "123123");
-		tobePerson.put("name", "看监控的方式");
-		tobePerson.put("ehr", "fgh1232");
-		arr.set(tobePerson);
-		arr.add(tobePerson);
-		System.out.println(arr.toJSONString(0));
-		arr.remove(1);
-		System.out.println(arr.toJSONString(0));
-	}*/
-
 }

src/main/java/org/springblade/bank/autodata/mapper/AutoDataMapper.xml

@@ -82,6 +82,14 @@
             select td.* from zh_auto_data td, zh_auto_struct ts
             where td.is_deleted = 0 and td.table_id = #{autoData.tableId} and td.table_id = ts.id
             AND (td.create_user = '${autoData.currentuserId}' or LOCATE('${autoData.currentuserId}', td.receiver_id) > 0)
+
+            UNION
+
+            select td.* from zh_auto_data td, zh_auto_struct ts
+            where td.is_deleted = 0 and td.table_id = #{autoData.tableId} and td.table_id = ts.id
+            AND (td.create_user = '${autoData.currentuserId}' or LOCATE('${autoData.currentuserId}', td.approve_id) > 0)
+
+
         ) c
         where 1=1
         <if test="autoData!=null">

src/main/java/org/springblade/bank/constant/ProcessStatus.java

@@ -1,7 +1,7 @@
 package org.springblade.bank.constant;
 
 public interface ProcessStatus {
-	String REVIEWED = "已審核";
+	String FAIL = "不通過";
 
 	String PASSED = "已通過";