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

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

@@ -95,6 +95,8 @@ public class FillGatherDTO extends BaseDTO implements Serializable {
      */
     private List<String> infoIds;
 
+    private List<Integer> sortNums;
+
     /**
      * 频次周期（天）
      */

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

@@ -123,6 +123,8 @@ public class FillGatherTaskDTO extends BaseDTO implements Serializable {
      */
     private List<String> sbIds;
 
+    private List<Integer> sortNums;
+
     /**
      * 暂停类型 1 暂停 2 取消暂停
      */

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

@@ -23,6 +23,7 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreDetailDTO extends BaseDTO implements Serializable {
+    private String repairFormId;//关联维修工单
 
     private Integer autoId;
     /**

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

@@ -24,6 +24,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreFormDTO extends BaseDTO implements Serializable {
+    private String repairFormId;//关联维修工单
 
     private String applyDept;// 申请部门编码和用友oa保持一致
     private String applyUser;

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

@@ -20,6 +20,7 @@ import java.time.LocalDateTime;
 @Table(name = "t_sb_info")
 @Data
 public class SbInfo implements Serializable {
+    private Integer sortNum;
     /**
      * 自定义参数列表
      */

platform-dao/src/main/java/com/platform/dao/entity/store/OutStoreDetail.java

@@ -17,7 +17,7 @@ import javax.persistence.Transient;
 /**
  * @Description 出库详情实体类
  * @Author liuyu
- * @Date 2020-06-09 10:38:52
+ * @Date 2020-06-09 10:38:52n
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 @Data
@@ -25,6 +25,8 @@ import javax.persistence.Transient;
 @Table(name = "t_out_store_detail")
 public class OutStoreDetail implements Serializable {
 
+    private String repairFormId;//关联维修工单
+
     private Integer autoId;
     /**
      * 主键

platform-dao/src/main/java/com/platform/dao/entity/store/OutStoreForm.java

@@ -22,6 +22,7 @@ import javax.persistence.Transient;
 @Accessors(chain = true)
 @Table(name = "t_out_store_form")
 public class OutStoreForm implements Serializable{
+    private String repairFormId;
 
     private String applyDept;// 申请部门编码和用友oa保持一致
     private String applyUser;

platform-dao/src/main/java/com/platform/dao/mapper/store/OutStoreFormMapper.java

@@ -23,6 +23,7 @@ import java.util.List;
  */
 @Component
 public interface OutStoreFormMapper extends MyMapper<OutStoreForm> {
+    OutStoreFormVO selectbyRepairForm(String id);
     List<OutStoreFormVO> selectLists(OutStoreFormDTO dto);
 
     BigDecimal getOutStoreFormCount1(OutStoreFormDTO outStoreFormDTO);

platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbInfoVO.java

@@ -176,6 +176,9 @@ public class ExportSbInfoVO implements Serializable {
 
     @Excel(name="安装位置")
     private String cph;
+
+    @Excel(name="排序字段")
+    private String sortNum;
     /**
      * 介质
      */

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

@@ -1,6 +1,7 @@
 package com.platform.dao.vo.query.store;
 
 import com.platform.common.bean.BaseVO;
+import com.platform.dao.entity.store.OutStoreDetail;
 import lombok.Data;
 
 import com.platform.common.bean.BaseDTO;
@@ -26,6 +27,8 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreFormVO extends BaseVO implements Serializable {
 
+
+    private List<OutStoreDetail> outStoreDetail;
     private String applyDept;// 申请部门编码和用友oa保持一致
     private String applyUser;
     private String applyUserName;

platform-dao/src/main/java/com/platform/dao/vo/sb/SbInfoVO.java

@@ -25,6 +25,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbInfoVO extends BaseVO implements Serializable {
+    private String sortNum;
     /**
      * 自定义参数列表:[{name:name1, content:content1},{name:name2, content:content2}]
      */

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

@@ -172,7 +172,7 @@ sb.apply_time,
                                      sb.remark,
                                      sb.apply_comment,
 sb.scrap_user_id,
-sb.scrap_user_name,sb.repair_dept_id
+sb.scrap_user_name,sb.repair_dept_id,sb.sort_num
     </sql>
 
     <sql id="deptSql">

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

@@ -295,9 +295,17 @@ outstoreform.process_instance_id,
                     #{item}
                 </foreach>
             </if>
+            <if test="repairFormId!=null and repairFormId!=''">
+                detail.repair_form_id=#{repairFormId}
+            </if>
         </where>
         order by form.id
 
     </select>
+    <select id="selectbyRepairForm" resultType="com.platform.dao.vo.query.store.OutStoreFormVO"
+            parameterType="String">
+        select form.*,detail.* as outStoreDetailVOS from   t_out_store_form form JOIN t_out_store_detail detail ON
+        form.id=detail.`out_id`
+    </select>
 
 </mapper>

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

@@ -219,4 +219,15 @@ public class OutStoreFormController {
         ExcelUtil.exportResponseDict(response, ExportOutStoreFormVO.class, BeanConverterUtil.copyListProperties(list, ExportOutStoreFormVO.class), "出库登记单");
     }
 
+    /**
+     * 通过维修工单id获取列表
+     *
+     * @param id
+     * @return R
+     */
+    @GetMapping("/repairFormId/{id}")
+    public R queryByRepairFormId(@PathVariable String id) {
+        return new R<>(outStoreFormService.selectbyRepairForm(id));
+    }
+
 }

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

@@ -107,7 +107,7 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
         // 1、获取巡检内容
         String content = getContentByGatherId(model.getGatherId());
         // 2、根据设备IDs，生成内容列表并保存
-        saveDetails(content,model.getSbIds(),task.getId());
+        saveDetails(content,model.getSbIds(),model.getSortNums(),task.getId());
         // 3、通知相关人员（巡检人和主管）
         sendMessageToChecker(task,1);
         sendMessageToChecker(task,2);
@@ -373,21 +373,35 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
      * @param sbIds
      * @param taskId
      */
-    private void saveDetails(String content,List<String> sbIds,String taskId){
+    private void saveDetails(String content,List<String> sbIds,List<Integer> sortNums,String taskId){
         List<FillGatherTaskDetail> details = new ArrayList<>();
-        for(String sbId : sbIds){
+        for(int i=0;i<sbIds.size();i++){
             FillGatherTaskDetail detail = new FillGatherTaskDetail();
             detail.setContent(content);
             detail.setCreatedTime(LocalDateTime.now());
             detail.setCreatedUserId(SecurityUtils.getUserInfo().getUserId());
             detail.setCreatedUserName(SecurityUtils.getUserInfo().getUsername());
-            detail.setSbId(sbId);
+            detail.setSbId(sbIds.get(i));
+            detail.setSortNum(sortNums.get(i));
             detail.setTaskId(taskId);
             detail.setId(IdGeneratorUtils.getObjectId());
             detail.setStatus(0);
             detail.setSortNum(100);
             details.add(detail);
         }
+//        for(String sbId : sbIds){
+//            FillGatherTaskDetail detail = new FillGatherTaskDetail();
+//            detail.setContent(content);
+//            detail.setCreatedTime(LocalDateTime.now());
+//            detail.setCreatedUserId(SecurityUtils.getUserInfo().getUserId());
+//            detail.setCreatedUserName(SecurityUtils.getUserInfo().getUsername());
+//            detail.setSbId(sbId);
+//            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/store/OutStoreFormService.java

@@ -19,6 +19,7 @@ import java.util.List;
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface OutStoreFormService extends IBaseService<OutStoreForm, OutStoreFormDTO> {
+    List<OutStoreFormVO> selectbyRepairForm(String id);
 
     List<OutStoreFormVO> selectLists(OutStoreFormDTO dto);
 

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

@@ -21,12 +21,10 @@ import com.platform.dao.mapper.sb.SbInfoMapper;
 import com.platform.dao.mapper.sb.SbPositionMapper;
 import com.platform.dao.mapper.store.*;
 import com.platform.dao.util.MessageTemplateUtil;
-import com.platform.dao.vo.query.store.OutStoreFormVO;
-import com.platform.dao.vo.query.store.SparePickDetailVO;
-import com.platform.dao.vo.query.store.StoreCheckJobVO;
-import com.platform.dao.vo.query.store.StoreVO;
+import com.platform.dao.vo.query.store.*;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.event.WorkplaceBacklogEvent;
+import com.platform.service.store.OutStoreDetailService;
 import com.platform.service.store.OutStoreFormService;
 import com.platform.service.store.StoreService;
 import com.platform.service.upms.SysUserRoleService;
@@ -68,6 +66,22 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
     private SbInfoMapper sbInfoMapper;
     private SbPositionMapper sbPositionMapper;
     private SysUserRoleService sysUserService;
+    private OutStoreDetailService outStoreDetailService;
+
+    @Override
+    public List<OutStoreFormVO> selectbyRepairForm(String id) {
+        List<OutStoreForm> outStoreForms = mapper.select(new OutStoreForm().setRepairFormId(id));
+        List<OutStoreFormVO> outStoreFormVOS = BeanConverterUtil.copyListProperties(outStoreForms,OutStoreFormVO.class);
+        List<OutStoreDetailVO> detailVOS;
+        if (outStoreFormVOS!=null&&outStoreFormVOS.size()>0) {
+            for (OutStoreFormVO vo : outStoreFormVOS) {
+                detailVOS = mapper.selectDetailList(vo.getId());
+                vo.setDetailList(detailVOS);
+            }
+        }
+
+        return outStoreFormVOS;
+    }
 
     @Override
     public List<OutStoreFormVO> selectLists(OutStoreFormDTO dto) {
@@ -284,6 +298,7 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
         OutStoreForm outStoreForm = super.saveModelByDTO(model);
         // 插
         for (OutStoreDetailDTO detail : detailList) {
+            detail.setRepairFormId(model.getRepairFormId());
             detail.setUserInfo(userInfo);
             detail.setOutId(outStoreForm.getId());
             detail.setRealNum(detail.getNum());