lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportAccidentsRegister.java
@@ -154,6 +154,11 @@ @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "中心主任确认时间") private Date centerDirectorTime; /**维修工确认*/ @Excel(name = "维修工确认", width = 15) @ApiModelProperty(value = "维修工确认") @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") private String repairConfirm; /**维修开始时间*/ @Excel(name = "维修开始时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @@ -186,18 +191,13 @@ @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "建议采取措施时间") private Date suggestionTakeStepsTime; /**维修工确认*/ @Excel(name = "维修工确认", width = 15) @ApiModelProperty(value = "维修确认") @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") private String repairConfirm; /**维修工确认结果*/ @Excel(name = "维修工确认结果", width = 15) @ApiModelProperty(value = "维修工确认结果") private String repairConfirmResult; /**维修工确认意见*/ @Excel(name = "维修工确认意见", width = 15) @ApiModelProperty(value = "维修确认意见") @ApiModelProperty(value = "维修工确认意见") private String repairConfirmComment; /**维修工确认时间*/ @Excel(name = "维修工确认时间", width = 15, format = "yyyy-MM-dd") @@ -243,6 +243,11 @@ @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "维修组长(区长)确认时间") private Date repairDistrictTime; /**技术负责人*/ @Excel(name = "技术负责人", width = 15) @ApiModelProperty(value = "技术负责人") @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") private String technicalDirector; /**原因分析核对同意、不同意*/ @Excel(name = "原因分析核对同意、不同意", width = 15) @ApiModelProperty(value = "原因分析核对同意、不同意") @@ -259,11 +264,6 @@ @Excel(name = "事故结论", width = 15) @ApiModelProperty(value = "事故结论") private String accidentConclusion; /**技术负责人*/ @Excel(name = "技术负责人", width = 15) @ApiModelProperty(value = "技术负责人") @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") private String technicalDirector; /**技术负责人确认意见*/ @Excel(name = "技术负责人确认意见", width = 15) @ApiModelProperty(value = "技术负责人确认意见") lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -62,7 +62,7 @@ @Override @Transactional(rollbackFor = Exception.class) @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.ACCEPTANCE, businessTable = "eam_equipment") // @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.ACCEPTANCE, businessTable = "eam_equipment") public EamEquipment saveEquipment(EamEquipment eamEquipment) { if (eamEquipment == null) { return null; lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportAccidentsRegisterController.java
@@ -11,10 +11,15 @@ import javax.servlet.http.HttpServletResponse; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.parser.Feature; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.TranslateDictTextUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.eam.constant.BusinessCodeConst; import org.jeecg.modules.eam.dto.EamReportAccidentsRegisterDto; @@ -63,6 +68,10 @@ private IEamReportAccidentsRegisterService eamReportAccidentsRegisterService; @Autowired private IEamReportRepairService eamReportRepairService; @Autowired private ObjectMapper objectMapper; @Autowired private TranslateDictTextUtils translateDictTextUtils; /** * 分页列表查询 * @@ -217,7 +226,7 @@ //@AutoLog(value = "设备事故登记表-通过id查询") @ApiOperation(value="设备事故登记表-通过id查询", notes="设备事故登记表-通过id查询") @GetMapping(value = "/queryById") public Result<EamReportAccidentsRegister> queryById(@RequestParam(name="id",required=true) String id) { public Result<?> queryById(@RequestParam(name="id",required=true) String id) { EamReportAccidentsRegister eamReportAccidentsRegister = eamReportAccidentsRegisterService.getById(id); if(eamReportAccidentsRegister==null) { return Result.error("未找到对应数据"); @@ -226,7 +235,14 @@ eamReportAccidentsRegister.setScrapPartNumber(eamReportRepair.getScrapPartNumber()); eamReportAccidentsRegister.setScrapPartValue(eamReportRepair.getScrapPartValue()); eamReportAccidentsRegister.setScrapPartQuantity(eamReportRepair.getScrapPartQuantity()); return Result.OK(eamReportAccidentsRegister); try { String json = objectMapper.writeValueAsString(eamReportAccidentsRegister); JSONObject item = JSONObject.parseObject(json, Feature.OrderedField); translateDictTextUtils.translateField("variableFactorsValue", eamReportAccidentsRegister.getVariableFactorsValue(), item, "variable_factors_value"); return Result.OK(item); } catch (JsonProcessingException e) { return Result.error("数据转译失败！"); } } /**
