diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java index ae4e7cc0..ae45161c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java @@ -158,6 +158,13 @@ public class ProcessProjectStandardTerm { @ApiModelProperty(value = "不涉及原因") private String notInvolved; + /** + * 是否与车型强关联 + */ + @TableField(exist = false) + @ApiModelProperty(value="是否与车型强关联") + private String isRelate; + /** * 车型系列 */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java index 322f90fe..3a70f265 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java @@ -134,6 +134,12 @@ public class ProcessProjectStandardTermUser { @ApiModelProperty(value="父执行实例流id") private String parentExecutionId; + /** + * 是否与车型强关联 + */ + @TableField(value = "is_relate") + @ApiModelProperty(value="是否与车型强关联") + private String isRelate; /** * 车型系列 */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml index bce1656c..238b6940 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml @@ -29,6 +29,7 @@ + @@ -88,6 +89,7 @@ ppstu.module_owner, ppstu.assess_results, ppstu.model_series, + ppstu.is_relate, ppstu.description, ppstu.file_id, ppstu.design_engineer, diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java index e014242d..fb805dc1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java @@ -724,6 +724,7 @@ public class ProcessProjectStandardService extends ServiceImpl