lyh
3 天以前 4129e9310993e1bfd62cf827556b868c8829dfb2
故障报修状态
已修改3个文件
19 ■■■■ 文件已修改
db/430设备管理数据库设计.pdma.json 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportAccidentsRegisterController.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/430É豸¹ÜÀíÊý¾Ý¿âÉè¼Æ.pdma.json
@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.9.4",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-7-23 11:43:01",
  "updatedTime": "2025-7-23 19:33:38",
  "dbConns": [],
  "profile": {
    "default": {
@@ -33104,12 +33104,12 @@
  "dbConn": [
    {
      "defKey": "949F6F53-7669-4EC7-923F-649A7D4D8273",
      "defName": "hangyu",
      "defName": "430",
      "type": "BFC87171-C74F-494A-B7C2-76B9C55FACC9",
      "properties": {
        "driver_class_name": "com.microsoft.sqlserver.jdbc.SQLServerDriver",
        "url": "jdbc:sqlserver://192.168.1.118:1433;DatabaseName=LXZN_TEST_HANGYU",
        "password": "123",
        "url": "jdbc:sqlserver://127.0.0.1:1433;DatabaseName=LXZN_TEST_430_NEW",
        "password": "",
        "username": "sa",
        "customer_driver": ""
      }
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
@@ -205,6 +205,7 @@
            BeanUtils.copyProperties(eamReportRepairRequest, eamReportAccidentsRegister);
            eamReportAccidentsRegister.setReportId(eamReportRepair.getId());
            eamReportAccidentsRegister.setDelFlag(CommonConstant.DEFAULT_0);
            eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_SUBMIT.name());
            iEamReportAccidentsRegisterService.save(eamReportAccidentsRegister);
        }
        //生成维修工单,可能会有领取操作
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportAccidentsRegisterController.java
@@ -19,7 +19,9 @@
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.dto.EamReportAccidentsRegisterDto;
import org.jeecg.modules.eam.entity.EamRepairOrder;
import org.jeecg.modules.eam.entity.EamRepairPerson;
import org.jeecg.modules.eam.entity.EamReportAccidentsRegister;
import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.request.EamRepairOrderRequest;
import org.jeecg.modules.eam.request.EamReportAccidentsRegisterQuery;
import org.jeecg.modules.eam.service.IEamReportAccidentsRegisterService;
@@ -29,6 +31,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.eam.service.IEamReportRepairService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -58,7 +61,8 @@
public class EamReportAccidentsRegisterController extends JeecgController<EamReportAccidentsRegister, IEamReportAccidentsRegisterService> {
    @Autowired
    private IEamReportAccidentsRegisterService eamReportAccidentsRegisterService;
    @Autowired
    private IEamReportRepairService eamReportRepairService;
    /**
     * åˆ†é¡µåˆ—表查询
     *
@@ -218,6 +222,10 @@
        if(eamReportAccidentsRegister==null) {
            return Result.error("未找到对应数据");
        }
        EamReportRepair eamReportRepair=eamReportRepairService.getById(eamReportAccidentsRegister.getReportId());
        eamReportAccidentsRegister.setScrapPartNumber(eamReportRepair.getScrapPartNumber());
        eamReportAccidentsRegister.setScrapPartValue(eamReportRepair.getScrapPartValue());
        eamReportAccidentsRegister.setScrapPartQuantity(eamReportRepair.getScrapPartQuantity());
        return Result.OK(eamReportAccidentsRegister);
    }