Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

字段显示调整

Browse Source
orign^2
wws 1 year ago
parent a05ff34856
commit 2d523c06a0
4 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File

9
op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java
Unescape Escape View File

@ -30,7 +30,7 @@ public class EquCheckItem extends BaseEntity {
private String itemName; private String itemName;
/** 检查项方法/工具 */ /** 检查项方法/工具 */
@Excel(name = "检查项方法/工具") @Excel(name = "检查项方法")
private String itemMethod; private String itemMethod;
/** 维护类型编码 */ /** 维护类型编码 */
@ -50,19 +50,15 @@ public class EquCheckItem extends BaseEntity {
private String factoryCode; private String factoryCode;
/** 备用字段1 */ /** 备用字段1 */
@Excel(name = "备用字段1")
private String attr1; private String attr1;
/** 备用字段2 */ /** 备用字段2 */
@Excel(name = "备用字段2")
private String attr2; private String attr2;
/** 备用字段3 */ /** 备用字段3 */
@Excel(name = "备用字段3")
private String attr3; private String attr3;
/** 删除标识 */ /** 删除标识 */
@Excel(name = "删除标识")
private String delFlag; private String delFlag;
/** 创建时间 */ /** 创建时间 */
@ -96,12 +92,15 @@ public class EquCheckItem extends BaseEntity {
private String updateTimeEnd; private String updateTimeEnd;
// 检查项工具 // 检查项工具
@Excel(name = "检查项工具")
private String itemTools; private String itemTools;
// 循环周期类型 // 循环周期类型
@Excel(name = "循环周期类型")
private String itemLoopType; private String itemLoopType;
// 循环周期 // 循环周期
@Excel(name = "循环周期")
private int itemLoop; private int itemLoop;
public int getItemLoop() { public int getItemLoop() {

4
op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java
Unescape Escape View File

@ -41,19 +41,15 @@ public class EquFaultType extends BaseEntity {
private String factoryCode; private String factoryCode;
/** 备用字段1 */ /** 备用字段1 */
@Excel(name = "备用字段1")
private String attr1; private String attr1;
/** 备用字段2 */ /** 备用字段2 */
@Excel(name = "备用字段2")
private String attr2; private String attr2;
/** 备用字段3 */ /** 备用字段3 */
@Excel(name = "备用字段3")
private String attr3; private String attr3;
/** 删除标志 */ /** 删除标志 */
@Excel(name = "删除标志")
private String delFlag; private String delFlag;
// 创建日期范围list // 创建日期范围list

18
op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java
Unescape Escape View File

@ -31,19 +31,16 @@ public class EquPlan extends BaseEntity {
private String planName; private String planName;
/** 车间 */ /** 车间 */
@Excel(name = "车间") @Excel(name = "车间编码")
private String planWorkshop; private String planWorkshop;
/** 产线 */ /** 产线 */
@Excel(name = "产线")
private String planProdLine; private String planProdLine;
/** 设备名称 */ /** 设备名称 */
@Excel(name = "设备名称")
private String equipmentName; private String equipmentName;
/** 设备编码 */ /** 设备编码 */
@Excel(name = "设备编码")
private String equipmentCode; private String equipmentCode;
/** 循环周期 */ /** 循环周期 */
@ -65,7 +62,6 @@ public class EquPlan extends BaseEntity {
private Date planLoopEnd; private Date planLoopEnd;
/** 巡检人员 */ /** 巡检人员 */
@Excel(name = "巡检人员")
private String planPerson; private String planPerson;
/** 计划状态 */ /** 计划状态 */
@ -77,11 +73,9 @@ public class EquPlan extends BaseEntity {
private String planRestrict; private String planRestrict;
/** 维护类型 */ /** 维护类型 */
@Excel(name = "维护类型")
private String planType; private String planType;
/** 是否委外 */ /** 是否委外 */
@Excel(name = "是否委外")
private String planOutsource; private String planOutsource;
/** 委外工单编码 */ /** 委外工单编码 */
@ -93,19 +87,15 @@ public class EquPlan extends BaseEntity {
private String factoryCode; private String factoryCode;
/** 备用字段1 */ /** 备用字段1 */
@Excel(name = "备用字段1")
private String attr1; private String attr1;
/** 备用字段2 */ /** 备用字段2 */
@Excel(name = "备用字段2")
private String attr2; private String attr2;
/** 备用字段3 */ /** 备用字段3 */
@Excel(name = "备用字段3")
private String attr3; private String attr3;
/** 删除标志 */ /** 删除标志 */
@Excel(name = "删除标志")
private String delFlag; private String delFlag;
// 创建日期范围list // 创建日期范围list
@ -136,12 +126,14 @@ public class EquPlan extends BaseEntity {
private String workCenterName; private String workCenterName;
// 保养类型 // 保养类型
@Excel(name = "保养类型")
private String upkeep; private String upkeep;
// 计划保养时间计算规则 // 计划保养时间计算规则
private String calculationRule; private String calculationRule;
// 是否停机保养 // 是否停机保养
@Excel(name = "是否停机保养")
private String shutDown; private String shutDown;
private String planEquId; private String planEquId;
@ -157,12 +149,16 @@ public class EquPlan extends BaseEntity {
private Date getLoopEndArrayEnd; private Date getLoopEndArrayEnd;
@Excel(name = "委外人员")
private String workPerson; private String workPerson;
@Excel(name = "委外单位")
private String workOutsourcingUnit; private String workOutsourcingUnit;
@Excel(name = "联系方式")
private String workConnection; private String workConnection;
@Excel(name = "委外原因")
private String workReason; private String workReason;
public String getWorkOutsourcingUnit() { public String getWorkOutsourcingUnit() {

2
op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
Unescape Escape View File

@ -74,7 +74,7 @@
<if test="planLoopStart != null "> and plan_loop_start = #{planLoopStart}</if> <if test="planLoopStart != null "> and plan_loop_start = #{planLoopStart}</if>
<if test="planLoopEnd != null "> and plan_loop_end = #{planLoopEnd}</if> <if test="planLoopEnd != null "> and plan_loop_end = #{planLoopEnd}</if>
<if test="orderStart != null "> and order_start = #{orderStart}</if> <if test="orderStart != null "> and order_start = #{orderStart}</if>
<if test="orderEnd != null "> and order_end = #{orderEnd}</if> <if test="orderEnd != null "> and order_end = #{ord5erEnd}</if>
<if test="orderStatus != null and orderStatus != ''"> and order_status = #{orderStatus}</if> <if test="orderStatus != null and orderStatus != ''"> and order_status = #{orderStatus}</if>
<if test="orderCost != null "> and order_cost = #{orderCost}</if> <if test="orderCost != null "> and order_cost = #{orderCost}</if>
<if test="planPerson != null and planPerson != ''"> and plan_person like concat('%', #{planPerson}, '%')</if> <if test="planPerson != null and planPerson != ''"> and plan_person like concat('%', #{planPerson}, '%')</if>

Write Preview
Loading…
Cancel
Save