小程序优化

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

@@ -68,5 +68,5 @@ public interface RepairApplicationFormMapper extends MyMapper<RepairApplicationF
 
     RepairApplicationFormVO getFirstRepairApplicationFormVO(RepairApplicationFormDTO repairApplicationFormDTO);
 
-    int getRepairCount1(RepairApplicationFormDTO repairApplicationFormDTO);
+    BigDecimal getRepairCount1(RepairApplicationFormDTO repairApplicationFormDTO);
 }

platform-dao/src/main/java/com/platform/dao/vo/query/check/CheckJobVO.java

@@ -42,7 +42,7 @@ public class CheckJobVO implements Serializable{
     /**
      * 数量统计
      */
-    private Integer countNum;
+    private BigDecimal countNum;
     /**
      * 任务名称
      */

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

@@ -27,7 +27,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class RepairApplicationFormVO extends BaseVO implements Serializable {
-    private Integer repairCount;
+    private BigDecimal repairCount;
 
     private String name;
     /**

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

@@ -352,7 +352,7 @@
     </select>
 
     <select id="getRepairCount1" parameterType="com.platform.dao.dto.repair.RepairApplicationFormDTO"
-            resultType="int">
+            resultType="BigDecimal">
         select count(*) from t_repair_application_form form
         <where>
             <if test="statusList != null and statusList.size > 0">

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

@@ -23,6 +23,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -360,6 +361,7 @@ public class RepairApplicationFormController {
 //        list.add("workplace-repair-normal");
 //        list.add("workplace-repair-manage");
 //        list.add("REPAIR_MANAGE");
+//        list.add("REPAIR_EXAMINE");
 //        userInfo.setUserId("629ff44ad2b1150bf0e3f834");
 //        userInfo.setRoleCodes(list);
 //        userInfo.setSuperAdmin(0);
@@ -373,9 +375,9 @@ public class RepairApplicationFormController {
         if(userInfo.getSuperAdmin()==0) {
             if (role.contains(SysRoleCodeEnum.REPAIR_MANAGE.name()) || role.contains(SysRoleCodeEnum.REPAIR_EXAMINE.name()) ||
                     role.contains(SysRoleCodeEnum.Maintenance.name())) {
-                return new R(repairApplicationFormService.getRepairApplicationFormVO());
+                return new R(repairApplicationFormService.getRepairApplicationFormVO(role,userInfo));
             } else if (role.contains(CommonConstants.WORKPLACE_STORE_NORMAL) || role.contains(CommonConstants.WORKPLACE_STORE_MANAGE)) {
-                return new R(repairApplicationFormService.getStoreForm());
+                return new R(repairApplicationFormService.getStoreForm(userInfo));
             }
         }
         return new R<>();

platform-service/src/main/java/com/platform/service/check/impl/CheckJobServiceImpl.java

@@ -237,9 +237,9 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         List<CheckJobVO> tenList = mapper.selectList(model);
         // 返回
         CheckJobScreenVO vo = new CheckJobScreenVO();
-        vo.setMonthNum(allVO.getCountNum());
-        vo.setFinishNum(finishVO.getCountNum());
-        vo.setWaitNum(allVO.getCountNum() - finishVO.getCountNum());
+        vo.setMonthNum(allVO.getCountNum().intValue());
+        vo.setFinishNum(finishVO.getCountNum().intValue());
+        vo.setWaitNum(allVO.getCountNum().intValue() - finishVO.getCountNum().intValue());
         vo.setRate(BigDecimalUtil.div(new BigDecimal(vo.getFinishNum()*100) , new BigDecimal(vo.getMonthNum()), 2));
         vo.setWeekList(tenList);
         return vo;

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

@@ -1,5 +1,6 @@
 package com.platform.service.repair;
 
+import com.platform.common.model.UserInfo;
 import com.platform.common.util.R;
 import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.check.CheckJobDTO;
@@ -29,9 +30,9 @@ import java.util.List;
  */
 public interface RepairApplicationFormService extends IBaseService<RepairApplicationForm, RepairApplicationFormDTO> {
 
-    public R getStoreForm();
+    public R getStoreForm(UserInfo userInfo);
 
-    public RepairApplicationFormVO getRepairApplicationFormVO();
+    public RepairApplicationFormVO getRepairApplicationFormVO(String role, UserInfo userInfo);
 
     public List<RepairApplicationFormVO> getVOListByDTO(RepairApplicationFormDTO model);
 

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

@@ -113,6 +113,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     private final OutStoreFormMapper outStoreFormMapper;
     private final StoreCheckJobMapper storeCheckJobMapper;
     private final SysUserDeptMapper sysUserDeptMapper;
+    private final BigDecimal initNum= new BigDecimal(0);
 
 
 
@@ -123,79 +124,79 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 if (noticeNumberVO.getRoleFlag()==0){
                     //报修中
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {
-                        noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                        noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
                     //维修中
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()){
-                        noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                        noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
                     //待生产审核
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue()){
-                        noticeNumberVO.setProduceCheckNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                        noticeNumberVO.setProduceCheckNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
                     //已完成
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()){
-                        noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                        noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
                     //待维修主管审核
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
-                        noticeNumberVO.setRepairCheckNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                        noticeNumberVO.setRepairCheckNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
                     //报修人
                 }else if(noticeNumberVO.getRoleFlag()==2){
                     //报修中
                     if(vo.getStatus()== RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()){
-                        noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                        noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
                     //待生产审核
                     if(vo.getStatus()== RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue()){
-                        noticeNumberVO.setProduceCheckNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                        noticeNumberVO.setProduceCheckNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
                     //已完成
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()){
-                        noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                        noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
                     //维修主管
                 }else if(noticeNumberVO.getRoleFlag()==3){
                     //带派工
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {
-                        noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                        noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
                     //维修中
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()){
-                        noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                        noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
                     //待维修主管审核
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
-                        noticeNumberVO.setRepairCheckNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                        noticeNumberVO.setRepairCheckNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
                     //二次派工
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.REBACK.getValue() || vo.getStatus() == RepairApplicationFormStatusEnum.REPAIR_FAIL.getValue()){
-                        noticeNumberVO.setFinishedNum((noticeNumberVO.getFinishedNum().add(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()))));
+                        noticeNumberVO.setFinishedNum((noticeNumberVO.getFinishedNum().add(vo.getRepairCount()==null?initNum:vo.getRepairCount())));
                     }
                     //维修人
                 }else if(noticeNumberVO.getRoleFlag()==1){
                     if(vo.getStatus()==RepairApplicationFormStatusEnum.PROCESSING.getValue()){
-                        noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                        noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
                     //待维修主管审核
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
-                        noticeNumberVO.setRepairCheckNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                        noticeNumberVO.setRepairCheckNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
                     //已完成
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()){
-                        noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                        noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
                 }
                 //待分配
 //                if (vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {
-//                    noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+//                    noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
 //                    //维修中
 //                } else if (vo.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()) {
-//                    noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+//                    noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
 //                    //审核中
 //                }else if (vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()) {
-//                    noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+//                    noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
 //                }
             }
         }
@@ -203,19 +204,19 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     }
 
     public NoticeNumberVO addCheckJobNums(NoticeNumberVO noticeNumberVO, List<CheckJobVO> checkJobVOS){
-        BigDecimal count=new BigDecimal(0);
-//        noticeNumberVO.setTimeOutTaskNum(new BigDecimal(0));
+        BigDecimal count=initNum;
+//        noticeNumberVO.setTimeOutTaskNum(initNum);
         for (CheckJobVO vo:checkJobVOS){
             if(vo.getStatus()==CheckJobStatusEnum.NOT_EXECUTE.getValue()){
-                noticeNumberVO.setUnexectuedMaintenanceNum(vo.getCountNum()==null?new BigDecimal(0):new BigDecimal(vo.getCountNum()));
+                noticeNumberVO.setUnexectuedMaintenanceNum(vo.getCountNum()==null?initNum:vo.getCountNum());
             }else if(vo.getStatus()==CheckJobStatusEnum.EXECUTING.getValue()){
-                noticeNumberVO.setExecutedTaskNum(vo.getCountNum()==null?new BigDecimal(0):new BigDecimal(vo.getCountNum()));
+                noticeNumberVO.setExecutedTaskNum(vo.getCountNum()==null?initNum:vo.getCountNum());
             }
 //            if(vo.getReceiveOvertime()!=null&&vo.getReceiveOvertime()){
-//                noticeNumberVO.setTimeOutTaskNum(vo.getCountNum()==null?new BigDecimal(0):new BigDecimal(vo.getCountNum()));
+//                noticeNumberVO.setTimeOutTaskNum(vo.getCountNum()==null?initNum:vo.getCountNum());
 //            }
-            int num=vo.getCountNum()==null?0:vo.getCountNum();
-            count=new BigDecimal(count.intValue()+num);
+            BigDecimal num=vo.getCountNum()==null?initNum:vo.getCountNum();
+            count=new BigDecimal(count.intValue()+num.intValue());
         }
         noticeNumberVO.setAllBaoYangTaskNum(count);
         return noticeNumberVO;
@@ -223,31 +224,33 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
 
     private NoticeNumberVO addStoreNums(NoticeNumberVO noticeNumberVO,InStoreFormDTO inStoreFormDTO,OutStoreFormDTO outStoreFormDTO,StoreCheckJobDTO storeCheckJobDTO){
         BigDecimal inStoreCount=inStoreFormMapper.getInStoreFormCount1(inStoreFormDTO);
-        noticeNumberVO.setInStoreNum(inStoreCount==null?new BigDecimal(0):inStoreCount);
+        noticeNumberVO.setInStoreNum(inStoreCount==null?initNum:inStoreCount);
         //出库
         BigDecimal outStoreCount=outStoreFormMapper.getOutStoreFormCount1(outStoreFormDTO);
-        noticeNumberVO.setOutStoreNum(outStoreCount==null?new BigDecimal(0):outStoreCount);
+        noticeNumberVO.setOutStoreNum(outStoreCount==null?initNum:outStoreCount);
         //盘点
         BigDecimal storeCheckJobCount=storeCheckJobMapper.getNumByDTO(storeCheckJobDTO);
-        noticeNumberVO.setPdNum(storeCheckJobCount==null?new BigDecimal(0):storeCheckJobCount);
+        noticeNumberVO.setPdNum(storeCheckJobCount==null?initNum:storeCheckJobCount);
         //调拨,根据出入库type
         inStoreFormDTO.setType(InStoreTypeEnum.DIAOBO_RUKU.getValue());
         BigDecimal dbCount=inStoreFormMapper.getInStoreFormCount1(inStoreFormDTO);
-        noticeNumberVO.setDbNum(dbCount==null?new BigDecimal(0):dbCount);
+        noticeNumberVO.setDbNum(dbCount==null?initNum:dbCount);
         return noticeNumberVO;
     }
     @Override
     public NoticeNumberVO getNoticeNumberVO() {
-        System.out.println(LocalDateTime.now());
+        Long t1=System.currentTimeMillis();
         NoticeNumberVO noticeNumberVO=new NoticeNumberVO();
-        //先判断是否超级管理员
         UserInfo userInfo=SecurityUtils.getUserInfo();
 //        UserInfo userInfo=new UserInfo();
-//        userInfo.setSuperAdmin(0);
 //        List list=new ArrayList();
-//
-//        list.add("Maintenance");
-//        userInfo.setUserId("629ec5456f900a3658c472b5");
+//        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);
         InStoreFormDTO inStoreFormDTO=new InStoreFormDTO();
         OutStoreFormDTO outStoreFormDTO=new OutStoreFormDTO();
@@ -265,7 +268,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             checkJobVOS=checkJobMapper.getCheckJobCount1(checkJobDTO);
             checkJobDTO.setReceiveOvertime(true);
             BigDecimal overTimeCount=checkJobMapper.getReceiveOverTimeCount(checkJobDTO);
-            noticeNumberVO.setTimeOutTaskNum(overTimeCount==null?new BigDecimal(0):overTimeCount);
+            noticeNumberVO.setTimeOutTaskNum(overTimeCount==null?initNum:overTimeCount);
             noticeNumberVO=addRepairNums(noticeNumberVO,repairApplicationFormVOS);
             noticeNumberVO=addCheckJobNums(noticeNumberVO,checkJobVOS);
             noticeNumberVO=addStoreNums(noticeNumberVO,inStoreFormDTO,outStoreFormDTO,storeCheckJobDTO);
@@ -285,7 +288,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 checkJobVOS=checkJobMapper.getCheckJobCount(checkJobDTO);
                 checkJobDTO.setReceiveOvertime(true);
                 BigDecimal overTimeCount=checkJobMapper.getReceiveOverTimeCount(checkJobDTO);
-                noticeNumberVO.setTimeOutTaskNum(overTimeCount==null?new BigDecimal(0):overTimeCount);
+                noticeNumberVO.setTimeOutTaskNum(overTimeCount==null?initNum:overTimeCount);
                 noticeNumberVO=addCheckJobNums(noticeNumberVO,checkJobVOS);
             } if(sb.toString().contains(SysRoleCodeEnum.REPAIR_EXAMINE.name())){
                 noticeNumberVO.setRoleFlag(2);
@@ -307,7 +310,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 checkJobVOS=checkJobMapper.getCheckJobCount1(checkJobDTO);
                 checkJobDTO.setReceiveOvertime(true);
                 BigDecimal overTimeCount=checkJobMapper.getReceiveOverTimeCount(checkJobDTO);
-                noticeNumberVO.setTimeOutTaskNum(overTimeCount==null?new BigDecimal(0):overTimeCount);
+                noticeNumberVO.setTimeOutTaskNum(overTimeCount==null?initNum:overTimeCount);
                 noticeNumberVO=addCheckJobNums(noticeNumberVO,checkJobVOS);
             }
             if(sb.toString().contains(CommonConstants.WORKPLACE_STORE_MANAGE) &&!sb.toString().contains(CommonConstants.WORKPLACE_REPAIR_MANAGE) && !sb.toString().contains(SysRoleCodeEnum.REPAIR_MANAGE.name()) ){
@@ -332,10 +335,9 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
 //        //通知
 ////        BigDecimal num=workplaceBacklogMapper.getWorkplaceBacklogCount("1");
         BigDecimal num=workplaceBacklogMapper.getWorkplaceBacklogCount(userInfo.getUserId());
+        Long t2=System.currentTimeMillis();
+        System.out.println(t2-t1);
         noticeNumberVO.setUnreadNum(num);
-
-        System.out.println(LocalDateTime.now());
-
         return noticeNumberVO;
     }
 
@@ -413,14 +415,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     }
 
     @Override
-    public R getStoreForm() {
-        UserInfo userInfo=SecurityUtils.getUserInfo();
-//        UserInfo userInfo=new UserInfo();
-//        List list=new ArrayList();
-//        list.add("workplace_store_manage");
-//        userInfo.setUserId("629ff44ad2b1150bf0e3f834");
-//        userInfo.setRoleCodes(list);
-//        userInfo.setSuperAdmin(0);
+    public R getStoreForm(UserInfo userInfo) {
         InStoreFormDTO inStoreFormDTO=new InStoreFormDTO();
         inStoreFormDTO.setUserId(userInfo.getUserId());
         OutStoreFormVO outStoreFormVO=new OutStoreFormVO();
@@ -449,28 +444,11 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     }
 
     @Override
-    public RepairApplicationFormVO getRepairApplicationFormVO() {
+    public RepairApplicationFormVO getRepairApplicationFormVO(String role,UserInfo userInfo) {
+        Long t1=System.currentTimeMillis();
         RepairApplicationFormDTO repairApplicationFormDTO=new RepairApplicationFormDTO();
         RepairApplicationFormVO repairApplicationFormVO=new RepairApplicationFormVO();
-        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.setUserId("629ff44ad2b1150bf0e3f834");
-//        userInfo.setRoleCodes(list);
-//        userInfo.setSuperAdmin(0);
-        // 根据用户的角色来定
-        StringBuilder roleCodes = new StringBuilder();
-        userInfo.getRoleCodes().forEach(item-> {
-            roleCodes.append(item).append(",");
-        });
-        String role = roleCodes.toString();
         int roleFlag=0;
-        if(userInfo.getSuperAdmin() == 0){ // 非超级管理员
             if(role.contains(SysRoleCodeEnum.REPAIR_MANAGE.name())){
                 roleFlag=1;
                 // 维修主管
@@ -495,8 +473,8 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
 //                repairApplicationFormVO=mapper.getFirstRepairApplicationFormVO(repairApplicationFormDTO);
 //                repairApplicationFormVO.setRoleFlag(3);
             }
-        }
-        int count=0;
+
+        BigDecimal count=initNum;
         repairApplicationFormVO=mapper.getFirstRepairApplicationFormVO(repairApplicationFormDTO);
         if(repairApplicationFormVO!=null){
             repairApplicationFormVO.setRoleFlag(roleFlag);
@@ -504,6 +482,8 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             count=mapper.getRepairCount1(repairApplicationFormDTO);
             repairApplicationFormVO.setRepairCount(count);
         }
+        Long t2=System.currentTimeMillis();
+        System.out.println(t2-t1);
         return repairApplicationFormVO;