用气申请 权限添加

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpQualificationApplyController.java

@@ -299,7 +299,7 @@ public class QpQualificationApplyController extends BaseController
             //查询登录用户是否有实验中心审核资格
             QpFlowDetailVO qpFlowDetail = new QpFlowDetailVO();
             //qpFlowDetail.setUserType(2L);//1实验室 2实验中心
-            qpFlowDetail.setUserIds(sysUser.getUserId());//登录人id
+            qpFlowDetail.setUserId(sysUser.getUserId());//登录人id
             //qpFlowDetail.setFlowType(1);//资格申请
             List<QpFlowDetailVO> flowDetailList = qpFlowDetailService.selectQpFlowDetailList(qpFlowDetail);
             if(flowDetailList.size()>0){

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpQualificationApplyManageController.java

@@ -33,7 +33,7 @@ import java.util.*;
 
 /**
  * 用气资格申请Controller
- * 
+ *
  * @author zd
  * @date 2022-05-10
  */
@@ -196,7 +196,7 @@ public class QpQualificationApplyManageController extends BaseController
             //查询登录用户是否有实验中心审核资格
             QpFlowDetailVO qpFlowDetail = new QpFlowDetailVO();
             //qpFlowDetail.setUserType(2L);//1实验室 2实验中心
-            qpFlowDetail.setUserIds(sysUser.getUserId());//登录人id
+            qpFlowDetail.setUserId(sysUser.getUserId());//登录人id
             //qpFlowDetail.setFlowType(1);//资格申请
             List<QpFlowDetailVO> flowDetailList = qpFlowDetailService.selectQpFlowDetailList(qpFlowDetail);
             if(flowDetailList.size()>0){

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpUsegasApplyController.java

@@ -174,7 +174,7 @@ public class QpUsegasApplyController extends BaseController
             //查询登录用户是否有实验中心审核资格
             QpFlowDetailVO qpFlowDetail = new QpFlowDetailVO();
             qpFlowDetail.setUserType(2L);//1实验室 2实验中心
-            qpFlowDetail.setUserIds(sysUser.getUserId());//登录人id
+            qpFlowDetail.setUserId(sysUser.getUserId());//登录人id
             List<QpFlowDetailVO> flowDetailList = qpFlowDetailService.selectQpFlowDetailList(qpFlowDetail);
             if(flowDetailList.size()>0){
                 audit=true;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpUsegasApplyManageController.java

@@ -186,7 +186,7 @@ public class QpUsegasApplyManageController extends BaseController
             //查询登录用户是否有实验中心审核资格
             QpFlowDetailVO qpFlowDetail = new QpFlowDetailVO();
             //qpFlowDetail.setUserType(2L);//1实验室 2实验中心
-            qpFlowDetail.setUserIds(sysUser.getUserId());//登录人id
+            qpFlowDetail.setUserId(sysUser.getUserId());//登录人id
             //qpFlowDetail.setFlowType(2);//用气申请
             List<QpFlowDetailVO> flowDetailList = qpFlowDetailService.selectQpFlowDetailList(qpFlowDetail);
             if(flowDetailList.size()>0){

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpFlowDetail.java

@@ -12,7 +12,7 @@ import com.zd.common.core.web.domain.BaseEntity;
 
 /**
  * 气瓶流程详情对象 qp_flow_detail
- * 
+ *
  * @author zd
  * @date 2022-06-13
  */
@@ -64,16 +64,33 @@ public class QpFlowDetail extends BaseEntity
     @Excel(name = "用户id")
     @Length(message = "长度不能超过50")
     @ApiModelProperty(value = "用户id")
-    private Long userIds;
+    private Long userId;
     /** 部门id*/
     @Excel(name = "部门id")
     @Length(message = "长度不能超过50")
     @ApiModelProperty(value = "部门id")
-    private Long deptIds;
+    private Long deptId;
     /** 部门名称*/
     @Excel(name = "部门名称")
     @Length(message = "长度不能超过50")
     @ApiModelProperty(value = "部门名称")
-    private String deptNames;
+    private String deptName;
+
+    @Override
+    public Long getUserId() {        return userId;    }
+
+    @Override
+    public Long getDeptId() {        return deptId;    }
+
+    @Override
+    public void setDeptId(Long deptId) {        this.deptId = deptId;    }
+
+    public String getDeptName() {        return deptName;    }
+    @Override
+    public void setDeptName(String deptName) {        this.deptName = deptName;    }
+
+    @Override
+    public void setUserId(Long userId) {        this.userId = userId;    }
+
 
 }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/QpFlowDetailServiceImpl.java

@@ -23,12 +23,12 @@ import com.zd.airbottle.service.IQpFlowDetailService;
 
 /**
  * 气瓶流程详情Service业务层处理
- * 
+ *
  * @author zd
  * @date 2022-06-13
  */
 @Service
-public class QpFlowDetailServiceImpl implements IQpFlowDetailService 
+public class QpFlowDetailServiceImpl implements IQpFlowDetailService
 {
     @Autowired
     private QpFlowDetailMapper qpFlowDetailMapper;
@@ -42,7 +42,7 @@ public class QpFlowDetailServiceImpl implements IQpFlowDetailService
 
     /**
      * 查询气瓶流程详情
-     * 
+     *
      * @param id 气瓶流程详情主键
      * @return 气瓶流程详情
      */
@@ -54,7 +54,7 @@ public class QpFlowDetailServiceImpl implements IQpFlowDetailService
 
     /**
      * 查询气瓶流程详情列表
-     * 
+     *
      * @param qpFlowDetail 气瓶流程详情
      * @return 气瓶流程详情
      */
@@ -74,7 +74,7 @@ public class QpFlowDetailServiceImpl implements IQpFlowDetailService
 
     /**
      * 新增气瓶流程详情
-     * 
+     *
      * @param qpFlow 气瓶流程详情
      * @return 结果
      */
@@ -98,7 +98,7 @@ public class QpFlowDetailServiceImpl implements IQpFlowDetailService
 
                 QpFlowDetailVO fd= new QpFlowDetailVO();
                 fd.setUserType(detail.getUserType());
-                fd.setUserIds(detail.getUserIds());
+                fd.setUserId(detail.getUserId());
                 fd.setFlowType(detail.getFlowType());
                 List<QpFlowDetailVO> fdlist = qpFlowDetailMapper.selectQpFlowDetailList(fd);
                 if(fdlist.size()==0){
@@ -111,7 +111,7 @@ public class QpFlowDetailServiceImpl implements IQpFlowDetailService
 
     /**
      * 修改气瓶流程详情
-     * 
+     *
      * @param qpFlowDetail 气瓶流程详情
      * @return 结果
      */
@@ -124,7 +124,7 @@ public class QpFlowDetailServiceImpl implements IQpFlowDetailService
 
     /**
      * 批量删除气瓶流程详情
-     * 
+     *
      * @param ids 需要删除的气瓶流程详情主键
      * @return 结果
      */
@@ -137,7 +137,7 @@ public class QpFlowDetailServiceImpl implements IQpFlowDetailService
 
     /**
      * 删除气瓶流程详情信息
-     * 
+     *
      * @param id 气瓶流程详情主键
      * @return 结果
      */

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpFlowDetailMapper.xml

@@ -10,11 +10,11 @@
         <result property="userName"    column="user_number"    />
         <result property="flowType"    column="flow_type"    />
         <result property="userType"    column="user_type"    />
-        <result property="userIds"    column="user_ids"    />
+        <result property="userId"    column="user_id"    />
         <result property="userName"    column="user_name"    />
         <result property="userTelephone"    column="user_telephone"    />
-        <result property="deptIds"    column="dept_ids"    />
-        <result property="deptNames"    column="dept_names"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
         <result property="createTime"    column="create_time"    />
     </resultMap>
 
@@ -22,11 +22,11 @@
     </resultMap>
 
     <sql id="selectQpFlowDetailVo">
-        select id, uuid,user_number,flow_type, user_type, user_ids, user_name, user_telephone, dept_ids, dept_names, create_time from qp_flow_detail
+        select id, uuid,user_number,flow_type, user_type, user_id, user_name, user_telephone, dept_id, dept_name, create_time from qp_flow_detail
     </sql>
     <sql id="selectQpFlowDetailListVo">
-        select t.id, t.uuid, t.user_number,t.flow_type, t.user_type, t.user_ids, t.user_name, t.user_telephone, t.dept_ids,
-               t.dept_names, t.create_time from qp_flow_detail as t
+        select t.id, t.uuid, t.user_number,t.flow_type, t.user_type, t.user_id, t.user_name, t.user_telephone, t.dept_id,
+               t.dept_name, t.create_time from qp_flow_detail as t
     </sql>
     <select id="selectQpFlowDetailList" parameterType="com.zd.airbottle.domain.vo.QpFlowDetailVO" resultMap="QpFlowDetailResultVO">
         <include refid="selectQpFlowDetailListVo"/>
@@ -41,11 +41,11 @@
             <if test="userNumber != null "> and t.user_number = #{userNumber}</if>
             <if test="flowType != null "> and t.flow_type = #{flowType}</if>
             <if test="userType != null "> and t.user_type = #{userType}</if>
-            <if test="userIds != null "> and t.user_ids = #{userIds}</if>
+            <if test="userId != null "> and t.user_id = #{userId}</if>
             <if test="flowType != null "> and t.flow_type = #{flowType}</if>
             <if test="userName != null  and userName != ''"> and t.user_name like concat('%', #{userName}, '%')</if>
             <if test="userTelephone != null  and userTelephone != ''"> and t.user_telephone = #{userTelephone}</if>
-            <if test="deptIds != null "> and ( dept_ids in (SELECT dt.dept_id FROM sys_dept dt WHERE find_in_set(#{deptIds} ,ancestors )) or dept_ids = #{deptIds} )</if>
+            <if test="deptId != null "> and ( dept_id in (SELECT dt.dept_id FROM sys_dept dt WHERE find_in_set(#{deptId} ,ancestors )) or dept_id = #{deptId} )</if>
         </where>
     </select>
 
@@ -74,15 +74,15 @@
 
             <if test="userType != null">user_type,</if>
 
-            <if test="userIds != null">user_ids,</if>
+            <if test="userId != null">user_id,</if>
 
             <if test="userName != null">user_name,</if>
 
             <if test="userTelephone != null">user_telephone,</if>
 
-            <if test="deptIds != null">dept_ids,</if>
+            <if test="deptId != null">dept_id,</if>
 
-            <if test="deptNames != null">dept_names,</if>
+            <if test="deptName != null">dept_name,</if>
 
             <if test="createTime != null">create_time,</if>
 
@@ -92,11 +92,11 @@
             <if test="userNumber != null">#{userNumber},</if>
             <if test="flowType != null">#{flowType},</if>
             <if test="userType != null">#{userType},</if>
-            <if test="userIds != null">#{userIds},</if>
+            <if test="userId != null">#{userId},</if>
             <if test="userName != null">#{userName},</if>
             <if test="userTelephone != null">#{userTelephone},</if>
-            <if test="deptIds != null">#{deptIds},</if>
-            <if test="deptNames != null">#{deptNames},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null">#{deptName},</if>
             <if test="createTime != null">#{createTime},</if>
         </trim>
     </insert>
@@ -108,11 +108,11 @@
             <if test="userNumber != null">user_number = #{userNumber},</if>
             <if test="flowType != null">flow_type = #{flowType},</if>
             <if test="userType != null">user_type = #{userType},</if>
-            <if test="userIds != null">user_ids = #{userIds},</if>
+            <if test="userId != null">user_id = #{userId},</if>
             <if test="userName != null">user_name = #{userName},</if>
             <if test="userTelephone != null">user_telephone = #{userTelephone},</if>
-            <if test="deptIds != null">dept_id = #{deptIds},</if>
-            <if test="deptNames != null">dept_name = #{deptNames},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="deptName != null">dept_name = #{deptName},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
         </trim>
         where id = #{id}
@@ -132,13 +132,13 @@
     <!-- 实验中心-资格审核权限查询 -->
     <select id="selectZgCenterByUserIdIs" resultMap="QpFlowDetailResult">
         select fd.* from qp_flow_detail fd
-        where  fd.user_type=2 and user_ids=#{userId} limit 1
+        where  fd.user_type=2 and user_id=#{userId} limit 1
     </select>
 
     <!-- 实验中心-用气审核查询 -->
     <select id="selectYqCenterByUserIdIs" resultMap="QpFlowDetailResult">
         select fd.* from qp_flow_detail fd
-        where  fd.user_type=2 and user_ids=#{userId} limit 1
+        where  fd.user_type=2 and user_id=#{userId} limit 1
     </select>
 
-</mapper>
+</mapper>

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSubjectMapper.xml

@@ -260,7 +260,7 @@
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="floorId != null "> and floor_id = #{floorId}</if>
             <if test="room != null  and room != ''"> and room = #{room}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptId != null "> and ( dept_id in (SELECT dt.dept_id FROM sys_dept dt WHERE find_in_set(#{deptId} ,ancestors )) or dept_id = #{deptId} )</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="adminId != null "> and admin_id = #{adminId}</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>