diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java index 6e4ffa0..46d29ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; import com.casic.missiles.model.quality.BizQualityRepRel; import com.casic.missiles.model.quality.BizQualitySupervisionRecord; @@ -24,6 +27,13 @@ */ @Service public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + private final AbstractPermissionContext permissionContext; + private final AbstractDictService dictService; + + public BizQualityRepRelServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService) { + this.permissionContext = permissionContext; + this.dictService = dictService; + } @Override public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { @@ -37,7 +47,20 @@ @Override public List listByRepId(QueryWrapper queryWrapper) { - return this.baseMapper.listByRepId(queryWrapper); + List records = this.baseMapper.listByRepId(queryWrapper); + records.forEach(this::wrapRecord); + return records; + } + + /** + * 监督记录封装 + * + * @param record 监督记录 + */ + private void wrapRecord(BizQualitySupervisionRecord record) { + record.setBizLabCodeName(dictService.getDictNameByCode(MeterDictCode.LAB_CODE, record.getBizLabCode())); + record.setGroupNoName(dictService.getDictNameByCode(MeterDictCode.GROUP_CODE, record.getBizLabCode())); + record.setDeptName(permissionContext.getDeptService().getDeptName(record.getDeptId())); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java index 6e4ffa0..46d29ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityRepRelServiceImpl.java @@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.mapper.quality.BizQualityRepRelMapper; import com.casic.missiles.model.quality.BizQualityRepRel; import com.casic.missiles.model.quality.BizQualitySupervisionRecord; @@ -24,6 +27,13 @@ */ @Service public class BizQualityRepRelServiceImpl extends ServiceImpl implements IBizQualityRepRelService { + private final AbstractPermissionContext permissionContext; + private final AbstractDictService dictService; + + public BizQualityRepRelServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService) { + this.permissionContext = permissionContext; + this.dictService = dictService; + } @Override public List selectBizQualityRepRelPage(QueryWrapper query, Page page) { @@ -37,7 +47,20 @@ @Override public List listByRepId(QueryWrapper queryWrapper) { - return this.baseMapper.listByRepId(queryWrapper); + List records = this.baseMapper.listByRepId(queryWrapper); + records.forEach(this::wrapRecord); + return records; + } + + /** + * 监督记录封装 + * + * @param record 监督记录 + */ + private void wrapRecord(BizQualitySupervisionRecord record) { + record.setBizLabCodeName(dictService.getDictNameByCode(MeterDictCode.LAB_CODE, record.getBizLabCode())); + record.setGroupNoName(dictService.getDictNameByCode(MeterDictCode.GROUP_CODE, record.getBizLabCode())); + record.setDeptName(permissionContext.getDeptService().getDeptName(record.getDeptId())); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index 9a9005a..b035b4b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; @@ -143,6 +144,7 @@ //字典值处理 approvalStatus rep.setApprovalStatusName(dictService.getDictNameByCode("approvalStatus", rep.getApprovalStatus())); rep.setSupDepName(permissionContext.getDeptService().getDeptName(rep.getSupDepId())); + rep.setBizLabCodeName(dictService.getDictNameByCode(MeterDictCode.LAB_CODE, rep.getBizLabCodeName())); } @Override @@ -164,7 +166,9 @@ entity.setSysCode(newCode); entity.setCreateTime(new Date()); entity.setUpdateTime(new Date()); - entity.setCreator(permissionContext.getAuthService().getLoginUser().getId()); + AuthUser user = permissionContext.getAuthService().getLoginUser(); + entity.setCreator(user.getId()); + entity.setCreatorName(user.getName()); entity.setIsNonConformance(0); super.save(entity); saveBatchBizQualityRepRels(entity);