I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
Rock.Yu 6 years ago
parent a85cc69e14 9a895f2e6a
commit c44721fe91
12 changed files with 188 additions and 10 deletions
Show Stats Download Patch File Download Diff File

18
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -47,8 +47,8 @@ public class DdlPreparedPack {
endDate += " 23:59:59";
}
packBean.addColumnQuery(columnName,"and model." + columnName + " >= :m_" + columnName, startDate);
packBean.addColumnQuery(columnName,"and model." + columnName + " <= :m_" + columnName, endDate);
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, startDate);
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, endDate);
}
/**
@ -71,7 +71,7 @@ public class DdlPreparedPack {
String[] time = date.split(",");
if (time.length == 1) {
//只有开始日期，没有结束日期
packBean.addColumnQuery(columnName,"and model." + columnName + " like :m_" + columnName, "%" + time[0] + "%");
packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, "%" + time[0] + "%");
} else if (time.length == 2 && ((time[0] != null && time[0].trim().length() > 0)
|| (time[1] != null & time[1].trim().length() > 0))) {
if (time[0] == null || time[0].trim().length() == 0) {
@ -90,16 +90,16 @@ public class DdlPreparedPack {
if (isShowTime && time[1].trim().length() <= 11) {
time[1] += " 23:59:59";
}
packBean.addColumnQuery(columnName,"and model." + columnName + " >= :m_" + columnName, time[0]);
packBean.addColumnQuery(columnName,"and model." + columnName + " <= :m_" + columnName, time[1]);
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, time[0]);
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, time[1]);
} else {
if (showTaday) {
if (isShowTime) {
packBean.addColumnQuery(columnName,"and model." + columnName + " >= :m_" + columnName, today + " 00:00:00");
packBean.addColumnQuery(columnName,"and model." + columnName + " <= :m_" + columnName, today + " 23:59:59");
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, today + " 00:00:00");
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, today + " 23:59:59");
} else {
packBean.addColumnQuery(columnName,"and model." + columnName + " >= :m_" + columnName, today);
packBean.addColumnQuery(columnName,"and model." + columnName + " <= :m_" + columnName, today);
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, today);
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, today);
}
}
}

3
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java
Unescape Escape View File

@ -46,7 +46,8 @@ public class BfRefButtonMethod extends BaseBean {
@Column(name="BUTTON_POSITION_REF_ID")
@ApiParam(value ="按钮位置关联id")
private String buttonPositionRefId;
@JsonSerialize(using = ToStringSerializer.class)
private Long buttonPositionRefId;
@Column(name="BUTTON_POSITION_REF_NAME_RDD")
@ApiParam(value ="按钮位置关联名称")

33
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
Unescape Escape View File

@ -247,4 +247,37 @@ public final class FormHqlPack {
return ddlPackBean;
}
/**
* 拦截器明细查询条件
* @param bfInterceptDetail 查询条件
* @return DdlPackBean
*/
public static DdlPackBean packHqlBfInterceptDetail(BfInterceptDetail bfInterceptDetail) {
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptId(), "interceptId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptTargetId(), "interceptTargetId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptType(), "interceptType", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptProcessResult(), "interceptProcessResult", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptPosition(), "interceptPosition", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getIsDeleted(), "isDeleted", ddlPackBean);
ddlPackBean.setOrderByStr(bfInterceptDetail.orderBy());
return ddlPackBean;
}
/**
* 根据id数组查询按钮功能关系
* @return
*/
public static DdlPackBean packHqlBfRefButtonMethodByRefIds(Long[] ids) {
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getInPackArray(ids, "buttonPositionRefId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean);
return ddlPackBean;
}
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepositoty.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesDefectRecord;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-17-17:01
* @Modify:
**/
@Repository
public interface MesDefectRecordRepositoty extends BaseRepository<MesDefectRecord, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKeyDataRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesKeyData;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-17-17:03
* @Modify:
**/
@Repository
public interface MesKeyDataRepository extends BaseRepository<MesKeyData, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpsnRuleReposity.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesKpsnRule;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-17-17:04
* @Modify:
**/
@Repository
public interface MesKpsnRuleReposity extends BaseRepository<MesKpsnRule, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartScheduleBomRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesPartScheduleBom;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-17-17:07
* @Modify:
**/
@Repository
public interface MesPartScheduleBomRepository extends BaseRepository<MesPartScheduleBom, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlanOrderRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-17-17:08
* @Modify:
**/
@Repository
public interface MesPlanOrderRepository extends BaseRepository<MesPlanOrder, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceSnRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-17-17:10
* @Modify:
**/
@Repository
public interface MesProduceSnRepository extends BaseRepository<MesProduceSn, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderDetailRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderDetail;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-17-17:12
* @Modify:
**/
@Repository
public interface MesQueueOrderDetailRepository extends BaseRepository<MesQueueOrderDetail, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrder;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-17-17:11
* @Modify:
**/
@Repository
public interface MesQueueOrderRepository extends BaseRepository<MesQueueOrder, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkOrderRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-17-17:13
* @Modify:
**/
@Repository
public interface MesWorkOrderRepository extends BaseRepository<MesWorkOrder, Long> {
}
Write Preview
Loading…
Cancel
Save