| | |
|---|
| | | QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>(); |
|---|
| | | wrapper.in("status",Arrays.asList(0,1,2,3)); |
|---|
| | | if(sgProgressReportDO.getGxDeviceId()==998 |
|---|
| | | //|| sgProgressReportDO.getGxDeviceId()==999 |
|---|
| | | || sgProgressReportDO.getGxDeviceId()==999 |
|---|
| | | ){ |
|---|
| | | wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId).ne("status",4).eq("profram_id",sgProgressReportDO.getProframId()); |
|---|
| | | }else { |
|---|
| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | //加个项目及设备的状态判断 方便统计计算 |
|---|
| | | if(gxStepId != 32 && |
|---|
| | | if(gxStepId != 20 && |
|---|
| | | gxStepId != 26 ) { |
|---|
| | | if (sgDeviceDO != null && sgDeviceDO.getStatus() == 0) { |
|---|
| | | sgDeviceDO.setStatus(1); |
|---|
