仓库报表

platform-activiti/src/main/java/com/platform/activiti/controller/ActivitiController.java

@@ -421,6 +421,9 @@ public class ActivitiController {
         return R.success(page);
     }
 
+
+
+
     /**
      * 获取已办
      * @param pageNum

platform-common/src/main/java/com/platform/common/constant/CommonConstants.java

@@ -259,4 +259,5 @@ public interface CommonConstants {
     String SB_SCRAP_FORM = "sb_info_scrap"; // 设备报废单
     String SB_STOP_FORM = "sb_info_stop"; // 设备停用单
 
+
 }

platform-dao/src/main/java/com/platform/dao/mapper/check/CheckJobMapper.java

@@ -7,6 +7,8 @@ import com.platform.dao.entity.check.CheckStandard;
 import com.platform.dao.vo.query.check.CheckJobVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -48,4 +50,5 @@ public interface CheckJobMapper extends MyMapper<CheckJob> {
     int getNotFinishNumByDTO(CheckJobDTO record);
 
     void updateBatch(List<CheckJob> updateList);
+    BigDecimal getCheckJobCount(CheckJobDTO checkJobDTO);
 }

platform-dao/src/main/java/com/platform/dao/mapper/repair/RepairApplicationFormMapper.java

@@ -5,6 +5,8 @@ import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.vo.repair.RepairApplicationFormVO;
 import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -58,4 +60,6 @@ public interface RepairApplicationFormMapper extends MyMapper<RepairApplicationF
      * @param model
      */
     void updateForRepairDispatch(RepairApplicationForm model);
+
+    List<RepairApplicationFormVO> getRepairCount(RepairApplicationFormDTO dto);
 }

platform-dao/src/main/java/com/platform/dao/mapper/upms/SysUserRoleMapper.java

@@ -34,4 +34,6 @@ public interface SysUserRoleMapper extends MyMapper<SysUserRole> {
      * @return ：
      */
     List<SysUserRole> selectListByRoleAndUserStatus(@Param("roleId") String roleId, @Param("status") Integer status);
+
+    List<SysUserRoleVO> selectRoleListByUserId(String userId);
 }

platform-dao/src/main/java/com/platform/dao/mapper/workplace/WorkplaceBacklogMapper.java

@@ -7,6 +7,7 @@ import com.platform.dao.entity.workplace.WorkplaceBacklog;
 import com.platform.dao.vo.query.workplace.WorkplaceBacklogUserVO;
 import org.springframework.stereotype.Component;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -36,6 +37,8 @@ public interface WorkplaceBacklogMapper extends MyMapper<WorkplaceBacklog> {
 
     List<WorkplaceBacklogUserVO> queryNew(WorkplaceBacklogUserDTO model);
 
+    BigDecimal getWorkplaceBacklogCount(String userId);
+
 }
 
 

platform-dao/src/main/java/com/platform/dao/vo/NoticeNumberVO.java

@@ -0,0 +1,45 @@
+package com.platform.dao.vo;
+
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description
+ * @Author chenli
+ * @Date 2019/7/30
+ * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+public class NoticeNumberVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    //维修
+    //维修中
+    private BigDecimal inTheMaintenanceNum;
+    //待分配
+    private BigDecimal waitForDistributionNum;
+    //待审核
+    private BigDecimal pendingApprovalNum;
+
+    //未执行保养任务
+    private BigDecimal unexectuedMaintenanceNum;
+
+    //待办
+    //待审批
+    private BigDecimal waitForExamineNum;
+    //待签收
+    private BigDecimal waitForSignInNum;
+
+    //通知
+    //未读
+    private BigDecimal unreadNum;
+
+
+
+
+}

platform-dao/src/main/java/com/platform/dao/vo/SysUserRoleVO.java

@@ -33,4 +33,6 @@ public class SysUserRoleVO implements Serializable {
      */
     private String roleName;
 
+    private String roleCode;
+
 }

platform-dao/src/main/java/com/platform/dao/vo/repair/RepairApplicationFormVO.java

@@ -365,4 +365,6 @@ public class RepairApplicationFormVO extends BaseVO implements Serializable {
      * 星期几名称
      */
     private String weekDayName;
+
+    private BigDecimal count;
 }

platform-dao/src/main/resources/mapper/check/CheckJobMapper.xml

@@ -286,4 +286,17 @@
             where id = #{item.id}
         </foreach>
     </update>
+
+    <select id="getCheckJobCount" parameterType="com.platform.dao.dto.check.CheckJobDTO"
+            resultType="BigDecimal">
+        select count(0) from t_check_job
+        <where>
+            <if test="status!=null">
+                and status=#{status}
+            </if>
+            <if test="checkUserId!=null">
+                and check_user_id=#{checkUserId}
+            </if>
+        </where>
+    </select>
 </mapper>

platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -277,4 +277,17 @@
         </set>
         where id = #{id}
     </update>
+
+    <select id="getRepairCount" resultType="com.platform.dao.vo.repair.RepairApplicationFormVO"
+            parameterType="com.platform.dao.dto.repair.RepairApplicationFormDTO"
+    >
+        select status,count(1) as count  from t_repair_application_form form
+        <where>
+            status in (1,2,3)
+            <if test="repairUserId!=null">
+                repair_user_id=#{repairUserId}
+            </if>
+        </where>
+        group by status
+    </select>
 </mapper>

platform-dao/src/main/resources/mapper/upms/SysUserRoleMapper.xml

@@ -20,4 +20,12 @@
           and u.status = #{status}
     </select>
 
+    <select id="selectRoleListByUserId" parameterType="String"
+            resultType="com.platform.dao.vo.SysUserRoleVO">
+        select role.role_code, ur.*,u.username as username from t_sys_user_role ur
+        join t_sys_user u on ur.user_id = u.user_id join t_sys_role role
+        on role.role_id=ur.role_id
+        where u.user_id=#{userId}
+    </select>
+
 </mapper>

platform-dao/src/main/resources/mapper/workplace/WorkplaceBacklogMapper.xml

@@ -84,4 +84,11 @@
         </where>
         order by b.created_time desc
     </select>
+
+    <select id="getWorkplaceBacklogCount" parameterType="String"
+            resultType="BigDecimal">
+        select count(1) from t_workplace_backlog b join t_workplace_backlog_user u on
+        b.id=u.backlog_id
+        where u.user_id=#{userId} and u.status=1
+    </select>
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairApplicationFormController.java

@@ -7,6 +7,7 @@ import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.enums.RepairApplicationFormTypeEnum;
 import com.platform.dao.util.ExcelUtil;
+import com.platform.dao.vo.NoticeNumberVO;
 import com.platform.dao.vo.export.repair.ExportRepairApplicationFormVO;
 import com.platform.dao.vo.repair.RepairApplicationFormVO;
 import com.platform.rest.log.annotation.SysLog;
@@ -313,4 +314,11 @@ public class RepairApplicationFormController {
         ExcelUtil.exportResponseDict(response, ExportRepairApplicationFormVO.class, excelList, "维修工单");
     }
 
+    @SysLog("获取维修单，保养任务，待办，通知的数量")
+    @GetMapping("/getNums")
+    public R getNums() {
+        NoticeNumberVO noticeNumberVO=repairApplicationFormService.getNoticeNumberVO();
+        return new R<>(noticeNumberVO);
+    }
+
 }

platform-service/src/main/java/com/platform/service/repair/RepairApplicationFormService.java

@@ -7,6 +7,7 @@ import com.platform.dao.dto.repair.RepairCheckDTO;
 import com.platform.dao.dto.repair.RepairFormDTO;
 import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.entity.repair.RepairForm;
+import com.platform.dao.vo.NoticeNumberVO;
 import com.platform.dao.vo.query.check.CheckJobVO;
 import com.platform.dao.vo.query.workplace.WorkplaceRepairVO;
 import com.platform.dao.vo.repair.RepairApplicationFormVO;
@@ -134,4 +135,6 @@ public interface RepairApplicationFormService extends IBaseService<RepairApplica
      * @return
      */
     List<RepairApplicationFormVO> getCurrentlyList(String userId);
+
+    NoticeNumberVO getNoticeNumberVO();
 }

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -5,6 +5,8 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
+import com.platform.activiti.controller.ActivitiController;
+import com.platform.activiti.dao.entity.ActApplyInfo;
 import com.platform.common.bean.DictVO;
 import com.platform.common.cache.ConfigCache;
 import com.platform.common.cache.DictCache;
@@ -14,7 +16,9 @@ import com.platform.common.exception.BusinessException;
 import com.platform.common.exception.DeniedException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
+import com.platform.dao.bean.MyPage;
 import com.platform.dao.bean.MyVOPage;
+import com.platform.dao.dto.check.CheckJobDTO;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.dto.repair.RepairFeeDTO;
 import com.platform.dao.dto.sb.SbInfoDTO;
@@ -25,10 +29,15 @@ import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.entity.upms.SysFile;
 import com.platform.dao.entity.upms.SysUser;
 import com.platform.dao.enums.*;
+import com.platform.dao.mapper.check.CheckJobMapper;
 import com.platform.dao.mapper.repair.*;
 import com.platform.dao.mapper.upms.SysFileMapper;
 import com.platform.dao.mapper.upms.SysUserMapper;
+import com.platform.dao.mapper.upms.SysUserRoleMapper;
+import com.platform.dao.mapper.workplace.WorkplaceBacklogMapper;
 import com.platform.dao.util.MessageTemplateUtil;
+import com.platform.dao.vo.NoticeNumberVO;
+import com.platform.dao.vo.SysUserRoleVO;
 import com.platform.dao.vo.SysUserVO;
 import com.platform.dao.vo.query.repair.RepairFeeVO;
 import com.platform.dao.vo.query.workplace.WorkplaceRepairVO;
@@ -81,6 +90,89 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     private final SysFileMapper sysFileMapper;
     private final SysUserMapper userMapper;
     private final RepairFeeMapper repairFeeMapper;
+    private final SysUserRoleMapper sysUserRoleMapper;
+    private final CheckJobMapper checkJobMapper;
+    private final WorkplaceBacklogMapper workplaceBacklogMapper;
+    private final ActivitiController activitiController;
+
+    @Override
+    public NoticeNumberVO getNoticeNumberVO() {
+        System.out.println(LocalDateTime.now());
+        NoticeNumberVO noticeNumberVO=new NoticeNumberVO();
+        //先判断是否超级管理员
+        UserInfo userInfo=SecurityUtils.getUserInfo();
+        //根据userId获取所有权限
+        List<SysUserRoleVO> sysUserRoleVOS = sysUserRoleMapper.selectRoleListByUserId(userInfo.getUserId());
+//        List<SysUserRoleVO> sysUserRoleVOS = sysUserRoleMapper.selectRoleListByUserId("1");
+        List<RepairApplicationFormVO> repairApplicationFormVOS= mapper.getRepairCount(null);
+        StringBuffer sb=new StringBuffer();
+        if(userInfo.getSuperAdmin()==1){
+//            if(1==1){
+
+                //目前有维修、保养、待办、通知，只有维修判定为维修管理员，即看到所有维修数据
+            for(RepairApplicationFormVO vo: repairApplicationFormVOS){
+                if(vo.getStatus()==1){
+                    noticeNumberVO.setWaitForDistributionNum(vo.getCount());
+                }else if(vo.getStatus()==2){
+                    noticeNumberVO.setInTheMaintenanceNum(vo.getCount());
+                }else if(vo.getStatus()==3){
+                    noticeNumberVO.setPendingApprovalNum(vo.getCount());
+                }
+            }
+
+        }else {
+            for(SysUserRoleVO vo:sysUserRoleVOS){
+                sb.append(vo.getRoleCode());
+            }
+            if(sb.toString().contains(CommonConstants.WORKPLACE_REPAIR_MANAGE)){
+                for(RepairApplicationFormVO vo: repairApplicationFormVOS){
+                    if(vo.getStatus()==1){
+                        noticeNumberVO.setWaitForDistributionNum(vo.getCount());
+                    }else if(vo.getStatus()==2){
+                        noticeNumberVO.setInTheMaintenanceNum(vo.getCount());
+                    }else if(vo.getStatus()==3){
+                        noticeNumberVO.setPendingApprovalNum(vo.getCount());
+                    }
+                }
+            }else if(sb.toString().contains(CommonConstants.WORKPLACE_REPAIR_NORMAL)){
+                RepairApplicationFormDTO queryDTO=new RepairApplicationFormDTO();
+//                queryDTO.setRepairUserId("1");
+                queryDTO.setRepairUserId(userInfo.getUserId());
+                List<RepairApplicationFormVO> repairApplicationFormVOS1= mapper.getRepairCount(queryDTO);
+                for(RepairApplicationFormVO vo: repairApplicationFormVOS1){
+                    if(vo.getStatus()==1){
+                        noticeNumberVO.setWaitForDistributionNum(vo.getCount());
+                    }else if(vo.getStatus()==2){
+                        noticeNumberVO.setInTheMaintenanceNum(vo.getCount());
+                    }else if(vo.getStatus()==3){
+                        noticeNumberVO.setPendingApprovalNum(vo.getCount());
+                    }
+                }
+            }
+        }
+        CheckJobDTO checkJobDTO=new CheckJobDTO();
+//        checkJobDTO.setCheckUserId("1");
+        checkJobDTO.setCheckUserId(userInfo.getUserId());
+        checkJobDTO.setStatus(CheckJobStatusEnum.NOT_EXECUTE.getValue());
+        //保养
+        BigDecimal count=checkJobMapper.getCheckJobCount(checkJobDTO);
+        noticeNumberVO.setUnexectuedMaintenanceNum(count);
+        //待办
+        //待签收
+        MyPage<ActApplyInfo> myPage = (MyPage<ActApplyInfo>)activitiController.showTaskListClaim(1,10).getData();
+        noticeNumberVO.setWaitForSignInNum(new BigDecimal(myPage.getTotal()));
+        //待审批
+        MyPage<ActApplyInfo> myPage1=(MyPage<ActApplyInfo>)activitiController.showTaskList(1,10).getData();
+        noticeNumberVO.setWaitForExamineNum(new BigDecimal(myPage1.getTotal()));
+        //通知
+//        BigDecimal num=workplaceBacklogMapper.getWorkplaceBacklogCount("1");
+        BigDecimal num=workplaceBacklogMapper.getWorkplaceBacklogCount(userInfo.getUserId());
+        noticeNumberVO.setUnreadNum(num);
+
+        System.out.println(LocalDateTime.now());
+
+        return noticeNumberVO;
+    }
 
     @Override
     public List<RepairApplicationFormVO> getVOListByDTO(RepairApplicationFormDTO model) {
@@ -974,6 +1066,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         return result;
     }
 
+
     /**
      * 数据封装
      * @param type  工单维修类型 内部还是外部