3254194295 2 жил өмнө
parent
commit
ff817a5f70

+ 26 - 18
platform-dao/src/main/java/com/platform/dao/vo/NoticeNumberVO.java

@@ -19,54 +19,62 @@ public class NoticeNumberVO implements Serializable {
     private static final long serialVersionUID = 1L;
     private Integer roleFlag;
 
+    public NoticeNumberVO(){
+        this.inTheMaintenanceNum=this.waitForDistributionNum=this.repairCheckNum=this.produceCheckNum
+                =this.finishedNum=this.unexectuedMaintenanceNum=this.allBaoYangTaskNum=this.executedTaskNum
+                =this.timeOutTaskNum=this.inStoreNum=this.outStoreNum=this.pdNum=this.dbNum
+                =this.waitForExamineNum=this.waitForSignInNum=this.unreadNum
+                =this.myRepairNum=this.myCheckRepairNum = new BigDecimal(0);
+    }
+
     //维修
     //维修中
-    private BigDecimal inTheMaintenanceNum=new BigDecimal(0);
+    private BigDecimal inTheMaintenanceNum;
     //待分配
-    private BigDecimal waitForDistributionNum=new BigDecimal(0);
+    private BigDecimal waitForDistributionNum;
     //待审核
 //    private BigDecimal pendingApprovalNum;
 
     //待维修主管审核
-    private BigDecimal repairCheckNum=new BigDecimal(0);
+    private BigDecimal repairCheckNum;
     //待生产审核
-    private BigDecimal produceCheckNum=new BigDecimal(0);
+    private BigDecimal produceCheckNum;
     //已完成
-    private BigDecimal finishedNum=new BigDecimal(0);
+    private BigDecimal finishedNum;
 
     //未执行保养任务
-    private BigDecimal unexectuedMaintenanceNum=new BigDecimal(0);
+    private BigDecimal unexectuedMaintenanceNum;
     //全部保养任务
-    private BigDecimal allBaoYangTaskNum=new BigDecimal(0);
+    private BigDecimal allBaoYangTaskNum;
     //已执行保养任务
-    private BigDecimal executedTaskNum=new BigDecimal(0);
+    private BigDecimal executedTaskNum;
     //超市保养任务
-    private BigDecimal timeOutTaskNum=new BigDecimal(0);
+    private BigDecimal timeOutTaskNum;
 
     //仓库
     //入库
-    private BigDecimal inStoreNum=new BigDecimal(0);
+    private BigDecimal inStoreNum;
     //出库
-    private BigDecimal outStoreNum=new BigDecimal(0);
+    private BigDecimal outStoreNum;
     //盘点
-    private BigDecimal pdNum=new BigDecimal(0);
+    private BigDecimal pdNum;
     //调拨
-    private BigDecimal dbNum=new BigDecimal(0);
+    private BigDecimal dbNum;
 
 
     //待办
     //待审批
-    private BigDecimal waitForExamineNum=new BigDecimal(0);
+    private BigDecimal waitForExamineNum;
     //待签收
-    private BigDecimal waitForSignInNum=new BigDecimal(0);
+    private BigDecimal waitForSignInNum;
 
     //通知
     //未读
-    private BigDecimal unreadNum=new BigDecimal(0);
+    private BigDecimal unreadNum;
 
-    private BigDecimal myRepairNum=new BigDecimal(0);
+    private BigDecimal myRepairNum;
 
-    private BigDecimal myCheckRepairNum=new BigDecimal(0);
+    private BigDecimal myCheckRepairNum;
 
 
 

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

@@ -245,17 +245,17 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     public NoticeNumberVO getNoticeNumberVO() {
         Long t1=System.currentTimeMillis();
         NoticeNumberVO noticeNumberVO=new NoticeNumberVO();
-        UserInfo userInfo=SecurityUtils.getUserInfo();
-//        UserInfo userInfo=new UserInfo();
-//        List list=new ArrayList();
+//        UserInfo userInfo=SecurityUtils.getUserInfo();
+        UserInfo userInfo=new UserInfo();
+        List list=new ArrayList();
 //        list.add("workplace_store_normal");
 //        list.add("workplace_store_manage");
 //        list.add("workplace-repair-normal");
 //        list.add("workplace-repair-manage");
-//        list.add("REPAIR_MANAGE");
-//        userInfo.setSuperAdmin(0);
-//        userInfo.setUserId("629ff44ad2b1150bf0e3f834");
-//        userInfo.setRoleCodes(list);
+        list.add("REPAIR_EXAMINE");
+        userInfo.setSuperAdmin(0);
+        userInfo.setUserId("62c3f179a5a6383534617ecd");
+        userInfo.setRoleCodes(list);
         InStoreFormDTO inStoreFormDTO=new InStoreFormDTO();
         OutStoreFormDTO outStoreFormDTO=new OutStoreFormDTO();
         StoreCheckJobDTO storeCheckJobDTO=new StoreCheckJobDTO();