diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java index 3bb40ad..1051dda 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java @@ -90,6 +90,13 @@ private String approvalStatus; /** + * 流程实例ID + */ + @TableField("process_id") + @ApiModelProperty(value = "流程实例ID", dataType = "String") + private String processId; + + /** * 审批状态名称 */ @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java index 3bb40ad..1051dda 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java @@ -90,6 +90,13 @@ private String approvalStatus; /** + * 流程实例ID + */ + @TableField("process_id") + @ApiModelProperty(value = "流程实例ID", dataType = "String") + private String processId; + + /** * 审批状态名称 */ @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentCheckInfo.java index 91c410c..4518603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentCheckInfo.java @@ -123,6 +123,12 @@ @TableField("create_user") @ApiModelProperty(value = "创建人", dataType = "String") private String createUser; + /** + * 创建人 + */ + @TableField(exist = false) + @ApiModelProperty(value = "创建人名称", dataType = "String") + private String createUserName; /** * 创建时间 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java index 3bb40ad..1051dda 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java @@ -90,6 +90,13 @@ private String approvalStatus; /** + * 流程实例ID + */ + @TableField("process_id") + @ApiModelProperty(value = "流程实例ID", dataType = "String") + private String processId; + + /** * 审批状态名称 */ @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentCheckInfo.java index 91c410c..4518603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentCheckInfo.java @@ -123,6 +123,12 @@ @TableField("create_user") @ApiModelProperty(value = "创建人", dataType = "String") private String createUser; + /** + * 创建人 + */ + @TableField(exist = false) + @ApiModelProperty(value = "创建人名称", dataType = "String") + private String createUserName; /** * 创建时间 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java index e6a1ff8..38dae5e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java @@ -16,6 +16,7 @@ import com.casic.missiles.mapper.equipment.EquipmentCheckInfoMapper; import com.casic.missiles.model.equipment.EquipmentCheckInfo; import com.casic.missiles.model.equipment.EquipmentCheckInfoFile; +import com.casic.missiles.modular.system.dao.UserMapper; import com.casic.missiles.service.equipment.IEquipmentCheckInfoFileService; import com.casic.missiles.service.equipment.IEquipmentCheckInfoService; import com.casic.missiles.utils.DictCodeUtils; @@ -47,6 +48,9 @@ @Resource private IEquipmentCheckInfoFileService checkInfoFileService; + @Resource + private UserMapper userMapper; + @Override public Page checkInfoList(Page page, CheckInfoRequest request) throws Exception { QueryWrapper wrapper = getWrapper(request); @@ -71,6 +75,7 @@ DictCodeUtils.convertDictCodeToName(equipmentCheckInfo); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("check_id",idDto.getId()); + equipmentCheckInfo.setCreateUserName(userMapper.selectById(equipmentCheckInfo.getCreateUser()).getName()); List checkInfoFiles = equipmentCheckInfoFileMapper.selectList(wrapper); equipmentCheckInfo.setFileList(checkInfoFiles); return equipmentCheckInfo;