Merge remote-tracking branch 'origin/demo_' into demo_

platform-dao/src/main/java/com/platform/dao/dto/fill/FillGatherTaskDTO.java

@@ -154,5 +154,9 @@ public class FillGatherTaskDTO extends BaseDTO implements Serializable {
      * 任务等级 A级  B级 C级
      */
     private String taskLevel;
+    /**
+     * 被复制次数
+     */
+    private Integer generateNum;
 
 }

platform-dao/src/main/java/com/platform/dao/entity/fill/FillGather.java

@@ -76,7 +76,7 @@ public class FillGather implements Serializable {
     private DataScope dataScope;
 
     /**
-     * 频次周期（天）
+     * 频次周期（小时）
      */
     private Integer period;
 

platform-dao/src/main/java/com/platform/dao/entity/fill/FillGatherTask.java

@@ -105,7 +105,7 @@ public class FillGatherTask implements Serializable {
     private Integer taskType;
 
     /**
-     * 巡检任务周期频次 （天）
+     * 巡检任务周期频次 （小时）
      */
     private Integer period;
 
@@ -114,6 +114,11 @@ public class FillGatherTask implements Serializable {
      */
     private String taskLevel;
 
+    /**
+     * 被复制次数
+     */
+    private Integer generateNum;
+
     /**
      * 数据权限
      */

platform-dao/src/main/java/com/platform/dao/entity/repair/RepairApplicationForm.java

@@ -67,7 +67,7 @@ public class RepairApplicationForm implements Serializable {
      */
     private String no;
     /**
-     * 报修来源:1-点检 2-保养 3-润滑 4-现场
+     * 报修来源:1-内部报修 2-生产报修 3-隐患排查 4-巡检
      */
     private Integer source;
 
@@ -234,7 +234,7 @@ public class RepairApplicationForm implements Serializable {
     private Integer outType;
     private String outNo;
     /**
-     * 类型
+     * 类型  1 内部报修 2 生产报修  3 隐患排查
      */
     private Integer type;
 

platform-dao/src/main/java/com/platform/dao/enums/RepairApplicationFormCategoryEnum.java

@@ -21,7 +21,7 @@ public enum RepairApplicationFormCategoryEnum {
      */
     PLAN_NOT(2),
     /**
-     * 其他
+     * 日常维修s
      */
     OTHER(3);
     private final Integer value;

platform-dao/src/main/java/com/platform/dao/enums/RepairApplicationFormSourceEnum.java

@@ -0,0 +1,33 @@
+package com.platform.dao.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Description 维修类别枚举
+ * @Author liuyu
+ * @Date 2020/05/05
+ * @Version Copyright (c) 2020,合肥乾元坤合科技有限公司 All rights reserved.
+ */
+@Getter
+@AllArgsConstructor
+public enum RepairApplicationFormSourceEnum {
+    /**
+     * 内部报修
+     */
+    SB(1),
+    /**
+     * 生产
+     */
+    PRODUCER(2),
+    /**
+     * 隐患
+     */
+    HIDDEN_DANGER(3),
+    /**
+     * 巡检
+     */
+    FILL_GATHER(4),
+    ;
+    private final Integer value;
+}

platform-dao/src/main/java/com/platform/dao/vo/query/hidden/HiddenDangerVO.java

@@ -128,4 +128,6 @@ public class HiddenDangerVO extends BaseVO implements Serializable {
     private String dutyUserName;
 
     private String areaUserName;
+
+    private String sbCph;
 }

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

@@ -441,4 +441,9 @@ public class RepairApplicationFormVO extends BaseVO implements Serializable {
      */
     private List<SysFile> reportFileList;
 
+    /**
+     * 设备位号
+     */
+    private String positionNo;
+
 }

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

@@ -8,7 +8,7 @@
         user3.username as checkUserName,
         sb.model as model,
         sb.name as sbName,part.name as partName,
-        sb.no as sbNo, sb.cph as sbCph, sb.model_id as modelId,
+        sb.no as sbNo, sb.cph as sbCph, sb.model_id as modelId,sb.position_no as positionNo,
         error.name as repairErrorTypeName
     </sql>
     <select id="selectPageList" parameterType="com.platform.dao.dto.repair.RepairApplicationFormDTO"

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

@@ -226,14 +226,16 @@ outstoreform.process_instance_id,
 
     <select id="getOutStoreFormCount1" parameterType="com.platform.dao.dto.store.OutStoreFormDTO"
             resultType="BigDecimal">
-        select count(1) from t_out_store_form form left join t_store store
-        on store.id=form.store_id
+        select count(1) from t_out_store_form form
         <where>
-            <if test="userId!=null and userId!=''">
-                store.user_id=#{userId}>
+            <if test="userId != null and userId != ''">
+                and form.update_user_id = #{userId}
+            </if>
+            <if test="status !=null ">
+                and form.status = #{status}
             </if>
-            <if test="storeId!=null and storeId!=''">
-                form.store_id=#{storeId}
+            <if test="outFlag != null">
+                and form.out_flag = #{outFlag}
             </if>
         </where>
     </select>

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

@@ -163,6 +163,18 @@ public class RepairApplicationFormController {
         return new R<>(pageInfos);
     }
 
+    /**
+     * 工单池分页数据
+     * @param repairApplicationFormDTO
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/pool/page")
+    public R queryPool(RepairApplicationFormDTO repairApplicationFormDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+        MyVOPage<RepairApplicationFormVO> pageInfos = repairApplicationFormService.selectPoolPageInfoVO(repairApplicationFormDTO, pageNum, pageSize);
+        return new R<>(pageInfos);
+    }
     /**
      * 获取列表
      *

platform-rest/src/main/java/com/platform/rest/task/FillGatherTaskTask.java

@@ -3,6 +3,7 @@ package com.platform.rest.task;
 import com.platform.common.cache.ConfigCache;
 import com.platform.common.constant.RedisKeyConstants;
 import com.platform.common.util.*;
+import com.platform.dao.dto.fill.FillGatherTaskDTO;
 import com.platform.dao.entity.fill.FillGatherInfo;
 import com.platform.dao.entity.fill.FillGatherTask;
 import com.platform.dao.entity.fill.FillGatherTaskDetail;
@@ -53,9 +54,11 @@ public class FillGatherTaskTask {
     public void generateFillTask () {
         String nowDateStr = DateUtils.dateToString(LocalDateTime.now(),DateUtils.PATTERN_YMD);
         // 获取所有点检任务集合
-        List<FillGatherTask> taskList = fillGatherTaskService.selectAll();
+        FillGatherTaskDTO queryDTO = new FillGatherTaskDTO();
+        queryDTO.setGenerateNum(0);
+        List<FillGatherTask> taskList = fillGatherTaskService.getModelListByDTO(queryDTO);
         // 判断是否需要生成新的巡检任务
-        List<FillGatherTask> handleList = validateList(taskList,nowDateStr);
+        List<FillGatherTask> handleList = validateList(taskList);
         // 生成巡检任务
         for(FillGatherTask task : handleList){
             FillGatherTask newTask = BeanConverterUtil.copyObjectProperties(task,FillGatherTask.class);
@@ -66,6 +69,11 @@ public class FillGatherTaskTask {
             newTask.setName(task.getName() + "_" + nowDateStr);
             newTask.setLateHistoryHours(0);
             fillGatherTaskService.saveModelNoId(newTask);
+            // 老旧巡检任务，修改为已生成
+            FillGatherTask updTask = new FillGatherTask();
+            updTask.setGenerateNum(task.getGenerateNum() + 1);
+            updTask.setId(task.getId());
+            fillGatherTaskService.modModelByPrimaryKey(updTask);
             // 1、获取巡检内容
             String content = getContentByGatherId(task.getGatherId());
             // 2、根据设备IDs，生成内容列表并保存
@@ -119,13 +127,22 @@ public class FillGatherTaskTask {
         return JsonUtils.objectToJson(contents);
     }
 
-    private List<FillGatherTask> validateList(List<FillGatherTask> list,String nowDateStr){
+    private List<FillGatherTask> validateList(List<FillGatherTask> list){
         List<FillGatherTask> retList = new ArrayList<>();
+        // 当前时间
+        LocalDateTime now = LocalDateTime.now();
         for(FillGatherTask task : list){
             LocalDateTime lastCreatedTime = task.getCreatedTime();
-            String targetCreatedTimeStr = DateUtils.dateToString(lastCreatedTime.plusDays(task.getPeriod()),DateUtils.PATTERN_YMD);
+            // 目标时间
+            LocalDateTime targetTime = lastCreatedTime.plusHours(task.getPeriod());
+            /*String targetCreatedTimeStr = DateUtils.dateToString(lastCreatedTime.plusDays(task.getPeriod()),DateUtils.PATTERN_YMD);
             if(nowDateStr.equals(targetCreatedTimeStr)){
                 retList.add(task);
+            }*/
+
+            if(targetTime.isAfter(now)){
+                // 超过当前频次周期的生成任务
+                retList.add(task);
             }
         }
         return retList;

platform-service/src/main/java/com/platform/service/business/impl/OutStoreFormActivitiServiceImpl.java

@@ -6,15 +6,16 @@ import com.platform.common.cache.ConfigCache;
 import com.platform.common.constant.CommonConstants;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.model.UserInfo;
-import com.platform.common.util.IdGeneratorUtils;
-import com.platform.common.util.ListUtils;
-import com.platform.common.util.SecurityUtils;
-import com.platform.common.util.SpringContextHolder;
+import com.platform.common.util.*;
 import com.platform.common.yongyou.response.OtherOutAddResponse;
+import com.platform.dao.dto.upms.SysUserDTO;
+import com.platform.dao.entity.activiti.ActivitiUserModel;
 import com.platform.dao.entity.activiti.LocalAuditRecord;
 import com.platform.dao.entity.preparation.Preparation;
 import com.platform.dao.entity.store.OutStoreForm;
+import com.platform.dao.entity.upms.SysDept;
 import com.platform.dao.entity.upms.SysUser;
+import com.platform.dao.entity.upms.SysUserDept;
 import com.platform.dao.enums.*;
 import com.platform.dao.mapper.activiti.LocalAuditRecordMapper;
 import com.platform.dao.mapper.store.OutStoreFormMapper;
@@ -24,16 +25,22 @@ import com.platform.dao.vo.SysUserVO;
 import com.platform.dao.vo.query.customize.CustomFieldTemplateDataVO;
 import com.platform.service.customize.BaseFormCheckServiceAbstract;
 import com.platform.service.event.WorkplaceBacklogEvent;
+import com.platform.service.upms.SysUserDeptService;
 import com.platform.service.util.SendMessageUtils;
 import com.platform.service.yongyou.YongyouService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.activiti.engine.task.Task;
 import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.weekend.Weekend;
+import tk.mybatis.mapper.weekend.WeekendCriteria;
 
 import java.io.OutputStream;
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description 工作流业务
@@ -49,9 +56,10 @@ public class OutStoreFormActivitiServiceImpl extends BaseFormCheckServiceAbstrac
     private final YongyouService yongyouService;
     private final LocalAuditRecordMapper localAuditRecordMapper;
     private final SysUserMapper sysUserMapper;
+    private final SysUserDeptService sysUserDeptService;
+
     /**
      * 检查业务是否可以发起，比如检查业务状态等
-     *
      * @param actAuditRequest
      */
     @Override
@@ -67,14 +75,39 @@ public class OutStoreFormActivitiServiceImpl extends BaseFormCheckServiceAbstrac
 
     @Override
     protected void doStartUpdate(ActAuditRequest actAuditRequest) {
-        OutStoreForm queryForm = outStoreFormMapper.selectByPrimaryKey(actAuditRequest.getId());
+        /*OutStoreForm queryForm = outStoreFormMapper.selectByPrimaryKey(actAuditRequest.getId());
         OutStoreForm outStoreForm = new OutStoreForm();
         outStoreForm.setId(actAuditRequest.getId());
         outStoreForm.setProcessInstanceId(actAuditRequest.getProcessInstanceId());
         outStoreForm.setStatus(OutStoreStatusEnum.NOT_EXECUTE.getValue());
         outStoreFormMapper.updateByPrimaryKeySelective(outStoreForm);
         // 给审核主管发送微信通知
-        sendMessageToManger(queryForm);
+        sendMessageToManger(queryForm);*/
+    }
+
+    @Override
+    protected void doStartUpdate(ActAuditRequest actAuditRequest, List<ActivitiUserModel> list, Task task) {
+        OutStoreForm queryForm = outStoreFormMapper.selectByPrimaryKey(actAuditRequest.getId());
+        OutStoreForm outStoreForm = new OutStoreForm();
+        outStoreForm.setId(actAuditRequest.getId());
+        outStoreForm.setProcessInstanceId(actAuditRequest.getProcessInstanceId());
+        outStoreForm.setStatus(OutStoreStatusEnum.NOT_EXECUTE.getValue());
+        // 获取审批人
+        ActivitiUserModel userTaskModel =
+                list.stream().filter(u -> u.getId().equals(task.getTaskDefinitionKey())).collect(Collectors.toList()).get(0);
+        String roleId = userTaskModel.getRoleId();
+        SysUserDTO sysUserDTO = new SysUserDTO();
+        sysUserDTO.setRoleIds(Arrays.asList(roleId));
+        // 找到和发起人部门一致的
+        sysUserDTO.setDeptIds(sysUserDeptService.selectByUserId(SecurityUtils.getUserInfo().getUserId()).stream().map(SysUserDept::getDeptId).collect(Collectors.toList()));
+        List<SysUserVO> sysUserVOList = sysUserMapper.selectDeptRoleUser(sysUserDTO);
+        if(sysUserVOList != null && sysUserVOList.size() > 0){
+            outStoreForm.setUpdateUserId(sysUserVOList.get(0).getUserId());
+            // 给审核主管发送微信通知
+            queryForm.setUpdateUserId(outStoreForm.getUpdateUserId());
+            sendMessageToManger(queryForm);
+        }
+        outStoreFormMapper.updateByPrimaryKeySelective(outStoreForm);
     }
 
     /**
@@ -82,7 +115,7 @@ public class OutStoreFormActivitiServiceImpl extends BaseFormCheckServiceAbstrac
      * @param outForm
      */
     private void sendMessageToManger(OutStoreForm outForm){
-        SysUser sysUser = sysUserMapper.selectByPrimaryKey(outForm.getCreatedUserId());
+        SysUser sysUser = sysUserMapper.selectByPrimaryKey(outForm.getUpdateUserId());
         String info = MessageTemplateUtil.getOutStoreFormSuccess(outForm.getOutNo());
         Integer detailType = WorkplaceBacklogDetailTypeEnum.OUT_STORE_NOTICE.getValue();
         String[] values = new String[]{"出库单待审批！",outForm.getOutNo(),"无","无","无","请尽快审批"};

platform-service/src/main/java/com/platform/service/customize/BaseFormCheckServiceAbstract.java

@@ -83,6 +83,8 @@ public abstract class BaseFormCheckServiceAbstract implements BaseFormCheckServi
 
     protected abstract void doStartUpdate(ActAuditRequest actAuditRequest);
 
+    protected abstract void doStartUpdate(ActAuditRequest actAuditRequest,List<ActivitiUserModel> list,Task task);
+
     /**
      * 根据需要插入值
      * @param maps
@@ -154,6 +156,7 @@ public abstract class BaseFormCheckServiceAbstract implements BaseFormCheckServi
         maps.put("userId", user.getUserId());
         modifyTaskAssign(model.getId(), maps, nextTask, list);
         doStartUpdate(actAuditRequest);
+        doStartUpdate(actAuditRequest,list,nextTask);
     }
 
     /**

platform-service/src/main/java/com/platform/service/customize/impl/SbAllocateCheckServiceImpl.java

@@ -10,6 +10,7 @@ import com.platform.common.util.SecurityUtils;
 import com.platform.common.util.StringUtils;
 import com.platform.dao.dto.activiti.SbAllocateFormActiviti;
 import com.platform.dao.dto.upms.SysUserDeptDTO;
+import com.platform.dao.entity.activiti.ActivitiUserModel;
 import com.platform.dao.entity.customize.CustomFieldTemplateData;
 import com.platform.dao.enums.CustomFieldTemplateDataStatusEnum;
 import com.platform.dao.enums.CustomFieldTemplateDataTypeEnum;
@@ -18,6 +19,7 @@ import com.platform.dao.mapper.upms.SysUserDeptMapper;
 import com.platform.dao.vo.SysUserDeptVO;
 import com.platform.dao.vo.query.customize.CustomFieldTemplateDataVO;
 import com.platform.service.customize.BaseFormCheckServiceAbstract;
+import org.activiti.engine.task.Task;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -51,6 +53,11 @@ public class SbAllocateCheckServiceImpl extends BaseFormCheckServiceAbstract {
         customFieldTemplateDataMapper.updateByPrimaryKeySelective(updInfo);
     }
 
+    @Override
+    protected void doStartUpdate(ActAuditRequest actAuditRequest, List<ActivitiUserModel> list, Task task) {
+
+    }
+
     @Override
     public String doRefuse(ActAuditRequest actAuditRequest) {
         return super.doRefuse(actAuditRequest);

platform-service/src/main/java/com/platform/service/customize/impl/SbScrapCheckServiceImpl.java

@@ -9,6 +9,7 @@ import com.platform.common.util.IdGeneratorUtils;
 import com.platform.common.util.JsonUtils;
 import com.platform.common.util.SecurityUtils;
 import com.platform.dao.dto.activiti.SbScrapFormActiviti;
+import com.platform.dao.entity.activiti.ActivitiUserModel;
 import com.platform.dao.entity.customize.CustomFieldTemplateData;
 import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.enums.CustomFieldTemplateDataStatusEnum;
@@ -16,9 +17,12 @@ import com.platform.dao.enums.CustomFieldTemplateDataTypeEnum;
 import com.platform.dao.enums.SbInfoStatusEnum;
 import com.platform.dao.vo.query.customize.CustomFieldTemplateDataVO;
 import com.platform.service.customize.BaseFormCheckServiceAbstract;
+import org.activiti.engine.task.Task;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service("sbScrapCheckServiceImpl")
 public class SbScrapCheckServiceImpl extends BaseFormCheckServiceAbstract {
 
@@ -111,6 +115,11 @@ public class SbScrapCheckServiceImpl extends BaseFormCheckServiceAbstract {
     protected void doStartUpdate(ActAuditRequest actAuditRequest) {
     }
 
+    @Override
+    protected void doStartUpdate(ActAuditRequest actAuditRequest, List<ActivitiUserModel> list, Task task) {
+
+    }
+
     /**
      * 拒绝业务
      *

platform-service/src/main/java/com/platform/service/customize/impl/SbStopCheckServiceImpl.java

@@ -9,6 +9,7 @@ import com.platform.common.util.IdGeneratorUtils;
 import com.platform.common.util.JsonUtils;
 import com.platform.common.util.SecurityUtils;
 import com.platform.dao.dto.activiti.SbStopFormActiviti;
+import com.platform.dao.entity.activiti.ActivitiUserModel;
 import com.platform.dao.entity.customize.CustomFieldTemplateData;
 import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.enums.CustomFieldTemplateDataStatusEnum;
@@ -18,10 +19,12 @@ import com.platform.dao.mapper.customize.CustomFieldTemplateDataMapper;
 import com.platform.dao.mapper.sb.SbInfoMapper;
 import com.platform.dao.vo.query.customize.CustomFieldTemplateDataVO;
 import com.platform.service.customize.BaseFormCheckServiceAbstract;
+import org.activiti.engine.task.Task;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Service("sbStopCheckServiceImpl")
 public class SbStopCheckServiceImpl extends BaseFormCheckServiceAbstract {
@@ -103,6 +106,11 @@ public class SbStopCheckServiceImpl extends BaseFormCheckServiceAbstract {
 
     }
 
+    @Override
+    protected void doStartUpdate(ActAuditRequest actAuditRequest, List<ActivitiUserModel> list, Task task) {
+
+    }
+
     @Override
     public String doRefuse(ActAuditRequest actAuditRequest) {
         return super.doRefuse(actAuditRequest);

platform-service/src/main/java/com/platform/service/fill/impl/FillGatherTaskServiceImpl.java

@@ -102,6 +102,7 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
         task.setCreatedTime(LocalDateTime.now());
         task.setCreatedUserId(SecurityUtils.getUserInfo().getUserId());
         task.setCreatedUserName(SecurityUtils.getUserInfo().getUsername());
+        task.setGenerateNum(0);
         mapper.insert(task);
         // 1、获取巡检内容
         String content = getContentByGatherId(model.getGatherId());
@@ -384,6 +385,7 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
             detail.setTaskId(taskId);
             detail.setId(IdGeneratorUtils.getObjectId());
             detail.setStatus(0);
+            detail.setSortNum(100);
             details.add(detail);
         }
         fillGatherTaskDetailMapper.insertListforComplex(details);

platform-service/src/main/java/com/platform/service/hidden/impl/HiddenDangerServiceImpl.java

@@ -10,6 +10,7 @@ import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.entity.hidden.HiddenDanger;
 import com.platform.dao.entity.upms.SysFile;
 import com.platform.dao.enums.HiddenDangerStatusEnum;
+import com.platform.dao.enums.RepairApplicationFormSourceEnum;
 import com.platform.dao.enums.SysFileTypeEnum;
 import com.platform.dao.enums.SysRoleCodeEnum;
 import com.platform.dao.mapper.hidden.HiddenDangerMapper;
@@ -18,6 +19,7 @@ import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.hidden.HiddenDangerService;
 import com.platform.service.repair.strategy.RepairBaseStrategy;
 import com.platform.service.repair.strategy.RepairStrategyFactory;
+import com.platform.service.sb.SbInfoService;
 import com.platform.service.upms.SysFileService;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.weekend.Weekend;
@@ -37,6 +39,8 @@ import java.util.List;
 public class HiddenDangerServiceImpl extends BaseServiceImpl<HiddenDangerMapper, HiddenDanger, HiddenDangerDTO> implements HiddenDangerService {
     @Resource
     private SysFileService sysFileService;
+    @Resource
+    private SbInfoService sbInfoService;
 
     @Override
     public int batchDelete(List<String> ids) {
@@ -96,6 +100,7 @@ public class HiddenDangerServiceImpl extends BaseServiceImpl<HiddenDangerMapper,
         });
         applicationFormDTO.setApplicationFileList(applicationFileList);
         applicationFormDTO.setReportFileList(reportFileList);
+        applicationFormDTO.setSource(RepairApplicationFormSourceEnum.HIDDEN_DANGER.getValue());
         // 调用相关维修类，生成维修单
         RepairBaseStrategy strategy = RepairStrategyFactory.getStrategy(applicationFormDTO.getCategory());
         strategy.callRepair(applicationFormDTO);
@@ -126,6 +131,7 @@ public class HiddenDangerServiceImpl extends BaseServiceImpl<HiddenDangerMapper,
         });
         vo.setBeforeImageList(beforeImageList);
         vo.setFileList(fileList);
+        vo.setSbCph(sbInfoService.getById(vo.getSbId()).getCph());
         return vo;
     }
 

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

@@ -153,5 +153,7 @@ public interface RepairApplicationFormService extends IBaseService<RepairApplica
      */
     MyVOPage<RepairApplicationFormVO> selectPageInfoVOByModelThree(RepairApplicationFormDTO record, int pageNum, int pageSize);
 
+    MyVOPage<RepairApplicationFormVO> selectPoolPageInfoVO(RepairApplicationFormDTO record, int pageNum, int pageSize);
+
     void editErrorInfo(RepairApplicationFormDTO record);
 }

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

@@ -304,6 +304,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             noticeNumberVO.setInStoreNum(inStoreCount == null ? initNum : inStoreCount);
         }
         //出库
+        outStoreFormDTO.setStatus(OutStoreStatusEnum.NOT_EXECUTE.getValue());
         BigDecimal outStoreCount=outStoreFormMapper.getOutStoreFormCount1(outStoreFormDTO);
         noticeNumberVO.setOutStoreNum(outStoreCount==null?initNum:outStoreCount);
         if (noticeNumberVO.getRoleFlag()!=5) {
@@ -407,9 +408,9 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 repairApplicationFormVOS= mapper.getRepairCount(repairApplicationFormDTO);
                 noticeNumberVO=addRepairNums(noticeNumberVO,repairApplicationFormVOS);
 
-                outStoreFormDTO.setCreatedUserId(userInfo.getUserId());
+                outStoreFormDTO.setUserId(userInfo.getUserId());
                 outStoreFormDTO.setOutFlag(1);
-                noticeNumberVO=addStoreNums(noticeNumberVO,inStoreFormDTO,outStoreFormDTO,storeCheckJobDTO);
+                noticeNumberVO = addStoreNums(noticeNumberVO,inStoreFormDTO,outStoreFormDTO,storeCheckJobDTO);
             }
             else if(sb.toString().contains(CommonConstants.WORKPLACE_REPAIR_MANAGE)){
                 //维修管理员,先获取其deptid
@@ -608,6 +609,19 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         return new MyVOPage<>(mapper.selectPageList(record));
     }
 
+    @Override
+    public MyVOPage<RepairApplicationFormVO> selectPoolPageInfoVO(RepairApplicationFormDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<Integer> categoryList = ListUtils.newArrayList();
+        categoryList.add(RepairApplicationFormCategoryEnum.PLAN.getValue());
+        categoryList.add(RepairApplicationFormCategoryEnum.OTHER.getValue());
+        record.setCategoryList(categoryList);
+        List<Integer> statusList = ListUtils.newArrayList();
+        statusList.add(RepairApplicationFormStatusEnum.PROCESSING.getValue());
+        record.setStatusList(statusList);
+        return new MyVOPage<>(mapper.selectPageList(record));
+    }
+
     @Override
     public void editErrorInfo(RepairApplicationFormDTO record) {
         RepairApplicationForm form = new RepairApplicationForm();

platform-service/src/main/java/com/platform/service/repair/strategy/impl/LongYanPlanRepairStrategy.java

@@ -89,6 +89,8 @@ public class LongYanPlanRepairStrategy extends AbstractRepairBaseStrategy {
         form.setReportLeaderId(getReportLeaderId(model.getSbId()));
         // 状态修改为待审核
         form.setStatus(RepairApplicationFormStatusEnum.CALLER_REPAIR_VERIFYING_ONE.getValue());
+        // 报修来源
+        form.setSource(RepairApplicationFormSourceEnum.SB.getValue());
         repairApplicationFormMapper.insert(form);
         // 记录维修状态跟踪
         String statusRemark = "计划性维修";