资格管理 权限添加

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

@@ -87,7 +87,7 @@ public class QpQualificationApplyController extends BaseController
     {
         //获取当前登录用户信息
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
-        qpQualificationApply.setApplyUserid(sysUser.getUserId());//当前登陆人申请数据
+        qpQualificationApply.setUserId(sysUser.getUserId());//当前登陆人申请数据
 
         startPage();
         List<QpQualificationApplyVO> list = qpQualificationApplyService.selectQpQualificationApplyList(qpQualificationApply);
@@ -171,7 +171,7 @@ public class QpQualificationApplyController extends BaseController
         //获取当前登录用户信息
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
         QpQualificationApplyVO qpQualificationApply = new QpQualificationApplyVO();
-        qpQualificationApply.setApplyUserid(sysUser.getUserId());//当前登陆人申请数据
+        qpQualificationApply.setUserId(sysUser.getUserId());//当前登陆人申请数据
         qpQualificationApply.setLeadAuditStatus(2);
         qpQualificationApply.setCenterAuditStatus(2);
 
@@ -397,7 +397,7 @@ public class QpQualificationApplyController extends BaseController
         /*checkType "审核类型 1：资格申请 2：用气申请"),
         checkStatus "审核状态 1：通过 2：已驳回"),
         checkTime "审核时间")*/
-        remoteMessageService.check(qualificationApply.getApplyUserid(),1,qpQualificationApply.getCenterAuditStatus(),new Date(),qualificationApply.getId());
+        remoteMessageService.check(qualificationApply.getUserId(),1,qpQualificationApply.getCenterAuditStatus(),new Date(),qualificationApply.getId());
 
         return  ResultData.result(qpQualificationApplyService.updateQpQualificationApply(qpQualificationApply));
     }
@@ -437,7 +437,7 @@ public class QpQualificationApplyController extends BaseController
             /*checkType "审核类型 1：资格申请 2：用气申请"),
             checkStatus "审核状态 1：通过 2：已驳回"),
             checkTime "审核时间")*/
-            remoteMessageService.check(qualificationApply.getApplyUserid(),1,2,new Date(),qualificationApply.getId());
+            remoteMessageService.check(qualificationApply.getUserId(),1,2,new Date(),qualificationApply.getId());
         }
         return  ResultData.result(qpQualificationApplyService.updateQpQualificationApply(qpQualificationApply));
     }
@@ -503,7 +503,7 @@ public class QpQualificationApplyController extends BaseController
 
         //查询当前用户资格申请总数
         QpQualificationApplyVO applyVO = new QpQualificationApplyVO();
-        applyVO.setApplyUserid(sysUser.getUserId());
+        applyVO.setUserId(sysUser.getUserId());
         List<QpQualificationApplyVO> list = qpQualificationApplyService.selectApplyListCount(applyVO);
 
         for (QpQualificationApplyVO applyvo:list) {

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

@@ -77,7 +77,7 @@ public class QpQualificationApplyManageController extends BaseController
     {
         //获取当前登录用户信息
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
-        qpQualificationApply.setApplyUserid(sysUser.getUserId());
+        qpQualificationApply.setUserId(sysUser.getUserId());
 
         startPage();
         List<QpQualificationApplyVO> list = qpQualificationApplyService.selectQpQualificationApplyList(qpQualificationApply);
@@ -89,7 +89,7 @@ public class QpQualificationApplyManageController extends BaseController
      */
     @PreAuthorize(hasPermi = PerPrefix.AIRBOTTLE_QUALIFICATIONAPPLYMANAGE+ "listManage")
     @GetMapping("/listManage")
-    @ApiOperation(value = "用气资格管理列表",notes = "权限字符："+ PerPrefix.AIRBOTTLE_QUALIFICATIONAPPLYMANAGE+ PerFun.LIST)
+    @ApiOperation(value = "用气资格管理列表",notes = "权限字符："+ PerPrefix.AIRBOTTLE_QUALIFICATIONAPPLYMANAGE+ "listManage")
     public TableDataInfo<QpQualificationApplyVO> listManage(QpQualificationApplyVO qpQualificationApply)
     {
         qpQualificationApply.setCenterAuditStatus(1);//审核通过的数据
@@ -294,7 +294,7 @@ public class QpQualificationApplyManageController extends BaseController
             /*checkType "审核类型 1：资格申请 2：用气申请"),
             checkStatus "审核状态 1：通过 2：已驳回"),
             checkTime "审核时间")*/
-            remoteMessageService.check(qualificationApply.getApplyUserid(),1,qpQualificationApply.getCenterAuditStatus(),new Date(),qpQualificationApply.getId());
+            remoteMessageService.check(qualificationApply.getUserId(),1,qpQualificationApply.getCenterAuditStatus(),new Date(),qpQualificationApply.getId());
         }
        return  ResultData.result(qpQualificationApplyService.updateQpQualificationApply(qpQualificationApply));
     }
@@ -334,7 +334,7 @@ public class QpQualificationApplyManageController extends BaseController
             /*checkType "审核类型 1：资格申请 2：用气申请"),
             checkStatus "审核状态 1：通过 2：已驳回"),
             checkTime "审核时间")*/
-            remoteMessageService.check(qualificationApply.getApplyUserid(),1,2,new Date(),qpQualificationApply.getId());
+            remoteMessageService.check(qualificationApply.getUserId(),1,2,new Date(),qpQualificationApply.getId());
         }
 
 

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

@@ -43,7 +43,7 @@ public class QpQualificationApply extends BaseEntity
     /** 申请人id */
     @Excel(name = "申请人id")
     @ApiModelProperty(value = "申请人id")
-    private Long applyUserid;
+    private Long userId;
     /** 申请人 */
     @Excel(name = "申请人")
     @Length(message = "申请人长度不能超过200")
@@ -128,4 +128,12 @@ public class QpQualificationApply extends BaseEntity
     @ApiModelProperty(value = "原因")
     private String centerAuditCause;
 
-}
+    @Override
+    public Long getUserId() {
+        return userId;
+    }
+    @Override
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+}

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

@@ -11,8 +11,10 @@ import com.zd.airbottle.domain.vo.QpQualificationApplyVO;
 import com.zd.airbottle.mapper.QpBottleStorageMapper;
 import com.zd.airbottle.mapper.QpQualificationApplyDetailMapper;
 import com.zd.airbottle.mapper.QpSupplierMapper;
+import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.StringUtils;
+import com.zd.common.datascope.annotation.DataScope;
 import com.zd.common.security.service.TokenService;
 import com.zd.common.security.utils.SaveUtil;
 
@@ -82,6 +84,7 @@ public class QpQualificationApplyServiceImpl implements IQpQualificationApplySer
      * @return 资格申请
      */
     @Override
+    //@DataScope(deptAlias = "d", userAlias = "u", permi = PerPrefix.AIRBOTTLE_QUALIFICATIONAPPLYMANAGE)
     public List<QpQualificationApplyVO> selectQpQualificationApplyList(QpQualificationApplyVO qpQualificationApply)
     {
         List<QpQualificationApplyVO> list= qpQualificationApplyMapper.selectQpQualificationApplyList(qpQualificationApply);
@@ -118,7 +121,7 @@ public class QpQualificationApplyServiceImpl implements IQpQualificationApplySer
         int flg=0;
 
         //申请表数据录入
-        qpQualificationApplyVo.setApplyUserid(sysUser.getUserId());
+        qpQualificationApplyVo.setUserId(sysUser.getUserId());
         qpQualificationApplyVo.setApplyUser(sysUser.getNickName());
         flg= qpQualificationApplyMapper.insertQpQualificationApply(qpQualificationApplyVo);
 

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

@@ -93,7 +93,7 @@ public class QpTaskServiceImpl implements IQpTaskService {
         QpQualificationApplyVO qpQualificationApplyVO = new QpQualificationApplyVO();
         qpQualificationApplyVO.setSubjectId(qpTaskVO.getLocationId());//实验室id
         qpQualificationApplyVO.setCenterAuditStatus(1);//实验中心审核通过
-        qpQualificationApplyVO.setApplyUserid(sysUser.getUserId());//用户id
+        qpQualificationApplyVO.setUserId(sysUser.getUserId());//用户id
         List<QpQualificationApplyVO> applyVOList = qpQualificationApplyService.selectQpQualificationApplyList(qpQualificationApplyVO);
         if(applyVOList.isEmpty()){
             throw new ServiceException("请先申请该实验室的气瓶申请资格");

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

@@ -107,7 +107,7 @@ public class QpUseRecordServiceImpl implements IQpUseRecordService {
         //查询用户使用资格
         LoginUser user = userInfo.getData();
         QpQualificationApplyVO qualificationApply = new QpQualificationApplyVO();
-        qualificationApply.setApplyUserid(user.getUserid());
+        qualificationApply.setUserId(user.getUserid());
         List<QpQualificationApplyVO> qualificationApplies = qualificationApplyService.selectQpQualificationApplyList(qualificationApply);
         qualificationApplies = qualificationApplies.stream().filter(qa -> qa.getCenterAuditStatus() == 1).filter(qa -> qa.getEndTime().getTime() > Calendar.getInstance().getTime().getTime()).collect(Collectors.toList());
         if (qualificationApplies.isEmpty()) {

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

@@ -8,7 +8,7 @@
         <result property="id"    column="id"    />
         <result property="subjectId"    column="subject_id"    />
         <result property="location"    column="location"    />
-        <result property="applyUserid"    column="apply_userid"    />
+        <result property="userId"    column="user_id"    />
         <result property="applyUser"    column="apply_user"    />
         <result property="deptId"    column="dept_id"    />
         <result property="deptName"    column="dept_name"    />
@@ -36,7 +36,7 @@
         <result property="id"    column="id"    />
         <result property="subjectId"    column="subject_id"    />
         <result property="location"    column="location"    />
-        <result property="applyUserid"    column="apply_userid"    />
+        <result property="userId"    column="user_id"    />
         <result property="applyUser"    column="apply_user"    />
         <result property="deptId"    column="dept_id"    />
         <result property="deptName"    column="dept_name"    />
@@ -61,7 +61,7 @@
     </resultMap>
 
     <sql id="selectQpQualificationApplyVo">
-        select id, subject_id, location, apply_userid, apply_user,dept_id,dept_name,
+        select id, subject_id, location, user_id, apply_user,dept_id,dept_name,
                phone, start_time, end_time, gas_use, apply_certificate,
                safety_precautions, use_gas_id, lead_audit_status, lead_audit_userid,lead_audit_username,
                lead_audit_time, lead_audit_cause, center_audit_status, center_audit_userid,center_audit_username,
@@ -69,7 +69,7 @@
         from qp_qualification_apply
     </sql>
     <sql id="selectQpQualificationApplyListVo">
-        select t.id, t.subject_id, t.location, t.apply_userid, t.apply_user,t.dept_id,t.dept_name, t.phone,
+        select t.id, t.subject_id, t.location, t.user_id, t.apply_user,t.dept_id,t.dept_name, t.phone,
                t.start_time, t.end_time, t.gas_use, t.apply_certificate, t.safety_precautions, t.use_gas_id,
                t.lead_audit_status, t.lead_audit_userid,t.lead_audit_username, t.lead_audit_time, t.lead_audit_cause,
                t.center_audit_status, t.center_audit_userid,t.center_audit_username,
@@ -79,6 +79,8 @@
                ( select sum(d.bottle_number) from qp_qualification_apply_detail d where d.qualificate_apply_id = t.id) bottle_number,
                ( select admin_id from lab_subject  su where  su.id=t.subject_id ) admin_id
         from qp_qualification_apply as t
+         LEFT JOIN   sys_dept d on   t.dept_id=d.dept_id
+         LEFT JOIN sys_user u on  t.user_id=u.user_id
     </sql>
     <select id="selectQpQualificationApplyList" parameterType="com.zd.airbottle.domain.vo.QpQualificationApplyVO" resultMap="QpQualificationApplyResultVO">
         <include refid="selectQpQualificationApplyListVo"/>
@@ -91,7 +93,7 @@
             </if>
             <if test="subjectId != null "> and t.subject_id = #{subjectId}</if>
             <if test="location != null  and location != ''"> and t.location = #{location}</if>
-            <if test="applyUserid != null "> and t.apply_userid = #{applyUserid}</if>
+            <if test="userId != null "> and t.user_id = #{userId}</if>
             <if test="applyUser != null  and applyUser != ''"> and t.apply_user = #{applyUser}</if>
             <if test="deptId != null "> and t.dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''"> and t.dept_name like concat('%', #{deptName}, '%')</if>
@@ -121,6 +123,8 @@
                     #{id}
                 </foreach>
              </if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
         order by
         <if test="remark != '100' "> t.create_time</if>
         <if test="remark == '100' "> t.lead_audit_time</if>
@@ -139,7 +143,7 @@
 
             <if test="location != null">location,</if>
 
-            <if test="applyUserid != null">apply_userid,</if>
+            <if test="userId != null">user_id,</if>
 
             <if test="applyUser != null">apply_user,</if>
 
@@ -187,7 +191,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="subjectId != null">#{subjectId},</if>
             <if test="location != null">#{location},</if>
-            <if test="applyUserid != null">#{applyUserid},</if>
+            <if test="userId != null">#{userId},</if>
             <if test="applyUser != null">#{applyUser},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="deptName != null">#{deptName},</if>
@@ -217,7 +221,7 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="subjectId != null">subject_id = #{subjectId},</if>
             <if test="location != null">location = #{location},</if>
-            <if test="applyUserid != null">apply_userid = #{applyUserid},</if>
+            <if test="userId != null">user_id = #{userId},</if>
             <if test="applyUser != null">apply_user = #{applyUser},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="deptName != null">dept_name = #{deptName},</if>
@@ -342,7 +346,7 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="subjectId != null">subject_id = #{subjectId},</if>
             <if test="location != null">location = #{location},</if>
-            <if test="applyUserid != null">apply_userid = #{applyUserid},</if>
+            <if test="userId != null">user_id = #{userId},</if>
             <if test="applyUser != null">apply_user = #{applyUser},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="deptName != null">dept_name = #{deptName},</if>
@@ -374,7 +378,7 @@
     <select id="selectApplyListCount" parameterType="com.zd.airbottle.domain.QpQualificationApply" resultMap="QpQualificationApplyResultVO">
         <include refid="selectQpQualificationApplyListVo"/>
         <where>
-            <if test="applyUserid != null "> and t.apply_userid = #{applyUserid}</if>
+            <if test="userId != null "> and t.user_id = #{userId}</if>
         </where>
         order by create_time desc
     </select>