优化

platform-dao/src/main/java/com/platform/dao/dto/sbUnused/SbUnusedDTO.java

@@ -22,6 +22,11 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbUnusedDTO extends BaseDTO implements Serializable {
+    /**
+     * 二审人：何经理
+     */
+    private String verityUserId2;
+    private String allUserId;
     private LocalDateTime updateTime;
     private String advice;
     private List<SbInfoDTO> sbInfoDTOS;

platform-dao/src/main/java/com/platform/dao/entity/sbUnused/SbUnused.java

@@ -63,6 +63,11 @@ public class SbUnused implements Serializable{
      */
     private String verityUserId;
 
+    /**
+     * 二审人：何经理
+     */
+    private String verityUserId2;
+
    /**
     * 数据权限
     */

platform-dao/src/main/java/com/platform/dao/mapper/sbUnused/SbUnusedMapper.java

@@ -3,6 +3,7 @@ package com.platform.dao.mapper.sbUnused;
 import com.platform.dao.dto.sbUnused.SbUnusedDTO;
 import com.platform.dao.config.MyMapper;
 import com.platform.dao.entity.sbUnused.SbUnused;
+import com.platform.dao.vo.SbUnusedCount;
 import com.platform.dao.vo.query.sbUnused.SbUnusedVO;
 import org.springframework.stereotype.Component;
 import java.util.List;
@@ -16,6 +17,8 @@ import java.util.List;
  */
 @Component
 public interface SbUnusedMapper extends MyMapper<SbUnused> {
+    List<SbUnusedCount> getSbUnusedCount(SbUnusedDTO dto);
+
     SbUnusedVO getUnusedVO(String id);
     /**
      * 分页查询

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

@@ -25,9 +25,27 @@ public class NoticeNumberVO2 implements Serializable {
                 =this.waitForExamineNum=this.waitForSignInNum
                 =this.unreadNum=this.myRepairNum=this.myCheckRepairNum
                 =this.notDealNum=this.yesDealNum=this.notAcceptancedNum
-                =this.returnNum=this.finishNum=new BigDecimal(0);
+                =this.returnNum=this.finishNum
+                =this.verifyOneNum = this.verifyTwoNum
+                =this.finishXZNum = this.refuseNum=
+                new BigDecimal(0);
     }
 
+    /**
+     * 设备闲置
+     */
+    //一审中数量
+    private BigDecimal verifyOneNum;
+
+    //二审中数量
+    private BigDecimal verifyTwoNum;
+
+    //被拒数量
+    private BigDecimal refuseNum;
+
+    //完成数量
+    private BigDecimal finishXZNum;
+
     //报修待审
     private BigDecimal waitForCheckNum;
     //维修中

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

@@ -0,0 +1,22 @@
+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 SbUnusedCount implements Serializable {
+    private BigDecimal num;
+    private Integer status;
+
+}

platform-dao/src/main/java/com/platform/dao/vo/query/sbUnused/SbUnusedVO.java

@@ -24,6 +24,11 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbUnusedVO extends BaseVO implements Serializable{
+    private String verifyUserName2;
+    /**
+     * 二审人：何经理
+     */
+    private String verityUserId2;
     private List<SbUnusedVerifyRecordVO> sbUnusedVerifyRecordVOS;
     private String verifyUserName;
     private LocalDateTime updateTime;

platform-dao/src/main/resources/mapper/sbUnused/SbUnusedMapper.xml

@@ -64,9 +64,10 @@
         </if>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.sbUnused.SbUnusedDTO" resultType="com.platform.dao.vo.query.sbUnused.SbUnusedVO">
-        select unused.*,user.real_name as applyName,user2.real_name as verifyUserName
+        select unused.*,user.real_name as applyName,user2.real_name as verifyUserName,user3.real_name as verifyUserName2
         from t_sb_unused as unused left join t_sys_user user on user.user_id = unused.apply_user_id
         left join t_sys_user user2 on user2.user_id = unused.verity_user_id
+        left join t_sys_user user3 on user3.user_id = unused.verity_user_id2
                                                                                                                                                                                                     <where>
             <include refid="List_Condition" />
         </where>
@@ -74,9 +75,25 @@
 
     <select id="getUnusedVO" parameterType="java.lang.String"
     resultType="com.platform.dao.vo.query.sbUnused.SbUnusedVO">
-        select unused.*,user.real_name as applyName,user2.real_name as verifyUserName from t_sb_unused unused left join t_sys_user user
+        select unused.*,user.real_name as applyName,user2.real_name as verifyUserName,
+         user3.real_name as verifyUserName2
+         from t_sb_unused unused left join t_sys_user user
         on unused.apply_user_id = user.user_id
         left join t_sys_user user2 on user2.user_id = unused.verity_user_id
+        left join t_sys_user user3 on user3.user_id = unused.verity_user_id2
         where id = #{id}
     </select>
+
+    <select id="getSbUnusedCount" resultType="com.platform.dao.vo.SbUnusedCount"
+            parameterType="com.platform.dao.dto.sbUnused.SbUnusedDTO">
+        select count(1) as num,unused.status from t_sb_unused unused
+        where 1=1
+        <if test="allUserId!=null and allUserId!=''">
+            and (unused.apply_user_id = #{allUserId} or
+            unused.verity_user_id = #{allUserId} or
+            unused.verity_user_id2 = #{allUserId}
+            )
+        </if>
+        group by unused.status
+    </select>
 </mapper>

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

@@ -22,6 +22,7 @@ import com.platform.dao.dto.repair.RepairFeeDTO;
 import com.platform.dao.dto.repair.RepairRecordTemplateData;
 import com.platform.dao.dto.repair.RepairTicketTemplateData;
 import com.platform.dao.dto.sb.SbInfoDTO;
+import com.platform.dao.dto.sbUnused.SbUnusedDTO;
 import com.platform.dao.dto.store.InStoreFormDTO;
 import com.platform.dao.dto.store.OutStoreFormDTO;
 import com.platform.dao.dto.store.StoreCheckJobDTO;
@@ -41,6 +42,7 @@ import com.platform.dao.mapper.repair.RepairApplicationFormMapper;
 import com.platform.dao.mapper.repair.RepairFeeMapper;
 import com.platform.dao.mapper.repair.RepairReasonMapper;
 import com.platform.dao.mapper.sb.SbPositionMapper;
+import com.platform.dao.mapper.sbUnused.SbUnusedMapper;
 import com.platform.dao.mapper.store.InStoreFormMapper;
 import com.platform.dao.mapper.store.OutStoreFormMapper;
 import com.platform.dao.mapper.store.StoreCheckJobMapper;
@@ -116,6 +118,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     private final SbPositionMapper sbPositionMapper;
     private final PreparationMapper preparationMapper;
     private final SysDictService sysDictService;
+    private final SbUnusedMapper sbUnusedMapper;
     private final BigDecimal initNum= new BigDecimal(0);
 
     @Override
@@ -733,12 +736,31 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             }
         }
     }
+    private void addSbUnusedNums(List<SbUnusedCount> list,NoticeNumberVO2 noticeNumberVO2){
+        for (SbUnusedCount count:list){
+            if (count.getStatus()==SbUnusedStatusEnum.verifying_one.getValue()){
+                noticeNumberVO2.setVerifyOneNum(count.getNum());
+            }else if (count.getStatus()==SbUnusedStatusEnum.verifying_two.getValue()){
+                //待结单
+                noticeNumberVO2.setVerifyTwoNum(count.getNum());
+            }else if (count.getStatus()==SbUnusedStatusEnum.success.getValue()){
+                //报修待审
+                noticeNumberVO2.setFinishXZNum(count.getNum());
+            }
+            else if (count.getStatus()==SbUnusedStatusEnum.refused.getValue()){
+                //报修待审
+                noticeNumberVO2.setRefuseNum(count.getNum());
+            }
+        }
+    }
 
     @Override
     public NoticeNumberVO2 getNoticeNumberVO2() {
         UserInfo userInfo = SecurityUtils.getUserInfo();
+
+        SbUnusedDTO unusedDTO = new SbUnusedDTO();
 //        UserInfo userInfo = new UserInfo();
-//        userInfo.setUserId("6386bb9d3abe141f8c8050a5");
+//        userInfo.setUserId("649be3a9522e3729dcde55f8");
 //        userInfo.setSuperAdmin(0);
         NoticeNumberVO2 noticeNumberVO2 = new NoticeNumberVO2();
         List<CheckJobVO> checkJobVOS;
@@ -756,6 +778,9 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         if (userInfo.getSuperAdmin()==1){
             List<RepairCount> repairCounts = mapper.getrepairCount2(null);
 
+            List<SbUnusedCount> unusedCounts = sbUnusedMapper.getSbUnusedCount(null);
+            addSbUnusedNums(unusedCounts,noticeNumberVO2);
+
             checkJobVOS=checkJobMapper.getCheckJobCount1(checkJobDTO);
             checkJobDTO.setReceiveOvertime(true);
             BigDecimal overTimeCount=checkJobMapper.getReceiveOverTimeCount(checkJobDTO);
@@ -764,6 +789,9 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             noticeNumberVO2=addStoreNums2(noticeNumberVO2,inStoreFormDTO,outStoreFormDTO,storeCheckJobDTO);
             addRepairNums2(repairCounts,noticeNumberVO2);
         }else {
+            unusedDTO.setAllUserId(userInfo.getUserId());
+            List<SbUnusedCount> unusedCounts = sbUnusedMapper.getSbUnusedCount(unusedDTO);
+            addSbUnusedNums(unusedCounts,noticeNumberVO2);
             repairApplicationFormDTO.setAllUserId(userInfo.getUserId());
             List<RepairCount> repairCounts = mapper.getrepairCount2(repairApplicationFormDTO);
             addRepairNums2(repairCounts,noticeNumberVO2);
@@ -778,6 +806,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             storeCheckJobDTO.setUserId(userInfo.getUserId());
             noticeNumberVO2=addStoreNums2(noticeNumberVO2,inStoreFormDTO,outStoreFormDTO,storeCheckJobDTO);
         }
+
         PreparationDTO preparationDTO = new PreparationDTO();
         addPrepationNums2(noticeNumberVO2,preparationDTO);
         // 通知

platform-service/src/main/java/com/platform/service/sbUnused/impl/SbUnusedServiceImpl.java

@@ -103,6 +103,7 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
 
         String domain = getAndCheckPcDomain();
 
+        SbUnused upd = new SbUnused();
         //审核被拒，通知申请人
         if (dto.getStatus()==SbUnusedStatusEnum.refused.getValue()){
             userIds.add(unused.getApplyUserId());
@@ -112,6 +113,7 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
                     BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
             sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
         }else if (dto.getStatus()==SbUnusedStatusEnum.verifying_two.getValue()){
+            upd.setVerityUserId2("636c57bd3abe1415981b18ec");
             userIds.add("636c57bd3abe1415981b18ec");//何经理
             addRecord(userInfo,unused,"审核通过",dto.getAdvice());
             String unusedUrl = domain + "sbUnused/unused?id=" + unused.getId();
@@ -127,7 +129,7 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
                     BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
             sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
         }
-        SbUnused upd = new SbUnused();
+
         upd.setId(unused.getId());
         upd.setStatus(dto.getStatus());
         upd.setAdvice(dto.getAdvice());