Accept Merge Request #31: (develop-wxl -> master)

Merge Request: 流程申请记录增加字段

Created By: @万新亮
Accepted By: @万新亮
URL: https://chuanghaikeji.coding.net/p/smarCampus/d/iHotel_student_houtai/git/merge/31?initial=true

src/main/java/com/template/controller/ApplicationProcedureController.java

@@ -410,10 +410,10 @@ public class ApplicationProcedureController implements ApplicationProcedureContr
         //教职工
         if (department==4) {
 
-            PageUtils<ApplicationProcedureRecordVo> page1 = applicationProcedureService.appletRecordPage(userId,startTime,endTime,status,page,size);
-            return CommonResult.ok(page1);
-
-        }else if (department==7){
+//            PageUtils<ApplicationProcedureRecordVo> page1 = applicationProcedureService.appletRecordPage(userId,startTime,endTime,status,page,size);
+//            return CommonResult.ok(page1);
+//
+//        }else if (department==7){
 //          临时人员
             PageUtils<ApplicationProcedureTemporaryRecordVo> page1=applicationProcedureTemporaryService.appletRecordPage(userId,startTime,endTime,status,page,size);
             return CommonResult.ok(page1);

src/main/java/com/template/model/vo/ApplicationProcedureTemporaryRecordVo.java

@@ -10,6 +10,15 @@ public class ApplicationProcedureTemporaryRecordVo {
     @ApiModelProperty(value = "申请人id")
     private Integer usersId;
 
+    @ApiModelProperty(value = "申请人部门")
+    private String orgName;
+
+    @ApiModelProperty(value = "房间数量")
+    private String houseCount;
+
+    @ApiModelProperty(value = "申请人")
+    private String usersName;
+
     @ApiModelProperty(value = "开始时间")
     private String startTime;
 

src/main/resources/mapper/template/ApplicationProcedureTemporaryMapper.xml

@@ -187,10 +187,15 @@
         ap.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
         a.name as approverName,
         a2.name as secondaryApproverName
+        u.user_name as userName,
+        o.name as orgName,
+        ap.house_count as houseCount
         FROM
         `application_procedure_temporary` ap
         LEFT JOIN admin a on a.id=ap.approver_id
         LEFT JOIN admin a2 on a2.id=ap.secondary_approver_id
+        LEFT JOIN users u on u.id=ap.users_id
+        LEFT JOIN organization o on o.id=u.organ_id
         where
         ap.deleted=0
         AND ap.users_id=#{userId}