巡检优化

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

@@ -26,6 +26,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreFormVO extends BaseVO implements Serializable {
+    private String repairNo;
 
 
     private List<OutStoreDetail> outStoreDetail;

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

@@ -154,8 +154,8 @@ outstoreform.process_instance_id,
     </select>-->
     <select id="selectList" parameterType="com.platform.dao.dto.store.OutStoreFormDTO"
             resultType="com.platform.dao.vo.query.store.OutStoreFormVO">
-        select outstoreform.*
-        from t_out_store_form as outstoreform
+        select outstoreform.*,repairForm.no as repairNo
+        from t_out_store_form as outstoreform left join t_repair_application_form repairForm on outstoreform.pick_id=repairForm.id
         <where>
             <include refid="List_Condition"/>
             <if test="userId != null and userId != ''">
@@ -295,9 +295,7 @@ outstoreform.process_instance_id,
                     #{item}
                 </foreach>
             </if>
-            <if test="repairFormId!=null and repairFormId!=''">
-                detail.repair_form_id=#{repairFormId}
-            </if>
+
         </where>
         order by form.id
 

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

@@ -13,6 +13,7 @@ import com.platform.dao.bean.MyPage;
 import com.platform.dao.dto.store.OutStoreDetailDTO;
 import com.platform.dao.dto.store.OutStoreFormDTO;
 import com.platform.dao.dto.store.SparePickFormDTO;
+import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.entity.sb.SbOil;
 import com.platform.dao.entity.store.*;
 import com.platform.dao.enums.*;
@@ -130,8 +131,12 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
     @Override
     public OutStoreFormVO getDetail(Object id) {
         OutStoreForm outStoreForm = this.getModelById(id);
+        RepairApplicationForm form = new RepairApplicationForm();
+        form.setId(outStoreForm.getPickId());
+
         OutStoreFormVO outStoreFormVO = new OutStoreFormVO();
         BeanConverterUtil.copyObjectProperties(outStoreForm, outStoreFormVO);
+        outStoreFormVO.setRepairNo(repairApplicationFormMapper.selectOne(form).getNo());
         // 详情列表
       /*  if (StringUtils.isNotBlank(outStoreForm.getStoreId())) {
             Store store = storeService.getModelById(outStoreForm.getStoreId());