维修工作台

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

@@ -55,9 +55,9 @@
             <if test="searchEndTime != null">
                 and fee.fee_date <![CDATA[ <= ]]> #{searchEndTime}
             </if>
-            <if test="searchEndTime != null">
+<!--            <if test="searchEndTime != null">
                 and fee.fee_date <![CDATA[ <= ]]> #{searchEndTime}
-            </if>
+            </if>-->
             <if test="sbName != null and sbName != ''">
                 and sbInfo.name like concat('%',#{sbName},'%')
             </if>

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

@@ -190,14 +190,21 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             if(record.getSearchType() == 2){ // 待维修
                 statusList.add(RepairApplicationFormStatusEnum.PROCESSING.getValue());
             }
-            if(record.getSearchType() == 2){ // 待审核
+            if(record.getSearchType() == 3){ // 待审核
                 statusList.add(RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue());
                 statusList.add(RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue());
             }
-            if(record.getSearchType() == 3){ // 已完成
+            if(record.getSearchType() == 4){ // 已完成
                 statusList.add(RepairApplicationFormStatusEnum.FINISHED.getValue());
             }
-            if(record.getSearchType() == 4){ // 已驳回
+            if(record.getSearchType() == 5){ // 已驳回
+                statusList.add(RepairApplicationFormStatusEnum.REBACK.getValue());
+            }
+            if(record.getSearchType() == 6){ // 已驳回、待审核、待维修、待分配
+                statusList.add(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
+                statusList.add(RepairApplicationFormStatusEnum.PROCESSING.getValue());
+                statusList.add(RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue());
+                statusList.add(RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue());
                 statusList.add(RepairApplicationFormStatusEnum.REBACK.getValue());
             }
             record.setStatusList(statusList);
@@ -892,7 +899,6 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         // 获取内部维修数据
         RepairApplicationFormDTO queryDTO = new RepairApplicationFormDTO();
         queryDTO.setType(RepairApplicationFormTypeEnum.IN.getValue());
-        //queryDTO.setSearchTime(searchTime);
         queryDTO.setRepairUserId(userId);
         List<RepairApplicationFormVO> list = mapper.getWorkplaceRepairData(queryDTO);
         if(list != null && list.size() > 0){
@@ -918,7 +924,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         queryDTO.setSearchEndTime(end);
         RepairApplicationFormVO voInfo = mapper.getWorkplaceRepairSumData(queryDTO);
         if(voInfo != null){
-            vo.setTotalNum(vo.getTotalNum());
+            vo.setTotalNum(voInfo.getTempTotalNum());
         }
         RepairFeeDTO repairFeeDTO = new RepairFeeDTO();
         repairFeeDTO.setRepairUserId(userId);