预约进校拒绝审核显示拒绝原因

src/main/java/com/xjrsoft/module/personnel/controller/ReservationSchoolController.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.toolkit.MPJWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.page.ConventPage;
@@ -17,6 +18,8 @@ import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.QrCodeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.config.CommonPropertiesConfig;
+import com.xjrsoft.module.oa.entity.NewsRelation;
+import com.xjrsoft.module.oa.vo.NewsRelationVo;
 import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.personnel.dto.AddReservationSchoolDto;
 import com.xjrsoft.module.personnel.dto.ReservationSchoolVisitorPageDto;
@@ -37,6 +40,10 @@ import com.xjrsoft.module.personnel.vo.StundentFaceProcessPageVo;
 import com.xjrsoft.module.room.entity.RoomValueWeek;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.teacher.entity.XjrUser;
+import com.xjrsoft.module.workflow.entity.WorkflowFormRelation;
+import com.xjrsoft.module.workflow.entity.XjrWorkflowOperateRecord;
+import com.xjrsoft.module.workflow.service.IWorkflowFormRelationService;
+import com.xjrsoft.module.workflow.service.IXjrWorkflowOperateRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -63,6 +70,7 @@ public class ReservationSchoolController {
 
     private final IReservationSchoolService reservationSchoolService;
     private final CommonPropertiesConfig commonPropertiesConfig;
+    private final IXjrWorkflowOperateRecordService operateRecordService;
 
     @GetMapping(value = "/page")
     @ApiOperation(value="预约进校列表(分页)")
@@ -89,6 +97,28 @@ public class ReservationSchoolController {
 
         IPage<ReservationSchool> page = reservationSchoolService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<ReservationSchoolPageVo> pageOutput = ConventPage.getPageOutput(page, ReservationSchoolPageVo.class);
+        for (ReservationSchoolPageVo record : pageOutput.getList()) {
+            if(record.getStatus() != null && record.getStatus() == 2){
+                MPJLambdaWrapper<XjrWorkflowOperateRecord> queryWrapper2 = new MPJLambdaWrapper<>();
+                queryWrapper2
+                        .select(XjrWorkflowOperateRecord::getId)
+                        .select(XjrWorkflowOperateRecord.class, x -> VoToColumnUtil.fieldsToColumns(XjrWorkflowOperateRecord.class).contains(x.getProperty()))
+                        .leftJoin(WorkflowFormRelation.class, WorkflowFormRelation::getProcessId, NewsRelation::getUserId)
+                        .eq(WorkflowFormRelation::getFormKeyValue, record.getId())
+                        .disableSubLogicDel();
+                List<XjrWorkflowOperateRecord> list = operateRecordService.selectJoinList(XjrWorkflowOperateRecord.class, queryWrapper2 );
+                for (XjrWorkflowOperateRecord xjrWorkflowOperateRecord : list) {
+                    if(xjrWorkflowOperateRecord.getOperateInfo().contains("驳回") && xjrWorkflowOperateRecord.getOperateInfo() != null){
+                        String[] split = xjrWorkflowOperateRecord.getOperateInfo().split("，");
+                        if(split.length > 0){
+                            String msg = split[split.length - 1].replace(" 审批内容：", "");
+                            record.setMessage(msg);
+                        }
+                    }
+                }
+            }
+        }
+
         return RT.ok(pageOutput);
     }
 

src/main/java/com/xjrsoft/module/personnel/vo/ReservationSchoolPageVo.java

@@ -96,4 +96,8 @@ public class ReservationSchoolPageVo {
     @ApiModelProperty("部门负责人id")
     private Long  deptUserId;
 
+
+    @ApiModelProperty("驳回理由")
+    private String message;
+
 }