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

标准解读和 标准调研流程bug修复

Browse Source
This commit is contained in:
yuezhihang
2021-08-06 11:28:56 +08:00
parent c0ef331d7b
commit 12458dae4f
9 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class DirectorSignAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setOverTime(OVERTIME);
one1.setPrcType("1");
one1.setPrcType("2");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class DockingApprovalAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setOverTime(OVERTIME);
one1.setPrcType("1");
one1.setPrcType("2");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setOverTime(OVERTIME);
one1.setPrcType("1");
one1.setPrcType("2");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class PresidentSignAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setOverTime(OVERTIME);
one1.setPrcType("1");
one1.setPrcType("2");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class ResponUserSignAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setOverTime(OVERTIME);
one1.setPrcType("1");
one1.setPrcType("2");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class SummarySurveyAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setOverTime(OVERTIME);
one1.setPrcType("1");
one1.setPrcType("2");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class UploadResearchResultAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setOverTime(OVERTIME);
one1.setPrcType("1");
one1.setPrcType("2");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java
+6 -2
View File
@@ -64,14 +64,18 @@ public class DeptApplayAfter implements TaskListener{
sarStandItems.add(sarStandItems1);
//结果数据
SarInterpretationNationalStandard standard=new SarInterpretationNationalStandard();
standard.setStandId(sarStandItems1.getStandId());
standard.setStandId(object.getString("standId"));
standard.setStandSort("");//GB 需要前端传
standard.setStandName(object.getString("itemsName"));
standard.setComparedWithPrevious(os.getString("changePoint"));
standard.setCoreTechnicalRequirement(os.getString("technicalRequir"));
standard.setComplianceState(object.getString("complianceState"));
standard.setCreationTime(object.getDate("creationTime"));
standard.setLastVersionNumber(object.getString("oldNumber"));
standard.setLastVersionNumber(object.getString("itemsNum1"));
standard.setComplianceState(os.getString("complianceState"));
standard.setSpecificItem(object.getString(""));
standard.setStandNumber(object.getString("itemsNum"));
standard.setInterpretationTime(delegateTask.getCreateTime());
standards.add(standard);
});
lawsUserInfoService.sarStandItemsSaveBatch(sarStandItems);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
+1
View File
@@ -51,6 +51,7 @@ public class ResolveAfter implements TaskListener{
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
delegateTask.setVariable("createDate",new Date());
String standName = "";
if (null == object.getString("standInData")){
standName = "未知";