update 项目合规评估流程 各部门主管级领导审批 驳回后，模块负责人查询不到数据

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
      */

laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml

@@ -31,6 +31,8 @@
       <include refid="Base_Column_List">
           <property name="alias" value="ppat"/>
       </include>
+      ,
+      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}

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<ProcessProjectAsses
         for (LoginUser loginUser : userList) {
             userNameMap.put(loginUser.getId(), loginUser.calcNameWorkNo());
         }
+        ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId);
+        String createUserId = processAll.getCreateUserId();
+        //发起人
+        String createUserName = userNameMap.get(createUserId);
         //上一节点处理人
         Map<String, String> previousNodeHandlerMap = new HashMap<>();
         LambdaQueryWrapper<ProcessProjectAssessTermUser> wrapper = new LambdaQueryWrapper<>();
@@ -231,6 +236,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
 
                 String previousNodeHandler = previousNodeHandlerMap.get(termId);
                 term.setPreviousNodeHandler(previousNodeHandler);
+                term.setPromoter(createUserName);
             }
         }
         //拼接分类法规标题