diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java index 3f5724cd0..e863d30df 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java @@ -81,6 +81,7 @@ public class QcStaticTable extends BaseEntity { private String recordId; private String detailId; private String checkNo; + private String groupId; @JsonFormat(pattern = "yyyy-MM-dd") private Date incomeTime; @@ -125,6 +126,14 @@ public class QcStaticTable extends BaseEntity { private String sampleQty; private String noOkQty; + public String getGroupId() { + return groupId; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + public String getOkNumRate() { return okNumRate; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java index e53521038..ec27b291f 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java @@ -157,4 +157,6 @@ public interface QcStaticTableMapper { @MapKey("ymdms") Map getCpSampMap(QcStaticTable qcStaticTable); List getCpDefectTypes(QcStaticTable qcStaticTable); + + String getGroupIdByOrderNo(String orderNo); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java index 00b86ca9d..c8caaac1d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java @@ -311,6 +311,12 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { @Override @DS("#header.poolName") public List getXJCheckTableDetail(QcStaticTable qcStaticTable) { + + String groupId = qcStaticTableMapper.getGroupIdByOrderNo(qcStaticTable.getOrderNo()); + if(StringUtils.isBlank(groupId) || groupId.indexOf("-")<0){ + groupId = "3dc0655fea3449c59c76a01cc5b91565"; + } + qcStaticTable.setGroupId(groupId); List projects = qcStaticTableMapper.getXJProjects(qcStaticTable); Map detailMap = null; if(qcStaticTable.getShiftId().equals("5")){ diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml index ecc235e53..1dacab47d 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml @@ -222,7 +222,7 @@ qctp.project_no projectNo from qc_check_type_project qctp left join qc_check_project qct on qctp.project_id = qct.id - where qctp.type_id = 'checkTypeSCXJ' and qctp.del_flag = '0' and qct.del_flag = '0' + where qctp.type_id = 'checkTypeSCXJ' and qctp.del_flag = '0' and qct.del_flag = '0' and qctp.group_id = #{groupId} order by qctp.sort +