优化报修的配件清单，可以选择所有配件

platform-dao/src/main/java/com/platform/dao/dto/store/SpareStoreDTO.java

@@ -32,6 +32,8 @@ public class SpareStoreDTO extends BaseDTO implements Serializable {
     /**
      * 库存价格
      */
+
+    private Integer isSpecial;
     private BigDecimal price;
     /**
      * 期初库存数量

platform-dao/src/main/java/com/platform/dao/vo/query/store/InStoreFormVO.java

@@ -117,4 +117,5 @@ public class InStoreFormVO extends BaseVO implements Serializable {
 
 
 
+
 }

platform-dao/src/main/resources/mapper/store/SpareStoreMapper.xml

@@ -90,6 +90,9 @@
         <if test="updateTime != null">
             and sparestore.update_time = #{updateTime}
         </if>
+        <if test="isSpecial !=null">
+            and spareinfo.is_special=#{isSpecial}
+        </if>
 
     </sql>
 

platform-rest/src/main/java/com/platform/rest/controller/sb/SbInfoMeasureController.java

@@ -15,12 +15,14 @@ import com.platform.dao.util.TreeUtil;
 import com.platform.dao.vo.export.sb.ExportSbInfoMeasureTwoVO;
 import com.platform.dao.vo.export.sb.ExportSbInfoMeasureVO;
 import com.platform.dao.vo.export.sb.ExportSbInfoVO;
+import com.platform.dao.vo.query.store.StoreWorkBenchVO;
 import com.platform.dao.vo.sb.SbInfoMeasureVO;
 import com.platform.office.poi.excel.ExcelImportUtil;
 import com.platform.office.poi.excel.entity.ImportParams;
 import com.platform.rest.log.annotation.SysLog;
 import com.platform.service.sb.SbInfoMeasureService;
 import com.platform.service.sb.SbInfoService;
+import com.platform.service.store.InStoreFormService;
 import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -46,6 +48,7 @@ public class SbInfoMeasureController {
 
     private final SbInfoMeasureService sbInfoService;
 
+
     /**
      * 通过id查询单条记录
      *

platform-rest/src/main/java/com/platform/rest/controller/sqarepartmanage/SpareTypeController.java

@@ -26,6 +26,7 @@ import com.platform.dao.vo.export.sqarepartmanage.ExportSpareTypeVO;
 import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.validation.group.AddGroup;
 import com.platform.common.validation.group.UpdateGroup;
+import com.platform.service.sqarepartmanage.impl.SpareTypeServiceImpl;
 import com.platform.service.upms.SysDeptService;
 import com.platform.service.upms.SysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -195,7 +196,7 @@ public class SpareTypeController {
    */
   @GetMapping("/page")
   public R<AbstractPageResultBean<SpareType>> query(SpareTypeDTO spareTypeDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-      return new R<>(spareTypeService.selectPageInfo(spareTypeDTO, pageNum, pageSize));
+    return new R<>(spareTypeService.selectPageInfo(spareTypeDTO, pageNum, pageSize));
   }
 
   /**

platform-rest/src/main/java/com/platform/rest/controller/store/SpareStoreController.java

@@ -134,6 +134,7 @@ public class SpareStoreController {
       return new R<>(spareStoreService.selectPageList(spareStoreDTO, pageNum, pageSize));
   }
 
+
     /**
      * 获取项目部仓库汇总分页
      * 统计某个分公司下某个项目部的总仓库库存，这个就是各个仓库累加的结果

platform-service/src/main/java/com/platform/service/base/impl/BaseServiceImpl.java

@@ -45,6 +45,7 @@ public abstract class BaseServiceImpl<M extends MyMapper<T>, T, K extends BaseDT
     @Override
     public List<T> selectPage(T record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
+
         return mapper.select(record);
     }
 

platform-service/src/main/java/com/platform/service/bean/ScheduleUtils.java

@@ -100,6 +100,7 @@ public class ScheduleUtils {
             }
 
         } catch (SchedulerException e) {
+            e.printStackTrace();
             throw new BusinessException("更新定时任务失败");
         }
     }

platform-service/src/main/java/com/platform/service/store/impl/SpareStoreServiceImpl.java

@@ -175,6 +175,8 @@ public class SpareStoreServiceImpl extends BaseServiceImpl<SpareStoreMapper, Spa
             model.setUseCompany(list.get(0).getDeptId());
         }*/
         // 查询设备型号下面的备件
+
+
         if(StringUtils.isNotEmpty(model.getModel())){
             SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
             sbModelDTO.setKeyword(model.getModel());

platform-service/src/main/java/com/platform/service/store/impl/StoreMonthReportServiceImpl.java

@@ -250,7 +250,6 @@ public class StoreMonthReportServiceImpl extends BaseServiceImpl<StoreMonthRepor
         // 总数
         inStoreFormDTO.setSearchStartTime(searchStartTime);
         inStoreFormDTO.setSearchEndTime(searchEndTime);
-//        inStoreFormDTO.setType(CheckStandardTypeEnum.POLLING.getValue());
         List<InStoreFormVO> inStoreFormVOList = inStoreFormMapper.selectList(inStoreFormDTO);
         OutStoreFormDTO outStoreFormDTO=new OutStoreFormDTO();
         outStoreFormDTO.setStoreId(inStoreFormDTO.getStoreId());

platform-service/src/main/java/com/platform/service/workplace/impl/IndexServiceImpl.java

@@ -74,8 +74,7 @@ public class IndexServiceImpl implements IndexService {
 
     @Override
     public R getWorkplaceWeekData(String roleCode) {
-        //String userId = SecurityUtils.getUserInfo().getUserId();
-        String userId = "1";
+        String userId = SecurityUtils.getUserInfo().getUserId();
         R r = R.success();
         switch (roleCode){
             case CommonConstants.WORKPLACE_REPAIR_NORMAL: