完善

platform-dao/src/main/java/com/platform/dao/entity/sb/SbStoreCheckPlan.java

@@ -46,11 +46,11 @@ public class SbStoreCheckPlan implements Serializable{
      */
     private String checkUserName;
     /**
-     * 仓库
+     * 仓库：对应设备区域
      */
     private String storeId;
     /**
-     * 备件类型
+     * 设备类型
      */
     private String spareType;
     /**

platform-dao/src/main/java/com/platform/dao/vo/query/sb/SbStoreCheckJobVO.java

@@ -62,6 +62,7 @@ public class SbStoreCheckJobVO extends BaseVO implements Serializable {
      * 备件id/设备id
      */
     private String spareId;
+
     /**
      * 备件ggxh
      */
@@ -91,11 +92,11 @@ public class SbStoreCheckJobVO extends BaseVO implements Serializable {
      */
     private String spareName;
     /**
-     * 仓库名称/项目名称
+     * 仓库名称/区域名称
      */
     private String storeName;
     /**
-     * 备件仓库id
+     * 区域名称id
      */
     private String spareStoreId;
     /**

platform-dao/src/main/java/com/platform/dao/vo/query/sb/SbStoreCheckPlanVO.java

@@ -59,7 +59,7 @@ public class SbStoreCheckPlanVO extends BaseVO implements Serializable{
      */
     private String storeName;
     /**
-     * 备件类型
+     * 设备类型名称
      */
     private String spareTypeName;
     /**

platform-dao/src/main/resources/mapper/sb/SbStoreCheckJobMapper.xml

@@ -108,15 +108,14 @@
         sbInfo.model,
         sbInfo.no as no,
         sbInfo.position_id,
-        deptGroup.name as useGroupName,
+        sbInfo.type spareTypeName,
+        position.name storeName,
         sbInfo.financing_no as financingNo,
-        dept.name as storeName
         from t_sb_store_check_job as checkjob
         left join t_sb_store_check_plan plan on checkjob.plan_id = plan.id
-        left join t_sys_dept dept on checkjob.store_id = dept.dept_id
+        left join t_sb_type type on checkjob.spare_type = type.id
+        left join t_sb_position position on checkjob.store_id = position.id
         left join t_sb_info sbInfo on checkjob.spare_id = sbInfo.id
-        left join t_sys_dept deptGroup on sbInfo.use_group = deptGroup.dept_id
-        left join t_sys_user u on sbInfo.save_user = u.user_id
         <where>
             <include refid="List_Condition"/>
         </where>

platform-dao/src/main/resources/mapper/sb/SbStoreCheckPlanMapper.xml

@@ -117,12 +117,15 @@
             and checkplan.id like concat('%',#{keyword},'%')
         </if>
     </sql>
-    <select id="selectList" parameterType="com.platform.dao.dto.sb.SbStoreCheckPlanDTO" resultType="com.platform.dao.vo.query.sb.SbStoreCheckPlanVO">
+    <select id="selectList" parameterType="com.platform.dao.dto.sb.SbStoreCheckPlanDTO"
+            resultType="com.platform.dao.vo.query.sb.SbStoreCheckPlanVO">
         select checkplan.*,
                u.real_name as checkUserName,
-        dept.name as storeName
+        type.name as spareTypeName,
+        position.name as storeName
         from t_sb_store_check_plan as checkplan
-        left join t_sys_dept dept on checkplan.store_id = dept.dept_id
+        left join t_sb_type type on checkplan.spare_type = type.id
+        left join t_sb_position position on checkplan.store_id = position.id
         left join t_sys_user u on checkplan.check_user_id = u.user_id
         <where>
             <include refid="List_Condition"/>

platform-service/src/main/java/com/platform/service/sb/impl/SbStoreCheckPlanServiceImpl.java

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.util.IdGeneratorUtils;
+import com.platform.common.util.StringUtils;
 import com.platform.dao.bean.MyPage;
 import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.dto.sb.SbStoreCheckJobDTO;
@@ -13,6 +14,7 @@ import com.platform.dao.dto.store.StoreCheckJobDTO;
 import com.platform.dao.dto.store.StoreCheckPlanDTO;
 import com.platform.dao.entity.firm.FirmSupplier;
 import com.platform.dao.entity.sb.SbInfo;
+import com.platform.dao.entity.sb.SbPosition;
 import com.platform.dao.entity.sb.SbStoreCheckJob;
 import com.platform.dao.entity.sb.SbStoreCheckPlan;
 import com.platform.dao.entity.sqarepartmanage.SpareType;
@@ -52,6 +54,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description 盘点计划 service 实现类
@@ -125,10 +128,15 @@ public class SbStoreCheckPlanServiceImpl extends BaseServiceImpl<SbStoreCheckPla
         if(!plan.getStatus().equals(StoreCheckPlanStatusEnum.NOT_EXECUTE.getValue())){
             throw new BusinessException("计划已经在执行中，请重新建立计划");
         }
-        SbInfoDTO spareStoreDTO = new SbInfoDTO();
-        spareStoreDTO.setUseProject(plan.getStoreId());
-        List<SbInfoVO> sbInfoVOS = sbInfoMapper.selectVOList(spareStoreDTO);
-        List<SbStoreCheckJob> addItems = new ArrayList<SbStoreCheckJob>();
+        SbInfoDTO sbInfoDTO = new SbInfoDTO();
+        sbInfoDTO.setTypeId(plan.getSpareType());
+        sbInfoDTO.setPositionId(plan.getStoreId());
+        // TODO: 支持选择区域和子区域的
+        List<SbInfoVO> sbInfoVOS = sbInfoMapper.selectVOList(sbInfoDTO);
+        if(CollectionUtils.isEmpty(sbInfoVOS)){
+            throw new BusinessException("该盘点计划无需要盘点的设备，请重新设置类型或者区域");
+        }
+        List<SbStoreCheckJob> addItems = new ArrayList<>();
         LocalDateTime now = LocalDateTime.now();
         sbInfoVOS.forEach(item -> {
             SbStoreCheckJob job = new SbStoreCheckJob();
@@ -191,8 +199,8 @@ public class SbStoreCheckPlanServiceImpl extends BaseServiceImpl<SbStoreCheckPla
     @Override
     public SbStoreCheckPlan getModelById(Object id) {
         SbStoreCheckPlan checkPlan = super.getModelById(id);
-        SysDept sysDept = sysDeptMapper.selectByPrimaryKey(checkPlan.getStoreId());
-        checkPlan.setStoreName(sysDept.getName());
+       /* SysDept sysDept = sysDeptMapper.selectByPrimaryKey(checkPlan.getStoreId());
+        checkPlan.setStoreName(sysDept.getName());*/
         // 查询项目
         //List<StoreCheckJobVO> projectList = storeCheckJobMapper.selectJobList(checkPlan.getId());
         //checkPlan.setJobList(projectList);