From 5982486cab477820edbd0e797f1b24c7bf3485f8 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 11 Apr 2022 16:23:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=9F=A5=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_auth/LawsUserInfoService.java | 4 +- .../datas/dto/WG/ProductDeptIssue.java | 6 ++- .../SubViceDirectorAfter.java | 48 ++++++++++++------- 3 files changed, 36 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index ca93faa9..47137630 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -182,8 +182,8 @@ public interface LawsUserInfoService { public ResponseMessage businessDeptIssueSaveBatch(@RequestBody List issue); - @PostMapping("/sarStandUnqualified/productDeptIssue/saveBatch") - public ResponseMessage productDeptIssueSaveBatch(@RequestBody List issue); + @RequestMapping(value = "/sarStandUnqualified/productDeptIssue/saveBatch",method = RequestMethod.POST) + public ResponseMessage productDeptIssue(@RequestBody List issue); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/ProductDeptIssue.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/ProductDeptIssue.java index cb61e0cf..505452e1 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/ProductDeptIssue.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/ProductDeptIssue.java @@ -42,16 +42,18 @@ public class ProductDeptIssue implements Serializable { @TableField("current_node") private String currentNode; +// 概念状态 @TableField("conceptual_state") private String conceptualState; - +// 概念时间 @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") @TableField("scheduled_issuance_time") private Date scheduledIssuanceTime; - +//概念修订计划 @TableField("revised_plan") private String revisedPlan; +// 其他说明 @TableField("explanation") private String explanation; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubViceDirectorAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubViceDirectorAfter.java index 4a0aafcb..e11d5e04 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubViceDirectorAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubViceDirectorAfter.java @@ -77,6 +77,7 @@ public class SubViceDirectorAfter implements TaskListener { businessDeptIssue.setDevScheme(object1.getString("devScheme")); businessDeptIssue.setLawNumber(object1.getString("lawCode")); businessDeptIssue.setProductType(object1.getString("dataSource")); + businessDeptIssue.setIsClose("0"); list.add(businessDeptIssue); } } @@ -92,28 +93,39 @@ public class SubViceDirectorAfter implements TaskListener { list = delegateTask.getVariable("v2", List.class); } JSONArray array = object.getJSONArray("infoTableDatas"); - if (array.size() > 0) { - for (Object o : array) { - JSONObject object1 = JSON.parseObject(o.toString()); - ProductDeptIssue productDeptIssue = new ProductDeptIssue(); - productDeptIssue.setDelFlag("0"); - productDeptIssue.setId(String.valueOf(UUID.randomUUID())); - productDeptIssue.setLawId(object1.getString("lawId")); -// businessDeptIssue.setImplRequire(object1.getString("implRequire")); -// businessDeptIssue.setImplTime(object1.getDate("implTime")); -// businessDeptIssue.setCompleteSituation(object1.getString("completeSituation")); -// businessDeptIssue.setSopTime(object1.getDate("sopTime")); -// businessDeptIssue.setLawName(object1.getString("lawName")); -// businessDeptIssue.setConformSituation(object1.getString("conformSituation")); -// businessDeptIssue.setTimeoutSituation(object1.getString("timeoutSituation")); -// businessDeptIssue.setDevScheme(object1.getString("devScheme")); -// businessDeptIssue.setLawNumber(object1.getString("lawCode")); -// businessDeptIssue.setProductType(object1.getString("dataSource")); - list.add(productDeptIssue); + JSONArray tables = object.getJSONArray("table"); + if (array.size() > 0 && tables.size()>0) { + for (Object ta:tables){ + JSONObject object2=JSON.parseObject(ta.toString()); + for (Object o : array) { + JSONObject object1 = JSON.parseObject(o.toString()); + ProductDeptIssue productDeptIssue = new ProductDeptIssue(); + productDeptIssue.setDelFlag("0"); + productDeptIssue.setId(String.valueOf(UUID.randomUUID())); + productDeptIssue.setLawId(object1.getString("lawId")); + productDeptIssue.setLawsNumber(object1.getString("lawCode")); + productDeptIssue.setLawsName(object1.getString("lawName")); + productDeptIssue.setProductBusiness(object2.getString("yewu")); + productDeptIssue.setPlatform(object2.getString("pingtai")); + productDeptIssue.setPojName(object2.getString("xiangmu")); + productDeptIssue.setPojDescription(object2.getString("xiangmumiaoshu")); + productDeptIssue.setCurrentNode(object2.getString("dangqianjiedian")); + productDeptIssue.setConceptualState(object2.getString("gainianzhuangtai")); + productDeptIssue.setScheduledIssuanceTime(object2.getDate("gainianzhuangtaiDate")); + productDeptIssue.setRevisedPlan(object2.getString("gainianxiudingjihua")); + productDeptIssue.setExplanation(object2.getString("qitashuoming")); + productDeptIssue.setResponseDept(object2.getString("zerenren")); + productDeptIssue.setIsClose("0"); + list.add(productDeptIssue); + } } + } delegateTask.setVariable("v2", list); + if (i >= delegateTask.getVariable("responseUserIdList", List.class).size()) { + lawsUserInfoService.productDeptIssue(list); + } } //流程结束