diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java index ed60ab54..cbcb669c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java @@ -100,6 +100,13 @@ public class ProcessProjectAssessTerm { @ApiModelProperty(value = "可以分派标识") private Integer canAssignFlag; + /** + * 发起人 + */ + @TableField(exist = false) + @ApiModelProperty(value = "发起人") + private String promoter; + /** * 条款关联用户表ID */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml index 7d45b7b0..7ea2cedb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml @@ -31,6 +31,8 @@ + , + ppatu.id term_user_id from process_project_assess_term ppat left join process_project_assess_term_user ppatu on ppat.id = ppatu.term_id where ppat.assessment_id = #{assessmentId} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java index eb432bd0..444d62b2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java @@ -66,6 +66,7 @@ import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAsse import com.jero.modules.activiti.process.projectassess.mapper.ProcessProjectAssessMapper; import org.springframework.transaction.annotation.Transactional; +import static cn.hutool.poi.excel.sax.ElementName.c; import static cn.hutool.poi.excel.sax.ElementName.v; import static org.apache.tools.ant.taskdefs.SetPermissions.NonPosixMode.pass; @@ -130,6 +131,10 @@ public class ProcessProjectAssessService extends ServiceImpl previousNodeHandlerMap = new HashMap<>(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -231,6 +236,7 @@ public class ProcessProjectAssessService extends ServiceImpl