智能门锁需求变更逻辑修改

zd-modules/zd-smartlock/src/main/java/com/zd/smartlock/controller/SlSubjectRelationController.java

@@ -151,9 +151,9 @@ public class SlSubjectRelationController extends BaseController {
     @GetMapping("/listLockRoom")
     @ApiOperation(value = "查询实验室关联列表")
     public TableDataInfo<SlRoom> listLockRoom(SlRoom slRoom) {
-        //List<SlRoom> list = SmartlockUtil.getRoom( slRoom);
+        List<SlRoom> list = SmartlockUtil.getRoom( slRoom);
 
-        List<SlRoom> list = new ArrayList<>();
+        /*List<SlRoom> list = new ArrayList<>();
         slRoom.setRoomname("房间1");
         slRoom.setRoomcode2("MS001");
         slRoom.setRoomlocation("1-1-110");
@@ -165,7 +165,7 @@ public class SlSubjectRelationController extends BaseController {
         slRoom1.setRoomcode2("MS002");
         slRoom1.setRoomlocation("1-1-112");
         slRoom1.setRoomid(330);
-        list.add(slRoom1);
+        list.add(slRoom1);*/
         return getDataTable(list);
     }
 

zd-modules/zd-smartlock/src/main/java/com/zd/smartlock/domain/vo/SlOpendoorApplyVo.java

@@ -19,6 +19,9 @@ public class SlOpendoorApplyVo extends SlOpendoorApply {
     @ApiModelProperty(value = "审批人集合")
     private String examineName;
 
+    @ApiModelProperty(value = "授权人集合")
+    private String authName;
+
     @ApiModelProperty(value = "开始时间")
     private String startTime;
 
@@ -53,4 +56,12 @@ public class SlOpendoorApplyVo extends SlOpendoorApply {
     public Date getLoseTime() {        return loseTime;    }
 
     public void setLoseTime(Date loseTime) {        this.loseTime = loseTime;    }
+
+    public String getAuthName() {
+        return authName;
+    }
+
+    public void setAuthName(String authName) {
+        this.authName = authName;
+    }
 }

zd-modules/zd-smartlock/src/main/java/com/zd/smartlock/service/impl/SlOpendoorApplyServiceImpl.java

@@ -139,14 +139,14 @@ public class SlOpendoorApplyServiceImpl implements ISlOpendoorApplyService {
         slOpendoorApply.setUserSex(sysUser.getSex() == null ? 1 : Integer.valueOf(sysUser.getSex()));
         slOpendoorApply.setPhonenumber(sysUser.getPhonenumber());
         slOpendoorApply.setCreatTime(new Date());
-
+        slOpendoorApplyMapper.insertSlOpendoorApply(slOpendoorApply);
         try {
             //授权并且发送短信通知实验室门锁对应的安全负责人
             authPowerNew(slOpendoorApply.getId());
         } catch (Exception e) {
             log.info("授权失败："+e);
         }
-        return slOpendoorApplyMapper.insertSlOpendoorApply(slOpendoorApply);
+        return 1;
     }
 
     /**

zd-modules/zd-smartlock/src/main/resources/mapper/smartlock/SlOpendoorApplyMapper.xml

@@ -89,7 +89,7 @@
                t.approval_user,
                t.approval_time,
                t.creat_time,
-               (SELECT GROUP_CONCAT(aa.approva_name) FROM sl_apply_approval aa WHERE aa.apply_id=t.id) AS examineName,
+               (select GROUP_CONCAT(safe_user_name) from sl_subject_relation r where r.subject_id= t.subject_id ) authName,
                date_add(t.creat_time, interval 1 hour) loseTime
         from sl_opendoor_apply as t
         LEFT JOIN   sys_dept d on   t.dept_id=d.dept_id