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

Merge branch 'develop' into 'FOTON'

Browse Source 
解读流程 和 企标制修订流程 修复

See merge request foton-wkflow-group/foton-wkflow-rest!66
This commit is contained in:
王夏晖
2021-12-09 19:38:28 +08:00
parent b8c5d84cfa 494ba638a1
commit b94c0dd1cb
9 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/BreakdownList.java
+2 -4
View File
@@ -28,10 +28,8 @@ public class BreakdownList {
private String responsibleEngineer;
private String technicalRequir;
private String changePoint;
@JsonFormat( pattern = "yyyy-MM-dd HH:mm:ss")
private Date xcxssrq;
@JsonFormat( pattern = "yyyy-MM-dd HH:mm:ss")
private Date zccssrq;
private String xcxssrq;
private String zccssrq;
public void setId(String id) {
this.id = id;
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/DataList.java
+2 -4
View File
@@ -26,10 +26,8 @@ public class DataList {
//合规评估添加的数据
private String itemNum;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date xCXSSRQ;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date zCCSSRQ;
private String xCXSSRQ;
private String zCCSSRQ;
private String itemsName;
private String standName;
private String implementer;
src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PEPDTO.java
+2 -4
View File
@@ -34,10 +34,8 @@ public class PEPDTO {
private String workPeople;
//在研在产字段！！！ 待定中 下发落实人需要使用
//时间字段
@JsonFormat( pattern = "yyyy-MM-dd HH:mm:ss")
private Date ZCCSSRQ;
@JsonFormat( pattern = "yyyy-MM-dd HH:mm:ss")
private Date XCXSSRQ;
private String ZCCSSRQ;
private String XCXSSRQ;
private String commentText;
src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarStandItems.java
+2 -2
View File
@@ -98,11 +98,11 @@ public class SarStandItems {
@ApiModelProperty(value = "新车型实施日期")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date xccssrq;
private String xccssrq;
@ApiModelProperty(value = "在产车实施日期")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date zccssrq;
private String zccssrq;
@ApiModelProperty(value = "相对于上一版本变化点")
private String comparedWithPrevious;
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java
+4 -4
View File
@@ -58,7 +58,7 @@ public class PCAdlApproveAfter implements TaskListener {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
res.getDataList().forEach(pcAdataList -> {
//标准一级别
if (null != pcAdataList.getNoCompliance()) {
if (null != pcAdataList.getNoCompliance() && !"".equals(pcAdataList.getNoCompliance())) {
SarStandUnqualified sarStandUnqualified = new SarStandUnqualified();
//少一个standId 不合格原因 在研在产！
sarStandUnqualified.setStandId(pcAdataList.getStandId());
@@ -77,7 +77,7 @@ public class PCAdlApproveAfter implements TaskListener {
standUnqualifieds.add(sarStandUnqualified);
}
if (null != pcAdataList.getZcNoCompliance()) {
if (null != pcAdataList.getZcNoCompliance() && !"".equals(pcAdataList.getZcNoCompliance())) {
SarStandUnqualified sarStandUnqualified = new SarStandUnqualified();
//少一个standId 不合格原因 在研在产！
sarStandUnqualified.setStandId(pcAdataList.getStandId());
@@ -131,7 +131,7 @@ public class PCAdlApproveAfter implements TaskListener {
//遍历条目
for (PCAchildren pcAchildren : pcAdataList.getChildren()) {
if (null != pcAchildren.getNoCompliance()) {
if (null != pcAchildren.getNoCompliance() && !"".equals(pcAdataList.getNoCompliance())) {
SarStandUnqualified sarStandUnqualified = new SarStandUnqualified();
//少一个standId 不合格原因 在研在产！
sarStandUnqualified.setStandId(pcAchildren.getStandId());
@@ -152,7 +152,7 @@ public class PCAdlApproveAfter implements TaskListener {
standUnqualifieds.add(sarStandUnqualified);
}
if (null != pcAdataList.getZcNoCompliance()) {
if (null != pcAdataList.getZcNoCompliance() && !"".equals(pcAdataList.getZcNoCompliance())) {
SarStandUnqualified sarStandUnqualified = new SarStandUnqualified();
//少一个standId 不合格原因 在研在产！
sarStandUnqualified.setStandId(pcAchildren.getStandId());
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java
+2 -2
View File
@@ -37,7 +37,7 @@ public class ProcessStep2After implements TaskListener {
List<String> nextUserList = new ArrayList();
//计算最后的会签结果 使用的与运算啦啦啦啦
String prcName ="";
if (null == delegateTask.getVariable("deptCenterFlag")) {
if (null == delegateTask.getVariable("count")) {
delegateTask.setVariable("deptCenterFlag", object.getInteger("deptCenterFlag"));
delegateTask.setVariable("count",1);
} else {
@@ -55,7 +55,7 @@ public class ProcessStep2After implements TaskListener {
nextUserList.add(delegateTask.getVariable("prcCreateUser", String.class));
delegateTask.setVariable("createUser", delegateTask.getVariable("prcCreateUser", String.class));
prcName = "企标制修订计划整改";
delegateTask.setVariable("deptCenterFlag", null);
delegateTask.setVariable("deptCenterFlag", "1");
delegateTask.setVariable("count",null);
}
}
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class ProcessStep3After implements TaskListener {
delegateTask.setVariable("bzFlag",1);
nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class));
delegateTask.setVariable("createUser",delegateTask.getVariable("prcCreateUser",String.class));
delegateTask.setVariable("deptCenterFlag", null);
delegateTask.setVariable("deptCenterFlag", "1");
delegateTask.setVariable("count",null);
}
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java
+1 -1
View File
@@ -93,7 +93,7 @@ public class ProcessStep4After implements TaskListener {
delegateTask.setVariable("bzfgbzFlag",1);
nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class));
delegateTask.setVariable("createUser",delegateTask.getVariable("prcCreateUser",String.class));
delegateTask.setVariable("deptCenterFlag", null);
delegateTask.setVariable("deptCenterFlag", "1");
delegateTask.setVariable("count",null);
}
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java
+2 -2
View File
@@ -60,8 +60,8 @@ public class DeptApplayAfter implements TaskListener{
sarStandItems1.setResponsibleUnit(os.getString("responsibleUnitShow"));
sarStandItems1.setDutyEngineer(os.getString("zxUserIdName"));
sarStandItems1.setTermsConditions(os.getString("itermsConditions"));
sarStandItems1.setXccssrq(os.getDate("newData"));
sarStandItems1.setZccssrq(os.getDate("onlineData"));
sarStandItems1.setXccssrq(os.getString("newData"));
sarStandItems1.setZccssrq(os.getString("onlineData"));
sarStandItems1.setComparedWithPrevious(os.getString("changePoint"));
sarStandItems1.setComplianceState(os.getString("complianceState"));
sarStandItems1.setApplyArctic(os.getString("applyArctic"));