雷海东 / factory-java · 提交

转到一个项目

作者 张晓杰
提交 8f28831508b66c92b25438a775a5f2168d623c5f 1 个父辈 97f4a22d

修改订单表form

内嵌 并排对比
正在显示 8 个修改的文件 包含 221 行增加 和 42 行删除
@@ -22,6 +22,7 @@ import org.jeecg.modules.erp.order_form.entity.TblProductType; @@ -22,6 +22,7 @@ import org.jeecg.modules.erp.order_form.entity.TblProductType;
22 import org.jeecg.modules.erp.order_form.entity.TblWorkOrder; 22 import org.jeecg.modules.erp.order_form.entity.TblWorkOrder;
23 import org.jeecg.modules.erp.order_form.entity.TblWorkPrice; 23 import org.jeecg.modules.erp.order_form.entity.TblWorkPrice;
24 import org.jeecg.modules.erp.order_form.form.OrderForm; 24 import org.jeecg.modules.erp.order_form.form.OrderForm;
  25 +import org.jeecg.modules.erp.order_form.form.TblOrderFormModel;
25 import org.jeecg.modules.erp.order_form.service.ITblOrderFormService; 26 import org.jeecg.modules.erp.order_form.service.ITblOrderFormService;
26 import org.jeecg.modules.erp.order_form.service.ITblWorkOrderService; 27 import org.jeecg.modules.erp.order_form.service.ITblWorkOrderService;
27 import org.jeecg.modules.erp.order_form.service.ITblWorkPriceService; 28 import org.jeecg.modules.erp.order_form.service.ITblWorkPriceService;
@@ -87,14 +88,14 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr @@ -87,14 +88,14 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr
87 //@AutoLog(value = "订单表-分页列表查询") 88 //@AutoLog(value = "订单表-分页列表查询")
88 @ApiOperation(value="订单表-分页列表查询", notes="订单表-分页列表查询") 89 @ApiOperation(value="订单表-分页列表查询", notes="订单表-分页列表查询")
89 @GetMapping(value = "/list") 90 @GetMapping(value = "/list")
90 - public Result<IPage<TblOrderForm>> queryPageList(TblOrderForm tblOrderForm, 91 + public Result<IPage<TblOrderFormModel>> queryPageList(TblOrderFormModel tblOrderForm,
91 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, 92 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
92 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, 93 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
93 HttpServletRequest req) { 94 HttpServletRequest req) {
94 95
95 - QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());  
96 - Page<TblOrderForm> page = new Page<TblOrderForm>(pageNo, pageSize);  
97 - IPage<TblOrderForm> pageList = tblOrderFormService.selectList(page,tblOrderForm); 96 +// QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
  97 + Page<TblOrderFormModel> page = new Page<TblOrderFormModel>(pageNo, pageSize);
  98 + IPage<TblOrderFormModel> pageList = tblOrderFormService.selectList(page,tblOrderForm);
98 return Result.OK(pageList); 99 return Result.OK(pageList);
99 } 100 }
100 101
1 package org.jeecg.modules.erp.order_form.form; 1 package org.jeecg.modules.erp.order_form.form;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
  4 +import java.util.Date;
4 import java.util.List; 5 import java.util.List;
5 6
6 import com.fasterxml.jackson.annotation.JsonFormat; 7 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -19,89 +20,89 @@ public class OrderForm implements Serializable { @@ -19,89 +20,89 @@ public class OrderForm implements Serializable {
19 private static final long serialVersionUID = 1L; 20 private static final long serialVersionUID = 1L;
20 21
21 /**主键*/ 22 /**主键*/
22 - private java.lang.String id; 23 + private String id;
23 /**创建人*/ 24 /**创建人*/
24 - private java.lang.String createBy; 25 + private String createBy;
25 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") 26 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
26 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 27 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
27 - private java.util.Date createTime; 28 + private Date createTime;
28 /**更新人*/ 29 /**更新人*/
29 - private java.lang.String updateBy; 30 + private String updateBy;
30 /**更新日期*/ 31 /**更新日期*/
31 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") 32 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
32 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 33 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
33 - private java.util.Date updateTime; 34 + private Date updateTime;
34 /**所属部门*/ 35 /**所属部门*/
35 - private java.lang.String sysOrgCode; 36 + private String sysOrgCode;
36 /**主料号*/ 37 /**主料号*/
37 - private java.lang.String orderId; 38 + private String orderId;
38 /**订货单位*/ 39 /**订货单位*/
39 - private java.lang.String orderCompany; 40 + private String orderCompany;
40 41
41 - private java.lang.String workOrder; 42 + private String workOrder;
42 43
43 - private java.lang.String productName; 44 + private String productName;
44 45
45 - private java.lang.String productType; 46 + private String productType;
46 47
47 - private java.lang.String designer; 48 + private String designer;
48 49
49 50
50 // @Excel(name = "分派设计任务日期", width = 15, format = "yyyy-MM-dd") 51 // @Excel(name = "分派设计任务日期", width = 15, format = "yyyy-MM-dd")
51 // @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") 52 // @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
52 // @DateTimeFormat(pattern="yyyy-MM-dd") 53 // @DateTimeFormat(pattern="yyyy-MM-dd")
53 // @ApiModelProperty(value = "分派设计任务日期") 54 // @ApiModelProperty(value = "分派设计任务日期")
54 -// private java.util.Date assignDesignDate; 55 +// private Date assignDesignDate;
55 56
56 /**订单日期*/ 57 /**订单日期*/
57 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") 58 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
58 @DateTimeFormat(pattern="yyyy-MM-dd") 59 @DateTimeFormat(pattern="yyyy-MM-dd")
59 - private java.util.Date orderDate; 60 + private Date orderDate;
60 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") 61 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
61 @DateTimeFormat(pattern="yyyy-MM-dd") 62 @DateTimeFormat(pattern="yyyy-MM-dd")
62 - private java.util.Date dispatchDate; 63 + private Date dispatchDate;
63 64
64 /**交货日期*/ 65 /**交货日期*/
65 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") 66 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
66 @DateTimeFormat(pattern="yyyy-MM-dd") 67 @DateTimeFormat(pattern="yyyy-MM-dd")
67 - private java.util.Date deliveryDate; 68 + private Date deliveryDate;
68 69
69 - private java.lang.String quantity; 70 + private String quantity;
70 71
71 /**状态*/ 72 /**状态*/
72 - private java.lang.String status; 73 + private String status;
73 74
74 - private java.lang.String totalWorkingHours; 75 + private String totalWorkingHours;
75 76
76 - private java.lang.String dispatchedWorkingHours; 77 + private String dispatchedWorkingHours;
77 /**实际完成时间*/ 78 /**实际完成时间*/
78 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") 79 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
79 @DateTimeFormat(pattern="yyyy-MM-dd") 80 @DateTimeFormat(pattern="yyyy-MM-dd")
80 - private java.util.Date finishDate; 81 + private Date finishDate;
81 82
82 83
83 - private java.lang.String assignDesignStatus; 84 + private String assignDesignStatus;
84 85
85 - private java.lang.String dispatchStatus; 86 + private String dispatchStatus;
86 87
87 - private java.lang.String productDesignStatus; 88 + private String productDesignStatus;
88 89
89 - private java.lang.String verifyStatus; 90 + private String verifyStatus;
90 91
91 /**出货检验*/ 92 /**出货检验*/
92 - private java.lang.String verifyResult; 93 + private String verifyResult;
93 /**出货日期*/ 94 /**出货日期*/
94 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") 95 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
95 @DateTimeFormat(pattern="yyyy-MM-dd") 96 @DateTimeFormat(pattern="yyyy-MM-dd")
96 - private java.util.Date deliveryDate1; 97 + private Date deliveryDate1;
97 /**主料图片*/ 98 /**主料图片*/
98 - private java.lang.String pics; 99 + private String pics;
99 100
100 - private java.lang.String files; 101 + private String files;
101 102
102 private List<TblBiddingShenq> biddingSqList; 103 private List<TblBiddingShenq> biddingSqList;
103 /**收货图片*/ 104 /**收货图片*/
104 // @Excel(name = "收货图片", width = 15) 105 // @Excel(name = "收货图片", width = 15)
105 // @ApiModelProperty(value = "收货图片") 106 // @ApiModelProperty(value = "收货图片")
106 -// private java.lang.String pics2; 107 +// private String pics2;
107 } 108 }
  1 +package org.jeecg.modules.erp.order_form.form;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableId;
  5 +import com.baomidou.mybatisplus.annotation.TableName;
  6 +import com.fasterxml.jackson.annotation.JsonFormat;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import lombok.Data;
  10 +import org.jeecgframework.poi.excel.annotation.Excel;
  11 +import org.springframework.format.annotation.DateTimeFormat;
  12 +
  13 +import java.io.Serializable;
  14 +import java.util.Date;
  15 +
  16 +/**
  17 + * @Description: 订单表
  18 + * @Author: jeecg-boot
  19 + * @Date: 2022-07-12
  20 + * @Version: V1.0
  21 + */
  22 +@Data
  23 +//@TableName("tbl_order_form")
  24 +@ApiModel(value="tbl_order_form对象", description="订单表")
  25 +public class TblOrderFormModel implements Serializable {
  26 + private static final long serialVersionUID = 1L;
  27 +
  28 + /**主键*/
  29 + @TableId(type = IdType.ASSIGN_ID)
  30 + @ApiModelProperty(value = "主键")
  31 + private String id;
  32 + /**创建人*/
  33 + @ApiModelProperty(value = "创建人")
  34 + private String createBy;
  35 + /**创建日期*/
  36 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
  37 + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
  38 + @ApiModelProperty(value = "创建日期")
  39 + private Date createTime;
  40 + /**更新人*/
  41 + @ApiModelProperty(value = "更新人")
  42 + private String updateBy;
  43 + /**更新日期*/
  44 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
  45 + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
  46 + @ApiModelProperty(value = "更新日期")
  47 + private Date updateTime;
  48 + /**所属部门*/
  49 + @ApiModelProperty(value = "所属部门")
  50 + private String sysOrgCode;
  51 + /**主料号*/
  52 + @Excel(name = "主料号", width = 15)
  53 + @ApiModelProperty(value = "主料号")
  54 + private String orderId;
  55 + /**订货单位*/
  56 + @Excel(name = "订货单位", width = 15)
  57 + @ApiModelProperty(value = "订货单位")
  58 + private String orderCompany;
  59 +
  60 + @Excel(name = "工作令", width = 15)
  61 + @ApiModelProperty(value = "工作令")
  62 + private String workOrder;
  63 +
  64 + @Excel(name = "产品名称", width = 15)
  65 + @ApiModelProperty(value = "产品名称")
  66 + private String productName;
  67 +
  68 + @Excel(name = "产品类型id", width = 15)
  69 + @ApiModelProperty(value = "产品类型id")
  70 + private String productType;
  71 +
  72 + @Excel(name = "产品类型", width = 15)
  73 + @ApiModelProperty(value = "产品类型")
  74 + private String productTypeName ;
  75 +
  76 + @Excel(name = "设计人员角色", width = 15)
  77 + @ApiModelProperty(value = "设计人员角色")
  78 + private String designRole;
  79 + @Excel(name = "设计人员", width = 15)
  80 + @ApiModelProperty(value = "设计人员")
  81 + private String designer;
  82 +
  83 +
  84 +// @Excel(name = "分派设计任务日期", width = 15, format = "yyyy-MM-dd")
  85 +// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  86 +// @DateTimeFormat(pattern="yyyy-MM-dd")
  87 +// @ApiModelProperty(value = "分派设计任务日期")
  88 +// private java.util.Date assignDesignDate;
  89 +
  90 + /**订单日期*/
  91 + @Excel(name = "任务下达日期", width = 15, format = "yyyy-MM-dd")
  92 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  93 + @DateTimeFormat(pattern="yyyy-MM-dd")
  94 + @ApiModelProperty(value = "订单日期")
  95 + private Date orderDate;
  96 +
  97 + @Excel(name = "派工日期", width = 15, format = "yyyy-MM-dd")
  98 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  99 + @DateTimeFormat(pattern="yyyy-MM-dd")
  100 + @ApiModelProperty(value = "派工日期")
  101 + private Date dispatchDate;
  102 +
  103 + /**交货日期*/
  104 + @Excel(name = "交货日期", width = 15, format = "yyyy-MM-dd")
  105 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  106 + @DateTimeFormat(pattern="yyyy-MM-dd")
  107 + @ApiModelProperty(value = "交货日期")
  108 + private Date deliveryDate;
  109 +
  110 + @Excel(name = "数量", width = 15)
  111 + @ApiModelProperty(value = "数量")
  112 + private String quantity;
  113 +
  114 + /**状态*/
  115 + @Excel(name = "状态", width = 15)
  116 + @ApiModelProperty(value = "状态")
  117 + private String status;
  118 +
  119 + @Excel(name = "总工时", width = 15)
  120 + @ApiModelProperty(value = "总工时")
  121 + private String totalWorkingHours;
  122 +
  123 + @Excel(name = "已派发工时", width = 15)
  124 + @ApiModelProperty(value = "已派发工时")
  125 + private String dispatchedWorkingHours;
  126 + /**实际完成时间*/
  127 + @Excel(name = "实际完成时间", width = 15, format = "yyyy-MM-dd")
  128 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  129 + @DateTimeFormat(pattern="yyyy-MM-dd")
  130 + @ApiModelProperty(value = "实际完成时间")
  131 + private Date finishDate;
  132 +
  133 +
  134 + @Excel(name = "是否分派设计 0 未分派 1已分派", width = 15)
  135 + @ApiModelProperty(value = "是否分派设计 0 未分派 1已分派")
  136 + private String assignDesignStatus;
  137 +
  138 + @Excel(name = "分派状态 0 未分派 1已分派", width = 15)
  139 + @ApiModelProperty(value = "分派状态 0 未分派 1已分派")
  140 + private String dispatchStatus;
  141 +
  142 + @Excel(name = "产品设计状态：0未设计 1已设计", width = 15)
  143 + @ApiModelProperty(value = "产品设计状态：0未设计 1已设计")
  144 + private String productDesignStatus;
  145 +
  146 + @Excel(name = "检验状态：0未检验 1已检验", width = 15)
  147 + @ApiModelProperty(value = "检验状态：0未检验 1已检验")
  148 + private String verifyStatus;
  149 +
  150 + /**出货检验*/
  151 + @Excel(name = "出货检验", width = 15)
  152 + @ApiModelProperty(value = "出货检验")
  153 + private String verifyResult;
  154 + /**出货日期*/
  155 + @Excel(name = "出货日期", width = 15, format = "yyyy-MM-dd")
  156 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  157 + @DateTimeFormat(pattern="yyyy-MM-dd")
  158 + @ApiModelProperty(value = "出货日期")
  159 + private Date deliveryDate1;
  160 + /**主料图片*/
  161 + @Excel(name = "主料图片", width = 15)
  162 + @ApiModelProperty(value = "主料图片")
  163 + private String pics;
  164 +
  165 + @Excel(name = "主料文件", width = 15)
  166 + @ApiModelProperty(value = "主料文件")
  167 + private String files;
  168 +
  169 + /**收货图片*/
  170 +// @Excel(name = "收货图片", width = 15)
  171 +// @ApiModelProperty(value = "收货图片")
  172 +// private java.lang.String pics2;
  173 +}
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5 import org.apache.ibatis.annotations.Param; 5 import org.apache.ibatis.annotations.Param;
6 import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm; 6 import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
7 import org.jeecg.modules.erp.order_form.entity.TblOrderForm; 7 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
  8 +import org.jeecg.modules.erp.order_form.form.TblOrderFormModel;
8 9
9 import java.util.List; 10 import java.util.List;
10 11
@@ -25,6 +26,6 @@ public interface TblOrderFormMapper extends BaseMapper<TblOrderForm> { @@ -25,6 +26,6 @@ public interface TblOrderFormMapper extends BaseMapper<TblOrderForm> {
25 Integer updateDesignerByOrderId(TblOrderForm tblOrderForm); 26 Integer updateDesignerByOrderId(TblOrderForm tblOrderForm);
26 Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm); 27 Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm);
27 28
28 - Page<TblOrderForm> selectList(Page<TblOrderForm> page,@Param("qc") TblOrderForm tblOrderForm); 29 + Page<TblOrderFormModel> selectList(Page<TblOrderFormModel> page, @Param("qc") TblOrderFormModel tblOrderForm);
29 30
30 } 31 }
@@ -55,10 +55,10 @@ @@ -55,10 +55,10 @@
55 <update id="updateProductDesignStatusByOrderId" parameterType="org.jeecg.modules.erp.order_form.entity.TblOrderForm"> 55 <update id="updateProductDesignStatusByOrderId" parameterType="org.jeecg.modules.erp.order_form.entity.TblOrderForm">
56 update tbl_order_form set product_design_status = #{productDesignStatus} where order_id =#{orderId} 56 update tbl_order_form set product_design_status = #{productDesignStatus} where order_id =#{orderId}
57 </update> 57 </update>
58 - <select id="selectList" resultType="org.jeecg.modules.erp.order_form.entity.TblOrderForm"> 58 + <select id="selectList" resultType="org.jeecg.modules.erp.order_form.form.TblOrderFormModel">
59 SELECT 59 SELECT
60 a.id,a.create_by,a.create_time,a.update_by,a.update_time, 60 a.id,a.create_by,a.create_time,a.update_by,a.update_time,
61 - a.sys_org_code,a.order_id,a.order_company,a.work_order,a.product_name, c.product_type_id as product_type_id,c.product_type_name as product_type,a.order_date,a.design_role,a.designer,a.dispatch_date, 61 + 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,
62 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, 62 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,
63 a.dispatch_status,a.product_design_status,a.verify_status,a.verify_result,a.delivery_date1,a.pics,a.files,a.pics2 63 a.dispatch_status,a.product_design_status,a.verify_status,a.verify_result,a.delivery_date1,a.pics,a.files,a.pics2
64 FROM 64 FROM
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
4 import com.baomidou.mybatisplus.extension.service.IService; 4 import com.baomidou.mybatisplus.extension.service.IService;
5 import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm; 5 import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
6 import org.jeecg.modules.erp.order_form.entity.TblOrderForm; 6 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
  7 +import org.jeecg.modules.erp.order_form.form.TblOrderFormModel;
7 8
8 import java.io.Serializable; 9 import java.io.Serializable;
9 import java.util.Collection; 10 import java.util.Collection;
@@ -41,6 +42,6 @@ public interface ITblOrderFormService extends IService<TblOrderForm> { @@ -41,6 +42,6 @@ public interface ITblOrderFormService extends IService<TblOrderForm> {
41 Integer updateDesignerByOrderId(TblOrderForm tblOrderForm); 42 Integer updateDesignerByOrderId(TblOrderForm tblOrderForm);
42 Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm); 43 Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm);
43 44
44 - Page<TblOrderForm> selectList(Page<TblOrderForm> page, TblOrderForm tblOrderForm); 45 + Page<TblOrderFormModel> selectList(Page<TblOrderFormModel> page, TblOrderFormModel tblOrderForm);
45 46
46 } 47 }
@@ -3,6 +3,7 @@ package org.jeecg.modules.erp.order_form.service.impl; @@ -3,6 +3,7 @@ package org.jeecg.modules.erp.order_form.service.impl;
3 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 3 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 import org.jeecg.modules.erp.order_form.entity.TblOrderForm; 5 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
  6 +import org.jeecg.modules.erp.order_form.form.TblOrderFormModel;
6 import org.jeecg.modules.erp.order_form.mapper.TblOrderFormMapper; 7 import org.jeecg.modules.erp.order_form.mapper.TblOrderFormMapper;
7 import org.jeecg.modules.erp.order_form.mapper.TblWorkOrderMapper; 8 import org.jeecg.modules.erp.order_form.mapper.TblWorkOrderMapper;
8 import org.jeecg.modules.erp.order_form.service.ITblOrderFormService; 9 import org.jeecg.modules.erp.order_form.service.ITblOrderFormService;
@@ -70,7 +71,7 @@ public class TblOrderFormServiceImpl extends ServiceImpl<TblOrderFormMapper, Tbl @@ -70,7 +71,7 @@ public class TblOrderFormServiceImpl extends ServiceImpl<TblOrderFormMapper, Tbl
70 } 71 }
71 72
72 @Override 73 @Override
73 - public Page<TblOrderForm> selectList(Page<TblOrderForm> page, TblOrderForm tblOrderForm) { 74 + public Page<TblOrderFormModel> selectList(Page<TblOrderFormModel> page, TblOrderFormModel tblOrderForm) {
74 return tblOrderFormMapper.selectList(page,tblOrderForm); 75 return tblOrderFormMapper.selectList(page,tblOrderForm);
75 } 76 }
76 77
@@ -17,6 +17,7 @@ import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq; @@ -17,6 +17,7 @@ import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq;
17 import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShenqService; 17 import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShenqService;
18 import org.jeecg.modules.erp.order_form.entity.TblOrderForm; 18 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
19 import org.jeecg.modules.erp.order_form.form.OrderForm; 19 import org.jeecg.modules.erp.order_form.form.OrderForm;
  20 +import org.jeecg.modules.erp.order_form.form.TblOrderFormModel;
20 import org.jeecg.modules.erp.order_form.service.ITblOrderFormService; 21 import org.jeecg.modules.erp.order_form.service.ITblOrderFormService;
21 import org.jeecg.modules.erp.product_design.entity.TblProductDesign; 22 import org.jeecg.modules.erp.product_design.entity.TblProductDesign;
22 import org.jeecg.modules.erp.product_design.service.ITblProductDesignService; 23 import org.jeecg.modules.erp.product_design.service.ITblProductDesignService;
@@ -49,7 +50,7 @@ public class ProductDesignController { @@ -49,7 +50,7 @@ public class ProductDesignController {
49 50
50 //产品设计订单列表 51 //产品设计订单列表
51 @GetMapping(value = "/productDesignList") 52 @GetMapping(value = "/productDesignList")
52 - public Result<IPage<TblOrderForm>> getProductDesignList(TblOrderForm tblOrderForm, 53 + public Result<IPage<TblOrderFormModel>> getProductDesignList(TblOrderFormModel tblOrderForm,
53 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, 54 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
54 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, 55 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
55 HttpServletRequest req) { 56 HttpServletRequest req) {
@@ -60,8 +61,8 @@ public class ProductDesignController { @@ -60,8 +61,8 @@ public class ProductDesignController {
60 tblOrderForm.setDesigner(sysUser.getWorkNo()); 61 tblOrderForm.setDesigner(sysUser.getWorkNo());
61 // QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap()); 62 // QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
62 // queryWrapper.eq("designer", sysUser.getWorkNo()); 63 // queryWrapper.eq("designer", sysUser.getWorkNo());
63 - Page<TblOrderForm> page = new Page<TblOrderForm>(pageNo, pageSize);  
64 - IPage<TblOrderForm> pageList = tblOrderFormService.selectList(page, tblOrderForm); 64 + Page<TblOrderFormModel> page = new Page<TblOrderFormModel>(pageNo, pageSize);
  65 + IPage<TblOrderFormModel> pageList = tblOrderFormService.selectList(page, tblOrderForm);
65 return Result.OK(pageList); 66 return Result.OK(pageList);
66 } 67 }
67 68