外部单位-意见反馈流程记录调整

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -196,6 +196,9 @@ public class ActTaskController extends BaseController {
 						}else {
 							a.setAssigneeName(UserUtils.get(list.get(list.size()-1).getCreateBy().getId()).getName());
 						}
+						if (activityProcess.getProcessKey().equals("reject")){
+							a.setAssigneeName(UserUtils.get(activityProcess.getUpdateBy().getId()).getName());
+						}
 						if("销假申请".equals(activityProcess.getRemarks())||"续假申请".equals(activityProcess.getRemarks())){
 							a.setTaskName("开始");
 						}else{

src/main/resources/mappings/modules/workactivity/WorkActivityProcessDao.xml

@@ -169,15 +169,30 @@
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL} and w.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="processInstanceId != null and processInstanceId != ''">
-				and a.process_instance_id = #{processInstanceId}
+				and (a.process_instance_id = #{processInstanceId}
+				<choose>
+					<when test="isApproval != null and isApproval != ''">
+						AND a.is_approval = 0
+					</when>
+					<otherwise>
+						AND a.is_approval != 0
+					</otherwise>
+				</choose>)
+				OR (a.process_key = 'reject' and a.process_instance_id = #{processInstanceId}
+				<choose>
+					<when test="isApproval != null and isApproval != ''">
+						AND a.is_approval = 0
+					</when>
+					<otherwise>
+						AND a.is_approval != 0
+					</otherwise>
+				</choose>)
 			</if>
 			<choose>
 				<when test="isApproval != null and isApproval != ''">
-					AND a.is_approval = 0
 					ORDER BY  a.count ASC
 				</when>
 				<otherwise>
-					AND a.is_approval != 0
 					ORDER BY a.update_date ASC
 				</otherwise>
 			</choose>