FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-04-12 16:16:54 +08:00
parent 0e2ace7b7c 8f55eb6b16
commit 4f0c7e22fa
3 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
+2 -2
View File
@@ -182,8 +182,8 @@ public interface LawsUserInfoService {
public ResponseMessage<Object> businessDeptIssueSaveBatch(@RequestBody List<BusinessDeptIssue> issue); public ResponseMessage<Object> businessDeptIssueSaveBatch(@RequestBody List<BusinessDeptIssue> issue);
@PostMapping("/sarStandUnqualified/productDeptIssue/saveBatch") @RequestMapping(value = "/sarStandUnqualified/productDeptIssue/saveBatch",method = RequestMethod.POST)
public ResponseMessage<Object> productDeptIssueSaveBatch(@RequestBody List<ProductDeptIssue> issue); public ResponseMessage productDeptIssue(@RequestBody List<ProductDeptIssue> issue);
} }
src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/ProductDeptIssue.java
+4 -2
View File
@@ -42,16 +42,18 @@ public class ProductDeptIssue implements Serializable {
@TableField("current_node") @TableField("current_node")
private String currentNode; private String currentNode;
// 概念状态
@TableField("conceptual_state") @TableField("conceptual_state")
private String conceptualState; private String conceptualState;
// 概念时间
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd")
@TableField("scheduled_issuance_time") @TableField("scheduled_issuance_time")
private Date scheduledIssuanceTime; private Date scheduledIssuanceTime;
//概念修订计划
@TableField("revised_plan") @TableField("revised_plan")
private String revisedPlan; private String revisedPlan;
// 其他说明
@TableField("explanation") @TableField("explanation")
private String explanation; private String explanation;
src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubViceDirectorAfter.java
+30 -18
View File
@@ -77,6 +77,7 @@ public class SubViceDirectorAfter implements TaskListener {
businessDeptIssue.setDevScheme(object1.getString("devScheme")); businessDeptIssue.setDevScheme(object1.getString("devScheme"));
businessDeptIssue.setLawNumber(object1.getString("lawCode")); businessDeptIssue.setLawNumber(object1.getString("lawCode"));
businessDeptIssue.setProductType(object1.getString("dataSource")); businessDeptIssue.setProductType(object1.getString("dataSource"));
businessDeptIssue.setIsClose("0");
list.add(businessDeptIssue); list.add(businessDeptIssue);
} }
} }
@@ -92,28 +93,39 @@ public class SubViceDirectorAfter implements TaskListener {
list = delegateTask.getVariable("v2", List.class); list = delegateTask.getVariable("v2", List.class);
} }
JSONArray array = object.getJSONArray("infoTableDatas"); JSONArray array = object.getJSONArray("infoTableDatas");
if (array.size() > 0) { JSONArray tables = object.getJSONArray("table");
for (Object o : array) { if (array.size() > 0 && tables.size()>0) {
JSONObject object1 = JSON.parseObject(o.toString()); for (Object ta:tables){
ProductDeptIssue productDeptIssue = new ProductDeptIssue(); JSONObject object2=JSON.parseObject(ta.toString());
productDeptIssue.setDelFlag("0"); for (Object o : array) {
productDeptIssue.setId(String.valueOf(UUID.randomUUID())); JSONObject object1 = JSON.parseObject(o.toString());
productDeptIssue.setLawId(object1.getString("lawId")); ProductDeptIssue productDeptIssue = new ProductDeptIssue();
// businessDeptIssue.setImplRequire(object1.getString("implRequire")); productDeptIssue.setDelFlag("0");
// businessDeptIssue.setImplTime(object1.getDate("implTime")); productDeptIssue.setId(String.valueOf(UUID.randomUUID()));
// businessDeptIssue.setCompleteSituation(object1.getString("completeSituation")); productDeptIssue.setLawId(object1.getString("lawId"));
// businessDeptIssue.setSopTime(object1.getDate("sopTime")); productDeptIssue.setLawsNumber(object1.getString("lawCode"));
// businessDeptIssue.setLawName(object1.getString("lawName")); productDeptIssue.setLawsName(object1.getString("lawName"));
// businessDeptIssue.setConformSituation(object1.getString("conformSituation")); productDeptIssue.setProductBusiness(object2.getString("yewu"));
// businessDeptIssue.setTimeoutSituation(object1.getString("timeoutSituation")); productDeptIssue.setPlatform(object2.getString("pingtai"));
// businessDeptIssue.setDevScheme(object1.getString("devScheme")); productDeptIssue.setPojName(object2.getString("xiangmu"));
// businessDeptIssue.setLawNumber(object1.getString("lawCode")); productDeptIssue.setPojDescription(object2.getString("xiangmumiaoshu"));
// businessDeptIssue.setProductType(object1.getString("dataSource")); productDeptIssue.setCurrentNode(object2.getString("dangqianjiedian"));
list.add(productDeptIssue); 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); delegateTask.setVariable("v2", list);
if (i >= delegateTask.getVariable("responseUserIdList", List.class).size()) {
lawsUserInfoService.productDeptIssue(list);
}
} }
//流程结束 //流程结束