Merge branch 'dev' of http://39.105.222.208:1024/leihd/factory-java into dev

@@ -89,7 +89,7 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr
 
 
 //		QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
 //		QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
 		Page<TblOrderFormModel> page = new Page<TblOrderFormModel>(pageNo, pageSize);
 		Page<TblOrderFormModel> page = new Page<TblOrderFormModel>(pageNo, pageSize);
-		IPage<TblOrderFormModel> pageList = tblOrderFormService.selectList(page,tblOrderForm);
+		IPage<TblOrderFormModel> pageList = tblOrderFormService.selectListDesign(page,tblOrderForm);
 		return Result.OK(pageList);
 		return Result.OK(pageList);
 	}
 	}
 
 

@@ -166,6 +166,15 @@ public class TblOrderFormModel implements Serializable {
     @ApiModelProperty(value = "主料文件")
     @ApiModelProperty(value = "主料文件")
     private String files;
     private String files;
 
 
+    /**主料图片*/
+    @Excel(name = "设计图片", width = 15)
+    @ApiModelProperty(value = "设计图片")
+    private String designPic;
+
+    @Excel(name = "设计文件", width = 15)
+    @ApiModelProperty(value = "设计文件")
+    private String designFile;
+
     /**收货图片*/
     /**收货图片*/
 //    @Excel(name = "收货图片", width = 15)
 //    @Excel(name = "收货图片", width = 15)
 //    @ApiModelProperty(value = "收货图片")
 //    @ApiModelProperty(value = "收货图片")

@@ -85,7 +85,7 @@
         a.id,a.create_by,a.create_time,a.update_by,a.update_time,
         a.id,a.create_by,a.create_time,a.update_by,a.update_time,
         a.sys_org_code,a.order_id,a.order_company,a.work_order,a.product_name, c.product_type_id as product_type ,c.product_type_name,a.order_date,a.design_role,a.designer,a.dispatch_date,
         a.sys_org_code,a.order_id,a.order_company,a.work_order,a.product_name, c.product_type_id as product_type ,c.product_type_name,a.order_date,a.design_role,a.designer,a.dispatch_date,
         a.delivery_date,a.quantity,a.total_working_hours,if(b.dispatched_working_hours != 0,b.dispatched_working_hours,0) dispatched_working_hours,a.STATUS,a.finish_date,a.assign_design_status,
         a.delivery_date,a.quantity,a.total_working_hours,if(b.dispatched_working_hours != 0,b.dispatched_working_hours,0) dispatched_working_hours,a.STATUS,a.finish_date,a.assign_design_status,
-        a.dispatch_status,a.product_design_status,a.verify_status,a.verify_result,a.delivery_date1, d.design_pic as pics,d.design_file as files,a.pics2
+        a.dispatch_status,a.product_design_status,a.verify_status,a.verify_result,a.delivery_date1,a.pics,a.files,a.pics2, d.design_pic,d.design_file
         FROM
         FROM
         tbl_order_form a
         tbl_order_form a
         LEFT JOIN ( SELECT order_number, sum( work_hours ) dispatched_working_hours FROM tbl_production_gongxu GROUP BY order_number ) b ON a.order_id = b.order_number
         LEFT JOIN ( SELECT order_number, sum( work_hours ) dispatched_working_hours FROM tbl_production_gongxu GROUP BY order_number ) b ON a.order_id = b.order_number